0028920: Samples - fix msvc.bat for building samples without CMake

[occt.git] / samples / CSharp / msvc.bat

diff --git a/samples/CSharp/msvc.bat b/samples/CSharp/msvc.bat
index 902b3fa..290a981 100644 (file)
--- a/samples/CSharp/msvc.bat
+++ b/samples/CSharp/msvc.bat
@@ -1,38 +1,19 @@
 @echo off
 
+Setlocal EnableDelayedExpansion
+
 rem Setup environment
-call "%~dp0../../env.bat" %1 %2 %3
+call "%~dp0env.bat" %1 %2 %3
 
 rem Define path to project file
 set "PRJFILE=%~dp0\CSharp.sln"
 
-set "VisualStudioExpressName=VCExpress"
-
-if "%VCVER%" == "vc8" (
-  set "DevEnvDir=%VS80COMNTOOLS%..\IDE"
-) else if "%VCVER%" == "vc9" (
-  set "DevEnvDir=%VS90COMNTOOLS%..\IDE"
-) else if "%VCVER%" == "vc10" (
-  set "DevEnvDir=%VS100COMNTOOLS%..\IDE"
-) else if "%VCVER%" == "vc11" (
-  set "DevEnvDir=%VS110COMNTOOLS%..\IDE"
-  rem Visual Studio Express starting from VS 2012 is called "for Windows Desktop"
-  rem and has a new name for executable - WDExpress
-  set "VisualStudioExpressName=WDExpress"
-) else if "%VCVER%" == "vc12" (
-  set "DevEnvDir=%VS120COMNTOOLS%..\IDE"
-  set "VisualStudioExpressName=WDExpress"
-) else (
-  echo Error: wrong VS identifier
-  exit /B
-)
-
 rem Launch Visual Studio - either professional (devenv) or Express, as available
 if exist "%DevEnvDir%\devenv.exe"  (
-  start "%DevEnvDir%\devenv.exe" "%PRJFILE%"
+  start "" "%DevEnvDir%\devenv.exe" "%PRJFILE%"
 ) else if exist "%DevEnvDir%\%VisualStudioExpressName%.exe"  (
-  start "%DevEnvDir%\%VisualStudioExpressName%.exe" "%PRJFILE%"
+  start "" "%DevEnvDir%\%VisualStudioExpressName%.exe" "%PRJFILE%"
 ) else (
   echo Error: Could not find MS Visual Studio ^(%VCVER%^)
-  echo Check relevant environment variable ^(e.g. VS80COMNTOOLS for vc8^)
+  echo Check relevant environment variable ^(e.g. VS100COMNTOOLS for vc10^)
 )