[GRASS-SVN] r71351 - grass/branches/releasebranch_7_2/mswindows/osgeo4w

[svn_grass at osgeo.org]

Author: martinl
Date: 2017-08-09 04:06:00 -0700 (Wed, 09 Aug 2017)
New Revision: 71351

Modified:
   grass/branches/releasebranch_7_2/mswindows/osgeo4w/package.sh
Log:
wingrass32: fix builds (zlib issue)
            (merge r71350 fromm trunk)


Modified: grass/branches/releasebranch_7_2/mswindows/osgeo4w/package.sh
===================================================================
--- grass/branches/releasebranch_7_2/mswindows/osgeo4w/package.sh	2017-08-09 10:49:37 UTC (rev 71350)
+++ grass/branches/releasebranch_7_2/mswindows/osgeo4w/package.sh	2017-08-09 11:06:00 UTC (rev 71351)
@@ -117,7 +117,11 @@
 log dll.to.a
 [ -d mswindows/osgeo4w/lib ] || mkdir mswindows/osgeo4w/lib 
 dll_to_a $OSGEO4W_ROOT_MSYS/bin/proj.dll        mswindows/osgeo4w/lib/libproj
-dll_to_a $OSGEO4W_ROOT_MSYS/bin/zlib1.dll       mswindows/osgeo4w/lib/libz
+if [ "$MINGW_POSTFIX" = "64" ]; then
+    dll_to_a $OSGEO4W_ROOT_MSYS/bin/zlib1.dll       mswindows/osgeo4w/lib/libz
+else
+    dll_to_a $OSGEO4W_ROOT_MSYS/bin/zlib_osgeo.dll       mswindows/osgeo4w/lib/libz
+fi
 dll_to_a $OSGEO4W_ROOT_MSYS/bin/iconv.dll       mswindows/osgeo4w/lib/libiconv
 dll_to_a $OSGEO4W_ROOT_MSYS/bin/gdal202.dll     mswindows/osgeo4w/lib/libgdal
 dll_to_a $OSGEO4W_ROOT_MSYS/bin/liblas_c.dll    mswindows/osgeo4w/lib/liblas_c