diff options
| author | Rashad <mohammedrashadkm@gmail.com> | 2015-06-09 01:44:56 (GMT) |
|---|---|---|
| committer | Rashad <mohammedrashadkm@gmail.com> | 2015-06-09 01:44:56 (GMT) |
| commit | 9762fbc9e4f659d760900d8a30f7b9663971274a (patch) | |
| tree | b011f4c35b9b786ed577ade20e7eaa317433ba80 /src/gdal.mk | |
| parent | 55ea9efdcb164e641a16e61af550a1955d6e45b6 (diff) | |
| download | mxe-9762fbc9e4f659d760900d8a30f7b9663971274a.zip mxe-9762fbc9e4f659d760900d8a30f7b9663971274a.tar.gz mxe-9762fbc9e4f659d760900d8a30f7b9663971274a.tar.bz2 | |
enable shared
Diffstat (limited to 'src/gdal.mk')
| -rw-r--r-- | src/gdal.mk | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/src/gdal.mk b/src/gdal.mk index f95d5e1..3e6d10a 100644 --- a/src/gdal.mk +++ b/src/gdal.mk @@ -3,15 +3,15 @@ PKG := gdal $(PKG)_IGNORE := -$(PKG)_VERSION := 1.11.1 -$(PKG)_CHECKSUM := e2c67481932ec9fb6ec3c0faadc004f715c4eef4 +$(PKG)_VERSION := 1.11.2 +$(PKG)_CHECKSUM := 6f3ccbe5643805784812072a33c25be0bbff00db $(PKG)_SUBDIR := gdal-$($(PKG)_VERSION) $(PKG)_FILE := gdal-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://download.osgeo.org/gdal/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_URL_2 := ftp://ftp.remotesensing.org/gdal/$($(PKG)_VERSION)/$($(PKG)_FILE) -$(PKG)_DEPS := gcc proj zlib libpng libxml2 tiff libgeotiff jpeg jasper \ +$(PKG)_DEPS := gcc proj zlib libpng libxml2 tiff libgeotiff jpeg openjpeg \ giflib expat sqlite curl geos postgresql gta hdf4 hdf5 \ - json-c netcdf + json-c netcdf armadillo define $(PKG)_UPDATE $(WGET) -q -O- 'http://trac.osgeo.org/gdal/wiki/DownloadSource' | \ @@ -23,29 +23,29 @@ define $(PKG)_CONFIGURE cd '$(1)' && autoreconf -fi # The option '--without-threads' means native win32 threading without pthread. cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build='$(BUILD)' \ - --enable-static \ - --disable-shared \ - --prefix='$(PREFIX)/$(TARGET)' \ - --with-bsb \ + $(MXE_CONFIGURE_OPTS) \ + --with-bsb \ --with-grib \ --with-ogr \ --with-pam \ --without-threads \ - --with-static-proj4 \ + --with-armadillo='$(PREFIX)/$(TARGET)' \ --with-libz='$(PREFIX)/$(TARGET)' \ --with-png='$(PREFIX)/$(TARGET)' \ --with-libtiff='$(PREFIX)/$(TARGET)' \ --with-geotiff='$(PREFIX)/$(TARGET)' \ --with-jpeg='$(PREFIX)/$(TARGET)' \ - --with-jasper='$(PREFIX)/$(TARGET)' \ + --with-openjpeg='$(PREFIX)/$(TARGET)' \ --with-gif='$(PREFIX)/$(TARGET)' \ --with-expat='$(PREFIX)/$(TARGET)' \ --with-sqlite3='$(PREFIX)/$(TARGET)' \ --with-gta='$(PREFIX)/$(TARGET)' \ --with-hdf5='$(PREFIX)/$(TARGET)' \ --with-libjson-c='$(PREFIX)/$(TARGET)' \ + --with-netcdf='$(PREFIX)/$(TARGET)' \ + --with-geos='$(PREFIX)/$(TARGET)/bin/geos-config' \ + --with-xml2='$(PREFIX)/$(TARGET)/bin/xml2-config' \ + --without-jasper \ --without-odbc \ --without-xerces \ --without-grass \ @@ -99,8 +99,3 @@ define $(PKG)_BUILD_i686-w64-mingw32 LIBS="-ljpeg -lsecur32 -lportablexdr `'$(TARGET)-pkg-config' --libs openssl libtiff-4`" $($(PKG)_MAKE) endef - -# Can't use $(PKG)_BUILD_SHARED here as $(PKG)_BUILD_i686-w64-mingw32 has a -# higher precedence. -$(PKG)_BUILD_i686-w64-mingw32.shared = -$(PKG)_BUILD_x86_64-w64-mingw32.shared = |