>From e267425e43761006815ee3f668d87f9d371150b8 Mon Sep 17 00:00:00 2001 From: Martin Lambers Date: Wed, 7 Jan 2015 19:46:09 +0100 Subject: [PATCH 4/9] netcdf: fix 64 bit build and build problem --- src/netcdf.mk | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/netcdf.mk b/src/netcdf.mk index 7a87fb2..ac8409f 100644 --- a/src/netcdf.mk +++ b/src/netcdf.mk @@ -32,14 +32,10 @@ define $(PKG)_BUILD --enable-netcdf-4 \ --enable-hdf4 \ --prefix='$(PREFIX)/$(TARGET)' \ - CPPFLAGS="-D_DLGS_H" \ + CPPFLAGS="-DWIN32_LEAN_AND_MEAN -DH4_BUILT_AS_STATIC_LIB=1" \ LIBS="-lmfhdf -ldf -lportablexdr -lws2_32" $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef -$(PKG)_BUILD_x86_64-w64-mingw32 = -$(PKG)_BUILD_i686-w64-mingw32 = $(subst --enable-hdf4, --disable-hdf4,\ - $(subst -lmfhdf -ldf,,$($(PKG)_BUILD))) - $(PKG)_BUILD_SHARED = -- 2.1.4