diff options
| author | Tony Theodore <tonyt@logyst.com> | 2016-01-11 06:43:56 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2016-01-11 06:43:56 (GMT) |
| commit | 77a96085cf90110b8589cae50ab0f9ad93b6ba54 (patch) | |
| tree | a108019f27217f6c086db8ec294c91916faf6509 | |
| parent | 8a9f073fbcf99b6c9137c716f3ddebe522191ca6 (diff) | |
| download | mxe-77a96085cf90110b8589cae50ab0f9ad93b6ba54.zip mxe-77a96085cf90110b8589cae50ab0f9ad93b6ba54.tar.gz mxe-77a96085cf90110b8589cae50ab0f9ad93b6ba54.tar.bz2 | |
Revert "gdal: install pkg-config and data files, add test using pkg-config"
This reverts commit 31e57014bca7c5a8e9896b5689001efa78ab009e.
| -rw-r--r-- | src/gdal-test.c | 23 | ||||
| -rw-r--r-- | src/gdal.mk | 9 |
2 files changed, 2 insertions, 30 deletions
diff --git a/src/gdal-test.c b/src/gdal-test.c deleted file mode 100644 index d6a8c8e..0000000 --- a/src/gdal-test.c +++ /dev/null @@ -1,23 +0,0 @@ -/* - * This file is part of MXE. - * See index.html for further information. - */ - -#include "gdal.h" -#include "cpl_conv.h" /* for CPLMalloc() */ -int main() -{ - GDALDatasetH hDataset; - GDALAllRegister(); - hDataset = GDALOpen( "/tmp/test.img", GA_ReadOnly ); - if( hDataset == NULL ) - { - - } - else - { - GDALClose( hDataset ); - } - - return 0; -} diff --git a/src/gdal.mk b/src/gdal.mk index fe06fd2..e927ecf 100644 --- a/src/gdal.mk +++ b/src/gdal.mk @@ -78,8 +78,8 @@ define $(PKG)_BUILD CXXFLAGS='-D_WIN32_WINNT=0x0600' \ LIBS="-ljpeg -lsecur32 -lportablexdr `'$(TARGET)-pkg-config' --libs openssl libtiff-4`" - $(MAKE) -C '$(1)' -j '$(JOBS)' lib-target gdal.pc - $(MAKE) -C '$(1)' -j '$(JOBS)' install-actions + $(MAKE) -C '$(1)' -j '$(JOBS)' lib-target + $(MAKE) -C '$(1)' -j '$(JOBS)' install-lib $(MAKE) -C '$(1)/port' -j '$(JOBS)' install $(MAKE) -C '$(1)/gcore' -j '$(JOBS)' install $(MAKE) -C '$(1)/frmts' -j '$(JOBS)' install @@ -87,9 +87,4 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)/ogr' -j '$(JOBS)' install OGR_ENABLED= $(MAKE) -C '$(1)/apps' -j '$(JOBS)' install ln -sf '$(PREFIX)/$(TARGET)/bin/gdal-config' '$(PREFIX)/bin/$(TARGET)-gdal-config' - - '$(TARGET)-gcc' -Wall \ - '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-gdal.exe' \ - `'$(TARGET)-pkg-config' --cflags --libs gdal` - endef |