summaryrefslogtreecommitdiffstats
path: root/src/gdal.mk
diff options
context:
space:
mode:
authorHamza Alloush <hamzaalloush@live.com>2015-05-27 08:46:33 (GMT)
committerSaikrishna Arcot <saiarcot895@gmail.com>2015-06-04 20:25:31 (GMT)
commitee7022d5aa01a09c604199ec64d7290415c6e2ef (patch)
treeb23f54b11b1ab2f358746aee6adf47b823125d49 /src/gdal.mk
parentd9128035d601f5798cea7f88c795f6f1f8a56e8e (diff)
downloadmxe-ee7022d5aa01a09c604199ec64d7290415c6e2ef.zip
mxe-ee7022d5aa01a09c604199ec64d7290415c6e2ef.tar.gz
mxe-ee7022d5aa01a09c604199ec64d7290415c6e2ef.tar.bz2
fix all gdal shared library related requirements
Diffstat (limited to 'src/gdal.mk')
-rw-r--r--src/gdal.mk13
1 files changed, 3 insertions, 10 deletions
diff --git a/src/gdal.mk b/src/gdal.mk
index d9e8235..e4e58f7 100644
--- a/src/gdal.mk
+++ b/src/gdal.mk
@@ -23,17 +23,12 @@ 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)' \
+ $(MXE_CONFIGURE_OPTS) \
--with-bsb \
--with-grib \
--with-ogr \
--with-pam \
--without-threads \
- --with-static-proj4 \
--with-libz='$(PREFIX)/$(TARGET)' \
--with-png='$(PREFIX)/$(TARGET)' \
--with-libtiff='$(PREFIX)/$(TARGET)' \
@@ -83,8 +78,8 @@ define $(PKG)_MAKE
$(MAKE) -C '$(1)/gcore' -j '$(JOBS)' install
$(MAKE) -C '$(1)/frmts' -j '$(JOBS)' install
$(MAKE) -C '$(1)/alg' -j '$(JOBS)' install
- $(MAKE) -C '$(1)/ogr' -j '$(JOBS)' install OGR_ENABLED=
- $(MAKE) -C '$(1)/apps' -j '$(JOBS)' install BIN_LIST=
+ $(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'
endef
@@ -103,5 +98,3 @@ 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 =