improved msvc detection

git-svn-id: svn://svn.code.sf.net/p/loki-lib/code/trunk@244 7ec92016-0320-0410-acc4-a06ded1c099a
This commit is contained in:
syntheticpp 2005-09-16 11:35:21 +00:00
parent 9cd0057667
commit c4b47312e0

View file

@ -1,5 +1,29 @@
@ECHO OFF @ECHO OFF
:: Viual C++ 7.1
if defined VS71COMNTOOLS (
if exist "%VS71COMNTOOLS%\vsvars32.bat" (
echo -
echo - Visual C++ 7.1 found.
echo -
call "%VS71COMNTOOLS %\vsvars32.bat"
set TRY_THIS_SDK_PATH=%VS71COMNTOOLS%\..\..\..
goto STARTCOMPILING
)
)
:: Viual C++ 8.0
if defined VS80COMNTOOLS (
if exist "%VS80COMNTOOLS%\vsvars32.bat" (
echo -
echo - Visual C++ 8.0 found.
echo -
call "%VS80COMNTOOLS%\vsvars32.bat"
set TRY_THIS_SDK_PATH=%VS80COMNTOOLS%\..\..\..
goto STARTCOMPILING
)
)
:: Toolkit 2003 :: Toolkit 2003
if defined VCToolkitInstallDir ( if defined VCToolkitInstallDir (
if exist "%VCToolkitInstallDir%\vcvars32.bat" ( if exist "%VCToolkitInstallDir%\vcvars32.bat" (
@ -7,35 +31,18 @@ if defined VCToolkitInstallDir (
echo - VC 7.1 Toolkit found. echo - VC 7.1 Toolkit found.
echo - echo -
call "%VCToolkitInstallDir%\vcvars32.bat" call "%VCToolkitInstallDir%\vcvars32.bat"
set TRY_THIS_SDK_PATH=%VCToolkitInstallDir%\..
goto STARTCOMPILING goto STARTCOMPILING
) )
) )
:: Viual C++
if defined VCINSTALLDIR (
if exist "%VCINSTALLDIR%\vcvarsall.bat" (
echo -
echo - Visual C++ found.
echo -
call "%VCINSTALLDIR%\vcvarsall.bat" x86
set MSVCDir=%VCINSTALLDIR%
goto STARTCOMPILING
)
if exist "%VCINSTALLDIR%\vcvars32.bat" (
echo -
echo - Visual C++ found.
echo -
call "%VCINSTALLDIR%\vcvars32.bat"
goto STARTCOMPILING
)
)
echo - echo -
echo - No Visual C++ found, please set the enviroment variable echo - No Visual C++ found, please set the enviroment variable
echo - echo -
echo - VCToolkitInstallDir or VCINSTALLDIR echo - VCToolkitInstallDir or VS71COMNTOOLS or VS80COMNTOOLS
echo - echo -
echo - to your Visual C++ installation folder. echo - to your Visual Strudio folder which contains vsvars32.bat.
echo - echo -
echo - Or call the vcvars32.bat/vcvarsall.bat file. echo - Or call the vcvars32.bat/vcvarsall.bat file.
echo - echo -
@ -45,6 +52,8 @@ goto ERROR
:STARTCOMPILING :STARTCOMPILING
@ECHO ON
:: loki buid process :: loki buid process
cd src cd src