X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=env_Salome.bat;h=1fa82488b0b4598876337268699a7ee9b9d4d817;hb=refs%2Ftlpr%2F42%2Fhead;hp=cdc5d716619042c85b9aed3a59ab6381d717d70a;hpb=93bfb310df17ba9fcfdb5eadf04a8c9ccb3e0f3e;p=modules%2Fshaper.git diff --git a/env_Salome.bat b/env_Salome.bat index cdc5d7166..1fa82488b 100644 --- a/env_Salome.bat +++ b/env_Salome.bat @@ -36,7 +36,7 @@ if "%BOOST_ROOT_DIR%" == "" ( cd /d %SALOME_ROOT_DIR%\WORK call set_env.bat %1 -if "%2" == run ( +if "%2" == "run" ( call "%PDIR%\env_launch.bat" ) else ( call "%PDIR%\env_compile.bat" @@ -86,6 +86,7 @@ cd /d %ROOT_DIR% @SET _NO_DEBUG_HEAP=1 +@SET VC_VERSION_SHORT=15 for /f "tokens=1,2*" %%a in ('reg query "HKLM\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\SxS\VS7" /v "%VC_VERSION_SHORT%.0" 2^>nul') do set "VSPATH=%%c" IF NOT EXIST "%VSPATH%\VC\Auxiliary\Build\vcvarsall.bat" GOTO ERROR1