[GRASS-SVN] r71279 - in grass/branches/releasebranch_7_2: lib/raster mswindows/osgeo4w

[svn_grass at osgeo.org]

Author: martinl
Date: 2017-07-18 05:49:04 -0700 (Tue, 18 Jul 2017)
New Revision: 71279

Modified:
   grass/branches/releasebranch_7_2/lib/raster/gdal.c
   grass/branches/releasebranch_7_2/mswindows/osgeo4w/package.sh
Log:
libraster+osgeo4w: link against GDAL 2.2 (merge r71277:8 from trunk)

Modified: grass/branches/releasebranch_7_2/lib/raster/gdal.c
===================================================================
--- grass/branches/releasebranch_7_2/lib/raster/gdal.c	2017-07-18 12:44:26 UTC (rev 71278)
+++ grass/branches/releasebranch_7_2/lib/raster/gdal.c	2017-07-18 12:49:04 UTC (rev 71279)
@@ -114,6 +114,7 @@
 	"libgdal1.7.0.so",
 # endif
 # ifdef _WIN32
+	"gdal202.dll",        
 	"gdal201.dll",
 	"gdal200.dll",
 	"gdal111.dll",

Modified: grass/branches/releasebranch_7_2/mswindows/osgeo4w/package.sh
===================================================================
--- grass/branches/releasebranch_7_2/mswindows/osgeo4w/package.sh	2017-07-18 12:44:26 UTC (rev 71278)
+++ grass/branches/releasebranch_7_2/mswindows/osgeo4w/package.sh	2017-07-18 12:49:04 UTC (rev 71279)
@@ -119,7 +119,7 @@
 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/gdal202.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