diff options
author | Campbell Barton <ideasman42@gmail.com> | 2016-01-01 17:42:43 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2016-01-01 17:42:43 +0300 |
commit | 4ccc62dbc84c10a41f0ad7cc76b98466a8cc24cd (patch) | |
tree | e6170587ac021d7815276a983ad23e704357d4f2 | |
parent | 0d2b2cd37880ab7a23fdb95a7e2f917fabbc859a (diff) |
make.bat: detect MSVC location
Now this can run from any command line (without having to be launched from MSVC Command Prompt)
-rw-r--r-- | make.bat | 16 |
1 files changed, 16 insertions, 0 deletions
@@ -2,11 +2,27 @@ REM This batch file does an out-of-source CMake build in ../build_windows REM This is for users who like to configure & build Blender with a single command. +setlocal ENABLEEXTENSIONS set BLENDER_DIR=%~dp0 set BUILD_DIR=%BLENDER_DIR%..\build_windows set BUILD_TYPE=Release set BUILD_CMAKE_ARGS= +REM Detect MSVC Installation +if DEFINED VisualStudioVersion goto msvc_detect_finally +set VALUE_NAME=ProductDir +REM Check 64 bits +set KEY_NAME="HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\12.0\Setup\VC" +for /F "usebackq skip=2 tokens=1-2*" %%A IN (`REG QUERY %KEY_NAME% /v %VALUE_NAME% 2^>nul`) DO set MSVC_VC_DIR=%%C +if DEFINED MSVC_VC_DIR goto msvc_detect_finally +REM Check 32 bits +set KEY_NAME="HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\12.0\Setup\VC" +for /F "usebackq skip=2 tokens=1-2*" %%A IN (`REG QUERY %KEY_NAME% /v %VALUE_NAME% 2^>nul`) DO set MSVC_VC_DIR=%%C +if DEFINED MSVC_VC_DIR goto msvc_detect_finally +:msvc_detect_finally +if DEFINED MSVC_VC_DIR call "%MSVC_VC_DIR%\vcvarsall.bat" + + REM Sanity Checks where /Q msbuild if %ERRORLEVEL% NEQ 0 ( |