build: Use %ProgramFiles(x86)% environment variable during build.

peter-b · peter-b · commit 44890bfe5581 · 2015-10-27T12:29:19.000Z
When compiling on newer versions of Windows, Visual Studio may be located
in either `C:\Program Files` or `C:\Program Files (x86)`, depending on
whether the operating system is 32-bit or 64-bit.
diff --git a/make.cmd b/make.cmd
@@ -2,15 +2,15 @@
 @REM More-or-less the same effect as running vcvars32.bat
 @REM from the Visual Studio source tree.
 @REM @call vcvars32
-@set "PATH=C:\Program Files\Microsoft Visual Studio 10.0\VSTSDB\Deploy;C:\Program Files\Microsoft Visual Studio 10.0\Common7\IDE\;C:\Program Files\Microsoft Visual Studio 10.0\VC\BIN;C:\Program Files\Microsoft Visual Studio 10.0\Common7\Tools;C:\Windows\Microsoft.NET\Framework\v4.0.30319;C:\Windows\Microsoft.NET\Framework\v3.5;C:\Program Files\Microsoft Visual Studio 10.0\VC\VCPackages;C:\Program Files\HTML Help Workshop;C:\Program Files\Microsoft SDKs\Windows\7.0A\bin\NETFX 4.0 Tools;C:\Program Files\Microsoft SDKs\Windows\7.0A\bin;C:\Perl\site\bin;C:\Perl\bin;C:\windows\system32;C:\windows;C:\windows\system32\wbem"
- 
+@set "PATH=%ProgramFiles(x86)%\Microsoft Visual Studio 10.0\VSTSDB\Deploy;%ProgramFiles(x86)%\Microsoft Visual Studio 10.0\Common7\IDE\;%ProgramFiles(x86)%\Microsoft Visual Studio 10.0\VC\BIN;%ProgramFiles(x86)%\Microsoft Visual Studio 10.0\Common7\Tools;C:\Windows\Microsoft.NET\Framework\v4.0.30319;C:\Windows\Microsoft.NET\Framework\v3.5;%ProgramFiles(x86)%\Microsoft Visual Studio 10.0\VC\VCPackages;%ProgramFiles(x86)%\HTML Help Workshop;%ProgramFiles(x86)%\Microsoft SDKs\Windows\7.0A\bin\NETFX 4.0 Tools;%ProgramFiles(x86)%\Microsoft SDKs\Windows\7.0A\bin;C:\Perl\site\bin;C:\Perl\bin;C:\windows\system32;C:\windows;C:\windows\system32\wbem"
+
 @REM Works around hangs when generating .pdb files
 @REM Needs to run in the background as never terminates
 @REM
 @start /min /b mspdbsrv -start -spawn -shutdowntime -1
 
 @REM Select the correct build mode.
-@REM 
+@REM
 @IF NOT DEFINED BUILDTYPE SET BUILDTYPE=Debug
 
 @REM Select the correct build project file
@@ -29,6 +29,5 @@ IF -%1-==-- (
 )
 
 @msbuild %BUILD_PROJECT% /fl /flp:Verbosity=normal /nologo /p:Configuration=%BUILDTYPE% /m:1 /t:%TARGET%
- 
-@exit %ERRORLEVEL%
 
+@exit %ERRORLEVEL%
