0027127: Implementation of compilation of OCCT Products samples on all platforms...

[occt.git] / samples / qt / Tutorial / genproj.bat

diff --git a/samples/qt/Tutorial/genproj.bat b/samples/qt/Tutorial/genproj.bat
index c8a0780..c050d12 100644 (file)
--- a/samples/qt/Tutorial/genproj.bat
+++ b/samples/qt/Tutorial/genproj.bat
@@ -6,31 +6,21 @@ REM Use first argument to specify version of Visual Studio (vc8, vc9, or vc10),
 REM second argument specifies architecture) (win32 or win64)
 REM third argument specifies Debug or Release mode
 
-Setlocal EnableDelayedExpansion
-
 call "%~dp0env.bat" %1 %2 %3
 
-set EXT=vcproj
-
 if not "%VCVER%" == "" (
-    if /I "%VCVER%" == "vc8" (
-        set VCVER=vc8
-        set "VCVARS=%VS80COMNTOOLS%..\..\VC\vcvarsall.bat"
-    ) else if /I "%VCVER%" == "vc9" (
-        set VCVER=vc9
-        set "VCVARS=%VS90COMNTOOLS%..\..\VC\vcvarsall.bat"
-    ) else if /I "%VCVER%" == "vc10" (
+    if /I "%VCVER%" == "vc10" (
         set VCVER=vc10
-        set EXT=vcxproj
         set "VCVARS=%VS100COMNTOOLS%..\..\VC\vcvarsall.bat"
     ) else if /I "%VCVER%" == "vc11" (
         set VCVER=vc11
-        set EXT=vcxproj
         set "VCVARS=%VS110COMNTOOLS%..\..\VC\vcvarsall.bat"
     ) else if /I "%VCVER%" == "vc12" (
         set VCVER=vc12
-        set EXT=vcxproj
         set "VCVARS=%VS120COMNTOOLS%..\..\VC\vcvarsall.bat"
+    ) else if /I "%VCVER%" == "vc14" (
+        set VCVER=vc14
+        set "VCVARS=%VS140COMNTOOLS%..\..\VC\vcvarsall.bat"
     ) else (
         echo Error: first argument ^(%VCVER%^) should specify supported version of Visual C++,
         echo one of: vc8 ^(VS 2005 SP1^), vc9 ^(VS 2008 SP1^), vc10 ^(VS 2010^) or vc11 ^(VS 2012^)
@@ -43,4 +33,4 @@ if ["%ARCH%"] == ["64"] set VCARCH=amd64
 
 call "%VCVARS%" %VCARCH%
 
-qmake -tp vc -o Tutorial.%EXT% Tutorial.pro
+qmake -tp vc -r -o Tutorial.sln Tutorial0.pro