projects / occt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7afe616)
Update samples for VC++ 2013
authorbugmaster <bugmaster@opencascade.com>
Fri, 18 Sep 2015 09:46:25 +0000 (12:46 +0300)
committerbugmaster <bugmaster@opencascade.com>
Fri, 18 Sep 2015 09:47:56 +0000 (12:47 +0300)
samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj patch | blob | blame | history
samples/qt/IESample/IESample-vc12.sln [new file with mode: 0644] patch | blob
samples/qt/IESample/genproj.bat patch | blob | blame | history
samples/qt/Tutorial/Tutorial-vc12.sln [new file with mode: 0644] patch | blob
samples/qt/Tutorial/genproj.bat patch | blob | blame | history
samples/qt/VoxelDemo/VoxelDemo-vc12.sln [new file with mode: 0644] patch | blob
samples/qt/VoxelDemo/VoxelDemo.pro patch | blob | blame | history

diff --git a/samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj b/samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj
index 2f819d2780019aea4c74a7b5fcbfeaaf76383ebb..640653263c9f64a8d42e9018658393e3b73e299f 100644 (file)
--- a/samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj
+++ b/samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj
@@ -252,7 +252,7 @@
       <AdditionalLibraryDirectories>$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>../../../../win64\vc12\bin/mfcsample.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
-      <ImportLibrary>../../../../win32\vc12\lib/mfcsample.lib</ImportLibrary>
+      <ImportLibrary>../../../../win64\vc12\lib/mfcsample.lib</ImportLibrary>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
diff --git a/samples/qt/IESample/IESample-vc12.sln b/samples/qt/IESample/IESample-vc12.sln
new file mode 100644 (file)
index 0000000..923d523
--- /dev/null
+++ b/samples/qt/IESample/IESample-vc12.sln
@@ -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
diff --git a/samples/qt/IESample/genproj.bat b/samples/qt/IESample/genproj.bat
index 1c5a7fd86482e655528e8830d98af67d739d23ae..8ac891a16e26337eaf5eacc43c3122834cb835ca 100644 (file)
--- a/samples/qt/IESample/genproj.bat
+++ b/samples/qt/IESample/genproj.bat
@@ -24,6 +24,10 @@ if not "%1" == "" (
         set VCVER=vc11
         set EXT=vcxproj
         set "VCVARS=%VS110COMNTOOLS%..\..\VC\vcvarsall.bat"
+    ) else if /I "%1" == "vc12" (
+        set VCVER=vc12
+        set EXT=vcxproj
+        set "VCVARS=%VS120COMNTOOLS%..\..\VC\vcvarsall.bat"
     ) else (
         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^)
diff --git a/samples/qt/Tutorial/Tutorial-vc12.sln b/samples/qt/Tutorial/Tutorial-vc12.sln
new file mode 100644 (file)
index 0000000..7c828fc
--- /dev/null
+++ b/samples/qt/Tutorial/Tutorial-vc12.sln
@@ -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
diff --git a/samples/qt/Tutorial/genproj.bat b/samples/qt/Tutorial/genproj.bat
index b93f8ff5cd28d82954c21150e5e49dfe212f21dc..7830bfd6d0f4e9f40a509254ce366c88e107c8bf 100644 (file)
--- a/samples/qt/Tutorial/genproj.bat
+++ b/samples/qt/Tutorial/genproj.bat
@@ -24,6 +24,10 @@ if not "%1" == "" (
         set VCVER=vc11
         set EXT=vcxproj
         set "VCVARS=%VS110COMNTOOLS%..\..\VC\vcvarsall.bat"
+    ) else if /I "%1" == "vc12" (
+        set VCVER=vc12
+        set EXT=vcxproj
+        set "VCVARS=%VS120COMNTOOLS%..\..\VC\vcvarsall.bat"
     ) else (
         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^)
diff --git a/samples/qt/VoxelDemo/VoxelDemo-vc12.sln b/samples/qt/VoxelDemo/VoxelDemo-vc12.sln
new file mode 100644 (file)
index 0000000..7bf6231
--- /dev/null
+++ b/samples/qt/VoxelDemo/VoxelDemo-vc12.sln
@@ -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
diff --git a/samples/qt/VoxelDemo/VoxelDemo.pro b/samples/qt/VoxelDemo/VoxelDemo.pro
index 84d764fccd0e299c78eb1e1ebfe775d218eb749d..90a408003cba09911fef1a4c638287122e682eea 100644 (file)
--- a/samples/qt/VoxelDemo/VoxelDemo.pro
+++ b/samples/qt/VoxelDemo/VoxelDemo.pro
@@ -79,6 +79,11 @@ win32 {
                OBJECTS_DIR = ./win32/vc11/objd
                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 {
                LIBS = -L$(CSF_OPT_LIB64D)
                contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1400) {
@@ -101,6 +106,11 @@ win32 {
                OBJECTS_DIR = ./win64/vc11/objd
                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 {
        DEFINES += NDEBUG
@@ -131,6 +141,11 @@ win32 {
                OBJECTS_DIR = ./win32/vc11/obj
                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 {
                LIBS = -L$(CSF_OPT_LIB64)
                contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1400) {
@@ -153,6 +168,11 @@ win32 {
                OBJECTS_DIR = ./win64/vc11/obj
                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
Open CASCADE Technology repository