[GRASS-SVN] r71387 - grass/branches/releasebranch_7_0/mswindows/osgeo4w
svn_grass at osgeo.org
svn_grass at osgeo.org
Fri Aug 11 00:51:42 PDT 2017
Author: martinl
Date: 2017-08-11 00:51:42 -0700 (Fri, 11 Aug 2017)
New Revision: 71387
Modified:
grass/branches/releasebranch_7_0/mswindows/osgeo4w/package.sh
Log:
wingrass32: fix builds (zlib issue)
(merge r71350,r71352 from trunk)
Modified: grass/branches/releasebranch_7_0/mswindows/osgeo4w/package.sh
===================================================================
--- grass/branches/releasebranch_7_0/mswindows/osgeo4w/package.sh 2017-08-10 21:35:10 UTC (rev 71386)
+++ grass/branches/releasebranch_7_0/mswindows/osgeo4w/package.sh 2017-08-11 07:51:42 UTC (rev 71387)
@@ -117,17 +117,24 @@
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
dll_to_a $OSGEO4W_ROOT_MSYS/bin/iconv.dll mswindows/osgeo4w/lib/libiconv
dll_to_a $OSGEO4W_ROOT_MSYS/bin/gdal200.dll mswindows/osgeo4w/lib/libgdal
dll_to_a $OSGEO4W_ROOT_MSYS/bin/liblas_c.dll mswindows/osgeo4w/lib/liblas_c
dll_to_a $OSGEO4W_ROOT_MSYS/bin/geos_c.dll mswindows/osgeo4w/lib/libgeos_c
dll_to_a $OSGEO4W_ROOT_MSYS/bin/libtiff.dll mswindows/osgeo4w/lib/libtiff
+dll_to_a $OSGEO4W_ROOT_MSYS/bin/libpq.dll mswindows/osgeo4w/lib/libpq
+dll_to_a $OSGEO4W_ROOT_MSYS/bin/libmysql.dll mswindows/osgeo4w/lib/libmysqlclient
+dll_to_a $OSGEO4W_ROOT_MSYS/bin/sqlite3.dll mswindows/osgeo4w/lib/libsqlite3
+dll_to_a $OSGEO4W_ROOT_MSYS/bin/cairo.dll mswindows/osgeo4w/lib/libcairo
+dll_to_a $OSGEO4W_ROOT_MSYS/bin/libfftw3-3.dll mswindows/osgeo4w/lib/libfftw3
+dll_to_a $OSGEO4W_ROOT_MSYS/bin/pdcurses.dll mswindows/osgeo4w/lib/libpdcurses
if [ "$MINGW_POSTFIX" = "64" ]; then
+ dll_to_a $OSGEO4W_ROOT_MSYS/bin/zlib1.dll mswindows/osgeo4w/lib/libz
dll_to_a $OSGEO4W_ROOT_MSYS/bin/libpng16.dll mswindows/osgeo4w/lib/libpng
dll_to_a $OSGEO4W_ROOT_MSYS/bin/jpeg.dll mswindows/osgeo4w/lib/libjpeg
else
# TODO (related to dependecies)
+ dll_to_a $OSGEO4W_ROOT_MSYS/bin/zlib_osgeo.dll mswindows/osgeo4w/lib/libz
# dll_to_a $OSGEO4W_ROOT_MSYS/bin/libpng12-0.dll mswindows/osgeo4w/lib/libpng
dll_to_a $OSGEO4W_ROOT_MSYS/bin/jpeg_osgeo.dll mswindows/osgeo4w/lib/libjpeg
fi
More information about the grass-commit
mailing list