diff options
| author | Martin Lambers <marlam@marlam.de> | 2012-12-06 12:21:24 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2012-12-07 06:40:20 (GMT) |
| commit | 54afd00283fe9b8f6634b527c3072d9c6c99c684 (patch) | |
| tree | 123f77ab3c409d39b0c2d3ff40f8fd45e3899661 | |
| parent | e2af9148c46fcb44668b6a04bfb1f22813ca2a64 (diff) | |
| download | mxe-54afd00283fe9b8f6634b527c3072d9c6c99c684.zip mxe-54afd00283fe9b8f6634b527c3072d9c6c99c684.tar.gz mxe-54afd00283fe9b8f6634b527c3072d9c6c99c684.tar.bz2 | |
Remove unnecessary dependency on msvcr80.dll from hdf5 package.
This also removes linking with libmsvcr80.a for the netcdf and gdal packages.
| -rw-r--r-- | src/gdal.mk | 2 | ||||
| -rw-r--r-- | src/hdf5.mk | 3 | ||||
| -rw-r--r-- | src/netcdf.mk | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/gdal.mk b/src/gdal.mk index 871cd81..ee8375e 100644 --- a/src/gdal.mk +++ b/src/gdal.mk @@ -73,7 +73,7 @@ define $(PKG)_BUILD --without-php \ --without-ruby \ --without-python \ - LIBS="-ljpeg -lsecur32 -lportablexdr -lmsvcr80 `'$(TARGET)-pkg-config' --libs openssl libtiff-4`" + LIBS="-ljpeg -lsecur32 -lportablexdr `'$(TARGET)-pkg-config' --libs openssl libtiff-4`" $(MAKE) -C '$(1)' -j 1 lib-target $(MAKE) -C '$(1)' -j 1 install-lib $(MAKE) -C '$(1)/port' -j 1 install diff --git a/src/hdf5.mk b/src/hdf5.mk index e2459cc..417f2a9 100644 --- a/src/hdf5.mk +++ b/src/hdf5.mk @@ -22,8 +22,7 @@ define $(PKG)_BUILD --enable-cxx \ --disable-direct-vfd \ --prefix='$(PREFIX)/$(TARGET)' \ - CPPFLAGS="-DH5_HAVE_WIN32_API -D__MSVCRT_VERSION__=0x0800" \ - LIBS="-lmsvcr80" \ + CPPFLAGS="-DH5_HAVE_WIN32_API -DH5_HAVE_MINGW" \ AR='$(TARGET)-ar' $(MAKE) -C '$(1)'/src -j '$(JOBS)' $(MAKE) -C '$(1)'/src -j 1 install diff --git a/src/netcdf.mk b/src/netcdf.mk index a4dde65..d9587d6 100644 --- a/src/netcdf.mk +++ b/src/netcdf.mk @@ -28,8 +28,8 @@ define $(PKG)_BUILD --enable-netcdf-4 \ --enable-hdf4 \ --prefix='$(PREFIX)/$(TARGET)' \ - CPPFLAGS="-D__MSVCRT_VERSION__=0x0800 -D_DLGS_H" \ - LIBS="-lmfhdf -ldf -lmsvcr80 -lportablexdr -lws2_32" + CPPFLAGS="-D_DLGS_H" \ + LIBS="-lmfhdf -ldf -lportablexdr -lws2_32" $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef |