d0s3t3ch
/
mxe
mirror of https://git.wownero.com/dsc/mxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary dependency on msvcr80.dll from hdf5 package. 

This also removes linking with libmsvcr80.a for the netcdf and gdal packages.
This commit is contained in:
Martin Lambers 2012-12-06 13:21:24 +01:00 committed by Tony Theodore
parent e2af9148c4
commit 54afd00283
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gdal.mk
View File

@ -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

3
src/hdf5.mk
View File

@ -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

4
src/netcdf.mk
View File

@ -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