OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-19 13:40:49 +03:00
Code Activity

0028769: Unification of msvc.bat files.

Browse Source 
Modify mfc and qt samples for supporting VS 2017.
Create general vcxproj files for all mfc samples.

Correction msvc.bat and msvc_D3D.bat in CSharp sample
This commit is contained in:
apn
2017-05-30 17:27:41 +03:00
committed by bugmaster
parent d6cda17a42
commit da67ffb75a
92 changed files with 505 additions and 19097 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
samples/qt/Tutorial/genproj.bat
View File

@@ -8,29 +8,6 @@ REM third argument specifies Debug or Release mode
call "%~dp0env.bat" %1 %2 %3
if not "%VCVER%" == "" (
if /I "%VCVER%" == "vc10" (
set VCVER=vc10
set "VCVARS=%VS100COMNTOOLS%..\..\VC\vcvarsall.bat"
) else if /I "%VCVER%" == "vc11" (
set VCVER=vc11
set "VCVARS=%VS110COMNTOOLS%..\..\VC\vcvarsall.bat"
) else if /I "%VCVER%" == "vc12" (
set VCVER=vc12
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: vc10 ^(VS 2010 SP3^), vc11 ^(VS 2012 SP3^), vc12 ^(VS 2013^) or vc14 ^(VS 2015^)
exit
)
)
if ["%ARCH%"] == ["32"] set VCARCH=x86
if ["%ARCH%"] == ["64"] set VCARCH=amd64
call "%VCVARS%" %VCARCH%
qmake -tp vc -r -o Tutorial.sln Tutorial0.pro

20
samples/qt/Tutorial/msvc.bat
View File

@@ -8,26 +8,6 @@ call "%~dp0env.bat" %1 %2 %3
rem Define path to project file
set "PRJFILE=%~dp0Tutorial.sln"
set "VisualStudioExpressName=VCExpress"
if /I "%VCVER%" == "vc10" (
set "DevEnvDir=%VS100COMNTOOLS%..\IDE"
) else if /I "%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 /I "%VCVER%" == "vc12" (
set "DevEnvDir=%VS120COMNTOOLS%..\IDE"
set "VisualStudioExpressName=WDExpress"
) else if /I "%VCVER%" == "vc14" (
set "DevEnvDir=%VS140COMNTOOLS%..\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%"