OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-21 10:13:43 +03:00
Code

Update samples for VC++ 2013

Browse Source
This commit is contained in:
bugmaster 2015-09-18 12:46:25 +03:00 committed by abv
parent ee9749a81f
commit 05ff38f667
7 changed files with 105 additions and 1 deletions

2
samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj

@ -252,7 +252,7 @@
<AdditionalLibraryDirectories>$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ProgramDatabaseFile>../../../../win64\vc12\bin/mfcsample.pdb</ProgramDatabaseFile> <ProgramDatabaseFile>../../../../win64\vc12\bin/mfcsample.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
<ImportLibrary>../../../../win32\vc12\lib/mfcsample.lib</ImportLibrary> <ImportLibrary>../../../../win64\vc12\lib/mfcsample.lib</ImportLibrary>
<TargetMachine>MachineX64</TargetMachine> <TargetMachine>MachineX64</TargetMachine>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>

25
samples/qt/IESample/IESample-vc12.sln Normal file

@ -0,0 +1,25 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.21005.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IESample", "IESample.vcxproj", "{AC7D6E9F-9F0B-3AFC-B2AB-D40458175F7D}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
Release|Win32 = Release|Win32
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{AC7D6E9F-9F0B-3AFC-B2AB-D40458175F7D}.Debug|Win32.ActiveCfg = Debug|x64
{AC7D6E9F-9F0B-3AFC-B2AB-D40458175F7D}.Debug|x64.ActiveCfg = Debug|x64
{AC7D6E9F-9F0B-3AFC-B2AB-D40458175F7D}.Debug|x64.Build.0 = Debug|x64
{AC7D6E9F-9F0B-3AFC-B2AB-D40458175F7D}.Release|Win32.ActiveCfg = Release|x64
{AC7D6E9F-9F0B-3AFC-B2AB-D40458175F7D}.Release|x64.ActiveCfg = Release|x64
{AC7D6E9F-9F0B-3AFC-B2AB-D40458175F7D}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

4
samples/qt/IESample/genproj.bat

@ -24,6 +24,10 @@ if not "%1" == "" (
set VCVER=vc11 set VCVER=vc11
set EXT=vcxproj set EXT=vcxproj
set "VCVARS=%VS110COMNTOOLS%..\..\VC\vcvarsall.bat" set "VCVARS=%VS110COMNTOOLS%..\..\VC\vcvarsall.bat"
) else if /I "%1" == "vc12" (
set VCVER=vc12
set EXT=vcxproj
set "VCVARS=%VS120COMNTOOLS%..\..\VC\vcvarsall.bat"
) else ( ) else (
echo Error: first argument ^(%1^) should specify supported version of Visual C++, echo Error: first argument ^(%1^) 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^) echo one of: vc8 ^(VS 2005 SP1^), vc9 ^(VS 2008 SP1^), vc10 ^(VS 2010^) or vc11 ^(VS 2012^)

25
samples/qt/Tutorial/Tutorial-vc12.sln Normal file

