Changeset 20431

Timestamp:

2009-08-28T16:54:32+12:00 (15 years ago)

Author:

ak19

Message:

Changed makegs2.bat to always run Microsoft Platform SDK's Setenv.Cmd first since this is now necessary for Visual Studio 8 and onwards (version 8 does not come with windows.h anymore).

File:

• gsdl/trunk/makegs2.bat (modified) (8 diffs)

gsdl/trunk/makegs2.bat

@@ -6 +6 @@
 :: Path to VCVARS32.bat -- You can set this variable manually if needed
 :: e.g. set VCVARS="C:\Program Files\Microsoft Visual Studio\VC98\Bin\VCVARS32.BAT"
-set VCVARS=""
+set VCVARS="C:\Program Files\Microsoft Visual Studio 8\VC\bin\vcvars32.bat"
 
 :: Path to Microsoft Platform SDK's SetEnv.cmd -- You can set this variable manually if needed
-set SDK_ENV=""
+set SDK_ENV="C:\Program Files\Microsoft Platform SDK\SetEnv.Cmd"
 
 
@@ -85 +85 @@
 rem Check some known paths to VCVARS32.BAT
 :: if the user has set VCVARS32 don't look in the default places at all
-IF NOT %VCVARS%=="" GOTO PROMPT
+IF NOT %VCVARS%=="" echo ******* VCVARS set, checking for MS Platform SDK...& GOTO SET_SDK
 
 :: Visual Studio 2005 Pro --- NOT READY YET
@@ -99 +99 @@
 :: Now VCVARS has been set so it can be used when we need it
 
+:SET_SDK
+rem Check known path(s) to SetEnv.cmd
+:: if the user has set SDK_ENV don't look in the default places at all
+IF NOT %SDK_ENV%=="" GOTO CALL_SDK
+
+IF EXIST "%programfiles%\Microsoft Platform SDK\SetEnv.cmd" set SDK_ENV="%programfiles%\Microsoft Platform SDK\SetEnv.cmd"
+
+IF %SDK_ENV%=="" GOTO ENDNOSDKENV
+
+:CALL_SDK
+call %SDK_ENV%
+echo.
+echo.
+
+call %VCVARS%
+echo.
+echo.
 
 :PROMPT
@@ -124 +141 @@
 :: Only compile up the Apache web server if we're asked to
 
-rem Check known path(s) to SetEnv.cmd
-:: if the user has set SDK_ENV don't look in the default places at all
-IF NOT %SDK_ENV%=="" GOTO CALL_SDK
-
-IF EXIST "%programfiles%\Microsoft Platform SDK\SetEnv.cmd" set SDK_ENV="%programfiles%\Microsoft Platform SDK\SetEnv.cmd"
-
-IF %SDK_ENV%=="" GOTO ENDNOSDKENV
-
-:CALL_SDK
-call %SDK_ENV%
-echo.
-echo.
-
-call %VCVARS%
-echo.
-echo.
-
 :: Now unpack the custom GS2 apache web server tar.gz file
 IF NOT EXIST .\runtime-src\packages\apache-httpd\httpd-2.2.11\nul .\bin\windows\gunzip.exe -cd .\runtime-src\packages\apache-httpd\httpd-*.tar.gz | .\bin\windows\tar.exe xv --directory=./runtime-src/packages/apache-httpd
@@ -149 +149 @@
 
 :WITHOUTLOCALLIB
-call %VCVARS%
 echo.
 echo.
@@ -156 +155 @@
 
 :WITHLOCALLIB
-call %VCVARS%
 echo.
 echo.
@@ -163 +161 @@
 
 :WITHBOTH
-call %VCVARS%
 echo.
 echo.
@@ -236 +233 @@
 echo.
 echo /!\ Error /!\ - Not able to find 'SetEnv.cmd'.
-echo You need Microsoft Platform SDK to compile up the Apache web server
-echo but we were unable to find the SDK file SetEnv.cmd on your system.
-echo.
-echo Please edit the makegs2.bat file and manually set the full path to 
-echo SetEnv.cmd then run this script again.
+echo We were unable to find the SDK file SetEnv.cmd on your system.
+echo You need Microsoft Platform SDK (which is available for free) to compile 
+echo up the Apache web server. You also need it if you're working with
+echo Microsoft Visual Studio 8 or higher.
+echo.
+echo If you already have it installed, please edit the makegs2.bat file and
+echo manually set the full path to SetEnv.cmd, then run this script again.
+echo If you have an older version of Visual Studio, then you do not need the
+echo Platform SDK and can compile the Web and/or Local libraries up from the
+echo DOS command prompt using:
+echo    nmake /f win32.mak
+echo and/or
+echo    nmake /f win32.mak LOCAL_LIBRARY=1
 GOTO END