update osgeo4w build to use GDAL 1.7

git-svn-id: http://svn.osgeo.org/qgis/trunk@13913 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jul 12, 2010 · f14903a · f14903a
1 parent 5baeed1
commit f14903a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/ms-windows/osgeo4w/package.cmd b/ms-windows/osgeo4w/package.cmd
@@ -89,8 +89,8 @@ cmake -G "Visual Studio 9 2008" ^
 	-D WITH_INTERNAL_SPATIALITE=TRUE ^
 	-D CMAKE_BUILD_TYPE=%BUILDCONF% ^
 	-D CMAKE_CONFIGURATION_TYPES=%BUILDCONF% ^
-	-D GDAL_INCLUDE_DIR=%O4W_ROOT%/apps/gdal-16/include ^
-	-D GDAL_LIBRARY=%O4W_ROOT%/apps/gdal-16/lib/gdal_i.lib ^
+	-D GDAL_INCLUDE_DIR=%O4W_ROOT%/apps/gdal-17/include ^
+	-D GDAL_LIBRARY=%O4W_ROOT%/apps/gdal-17/lib/gdal_i.lib ^
 	-D PYTHON_EXECUTABLE=%O4W_ROOT%/bin/python.exe ^
 	-D PYTHON_INCLUDE_PATH=%O4W_ROOT%/apps/Python25/include ^
 	-D PYTHON_LIBRARY=%O4W_ROOT%/apps/Python25/libs/python25.lib ^

diff --git a/ms-windows/osgeo4w/qgis.bat.tmpl b/ms-windows/osgeo4w/qgis.bat.tmpl
@@ -2,7 +2,7 @@
 
 SET OSGEO4W_ROOT=@osgeo4w@
 call "%OSGEO4W_ROOT%"\bin\o4w_env.bat
-call "%OSGEO4W_ROOT%"\bin\gdal16.bat
+call "%OSGEO4W_ROOT%"\bin\gdal17.bat
 @echo off
 path %PATH%;%GISBASE%\bin
 start "Quantum GIS" /B "%OSGEO4W_ROOT%"\apps\@package@\bin\qgis.exe %*