nihilist/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt synced 2024-11-28 14:03:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Windows Driver: use more reliable way to correctly set path to VC++ 2010 in driver build batch file.

Browse Source
This commit is contained in:
Mounir IDRASSI 2016-06-18 19:13:15 +02:00
parent e4efd6820a
commit 85cab3b85f
No known key found for this signature in database
GPG Key ID: DD0C382D5FCFB8FC
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Driver/BuildDriver.cmd
View File

@ -103,12 +103,23 @@ pushd .
call %TC_WINDDK_ROOT%\bin\setenv %TC_WINDDK_ROOT% %TC_BUILD_TYPE% %TC_BUILD_ARCH% no_oacr || exit /B %errorlevel% call %TC_WINDDK_ROOT%\bin\setenv %TC_WINDDK_ROOT% %TC_BUILD_TYPE% %TC_BUILD_ARCH% no_oacr || exit /B %errorlevel%
popd popd
:: set path to VC++ 2010
IF EXIST "%programfiles(x86)%" (GOTO 64-Bit) ELSE (GOTO 32-Bit)
:32-Bit
@set "VCPATH=%programfiles%\Microsoft Visual Studio 10.0\"
GOTO CONTINUE
:64-Bit
@set "VCPATH=%programfiles(x86)%\Microsoft Visual Studio 10.0\"
GOTO CONTINUE
:CONTINUE
if "%TC_ARG_ARCH%"=="-x64" ( if "%TC_ARG_ARCH%"=="-x64" (
@call "%VS100COMNTOOLS%VCVarsQueryRegistry.bat" 32bit No64bit @set "PATH=%VCPATH%Common7\IDE;%VCPATH%VC\bin\amd64;%PATH%"
@set "PATH=%VSINSTALLDIR%Common7\IDE;%VSINSTALLDIR%VC\bin\amd64;%PATH%"
) else ( ) else (
@call "%VS100COMNTOOLS%VCVarsQueryRegistry.bat" No32bit 64bit @set "PATH=%VCPATH%Common7\IDE;%VCPATH%VC\bin;%PATH%"
@set "PATH=PATH=%VSINSTALLDIR%Common7\IDE;%VSINSTALLDIR%VC\bin;%PATH%"
) )
:: Build :: Build