@ -0,0 +1,25 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.21005.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tutorial", "Tutorial.vcxproj", "{E42C23CA-7A67-321E-9503-384C0FB7BA2C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
Release|Win32 = Release|Win32
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{E42C23CA-7A67-321E-9503-384C0FB7BA2C}.Debug|Win32.ActiveCfg = Debug|x64
{E42C23CA-7A67-321E-9503-384C0FB7BA2C}.Debug|x64.ActiveCfg = Debug|x64
{E42C23CA-7A67-321E-9503-384C0FB7BA2C}.Debug|x64.Build.0 = Debug|x64
{E42C23CA-7A67-321E-9503-384C0FB7BA2C}.Release|Win32.ActiveCfg = Release|x64
{E42C23CA-7A67-321E-9503-384C0FB7BA2C}.Release|x64.ActiveCfg = Release|x64
{E42C23CA-7A67-321E-9503-384C0FB7BA2C}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

4
samples/qt/Tutorial/genproj.bat

@ -24,6 +24,10 @@ if not "%1" == "" (
set VCVER=vc11 set VCVER=vc11
set EXT=vcxproj set EXT=vcxproj
set "VCVARS=%VS110COMNTOOLS%..\..\VC\vcvarsall.bat" set "VCVARS=%VS110COMNTOOLS%..\..\VC\vcvarsall.bat"
) else if /I "%1" == "vc12" (
set VCVER=vc12
set EXT=vcxproj
set "VCVARS=%VS120COMNTOOLS%..\..\VC\vcvarsall.bat"
) else ( ) else (
echo Error: first argument ^(%1^) should specify supported version of Visual C++, echo Error: first argument ^(%1^) 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^) echo one of: vc8 ^(VS 2005 SP1^), vc9 ^(VS 2008 SP1^), vc10 ^(VS 2010^) or vc11 ^(VS 2012^)

26
samples/qt/VoxelDemo/VoxelDemo-vc12.sln Normal file

@ -0,0 +1,26 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.21005.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VoxelDemo", "VoxelDemo.vcxproj", "{59F93AA4-FBAD-3468-B4E7-2D6290D2D461}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
Release|Win32 = Release|Win32
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{59F93AA4-FBAD-3468-B4E7-2D6290D2D461}.Debug|Win32.ActiveCfg = Debug|x64
{59F93AA4-FBAD-3468-B4E7-2D6290D2D461}.Debug|x64.ActiveCfg = Debug|x64
{59F93AA4-FBAD-3468-B4E7-2D6290D2D461}.Debug|x64.Build.0 = Debug|x64
{59F93AA4-FBAD-3468-B4E7-2D6290D2D461}.Release|Win32.ActiveCfg = Release|x64
{59F93AA4-FBAD-3468-B4E7-2D6290D2D461}.Release|x64.ActiveCfg = Release|x64
{59F93AA4-FBAD-3468-B4E7-2D6290D2D461}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

20
samples/qt/VoxelDemo/VoxelDemo.pro

@ -79,6 +79,11 @@ win32 {
OBJECTS_DIR = ./win32/vc11/objd OBJECTS_DIR = ./win32/vc11/objd
MOC_DIR = ./win32/vc11/srcd MOC_DIR = ./win32/vc11/srcd
} }
contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1800) {
DESTDIR = ./win32/vc12/bind
OBJECTS_DIR = ./win32/vc12/objd
MOC_DIR = ./win32/vc12/srcd
}
} else { } else {
LIBS = -L$(CSF_OPT_LIB64D) LIBS = -L$(CSF_OPT_LIB64D)
contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1400) { contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1400) {
@ -101,6 +106,11 @@ win32 {
OBJECTS_DIR = ./win64/vc11/objd OBJECTS_DIR = ./win64/vc11/objd
MOC_DIR = ./win64/vc11/srcd MOC_DIR = ./win64/vc11/srcd
} }
contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1800) {
DESTDIR = ./win64/vc12/bind
OBJECTS_DIR = ./win64/vc12/objd
MOC_DIR = ./win64/vc12/srcd
}
} }
} else { } else {
DEFINES += NDEBUG DEFINES += NDEBUG
@ -131,6 +141,11 @@ win32 {
OBJECTS_DIR = ./win32/vc11/obj OBJECTS_DIR = ./win32/vc11/obj
MOC_DIR = ./win32/vc11/src MOC_DIR = ./win32/vc11/src
} }
contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1800) {
DESTDIR = ./win32/vc12/bin
OBJECTS_DIR = ./win32/vc12/obj
MOC_DIR = ./win32/vc12/src
}
} else { } else {
LIBS = -L$(CSF_OPT_LIB64) LIBS = -L$(CSF_OPT_LIB64)
contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1400) { contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1400) {
@ -153,6 +168,11 @@ win32 {
OBJECTS_DIR = ./win64/vc11/obj OBJECTS_DIR = ./win64/vc11/obj
MOC_DIR = ./win64/vc11/src MOC_DIR = ./win64/vc11/src
} }
contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1800) {
DESTDIR = ./win64/vc12/bin
OBJECTS_DIR = ./win64/vc12/obj
MOC_DIR = ./win64/vc12/src
}
} }
} }
DEFINES +=WNT WIN32 NO_COMMONSAMPLE_EXPORTS NO_IESAMPLE_EXPORTS DEFINES +=WNT WIN32 NO_COMMONSAMPLE_EXPORTS NO_IESAMPLE_EXPORTS