mirror of
https://github.com/qgis/QGIS.git
synced 2025-04-14 00:07:35 -04:00
osgeo4w update: adapt to new GRASS 6.4.1 and gdal-mrsid packages
git-svn-id: http://svn.osgeo.org/qgis/trunk@15840 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
parent
d52820fb65
commit
b33fa930f9
@ -103,11 +103,6 @@ if(-f "../addons/bin/NCSEcw4_RO.dll") {
|
||||
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;
|
||||
|
@ -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
|
||||
|
@ -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 %*
|
||||
|
Loading…
x
Reference in New Issue
Block a user