Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
osgeo4w update: adapt to new GRASS 6.4.1 and gdal-mrsid packages
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15840 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Apr 28, 2011
1 parent 6978baf commit 1e6d510
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 8 deletions.
5 changes: 0 additions & 5 deletions ms-windows/osgeo4w/creatensis.pl
Expand Up @@ -103,11 +103,6 @@ sub getDeps {
getDeps("gdal-ecw")
}

if(-f "../addons/bin/lti_dsdk_dll.dll") {
print "Enabling MrSID support...\n" if $verbose;
getDeps("gdal-mrsid")
}

foreach my $p ( keys %pkgs ) {
my $f = "$root/$file{$p}";
$f =~ s/\/\.\//\//g;
Expand Down
2 changes: 1 addition & 1 deletion ms-windows/osgeo4w/package-nightly.cmd
@@ -1,5 +1,5 @@
@echo off
set GRASS_VERSION=6.4.0
set GRASS_VERSION=6.4.1
set SVNVERSION=c:/cygwin/bin/svnversion

set BUILDDIR=%CD%\build
Expand Down
4 changes: 2 additions & 2 deletions ms-windows/osgeo4w/qgis.bat.tmpl
Expand Up @@ -2,8 +2,8 @@

SET OSGEO4W_ROOT=@osgeo4w@
call "%OSGEO4W_ROOT%"\bin\o4w_env.bat
call "%OSGEO4W_ROOT%"\bin\grass-env.bat
call "%OSGEO4W_ROOT%"\apps\grass\grass-6.4.1\etc\env.bat
@echo off
SET GDAL_DRIVER_PATH=%OSGEO4W_ROOT%\bin\gdalplugins\1.8
path %PATH%;%OSGEO4W_ROOT%\apps\@package@\bin;%GISBASE%\bin
path %PATH%;%OSGEO4W_ROOT%\apps\@package@\bin
start "Quantum GIS" /B "%OSGEO4W_ROOT%"\apps\@package@\bin\qgis.exe %*

0 comments on commit 1e6d510

Please sign in to comment.