diff --git a/samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj b/samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj index 2f819d2780..640653263c 100644 --- a/samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj +++ b/samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj @@ -252,7 +252,7 @@ $(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) ../../../../win64\vc12\bin/mfcsample.pdb Windows - ../../../../win32\vc12\lib/mfcsample.lib + ../../../../win64\vc12\lib/mfcsample.lib MachineX64 diff --git a/samples/qt/IESample/IESample-vc12.sln b/samples/qt/IESample/IESample-vc12.sln new file mode 100644 index 0000000000..923d523c1c --- /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 1c5a7fd864..8ac891a16e 100644 --- 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 index 0000000000..7c828fc78a --- /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 b93f8ff5cd..7830bfd6d0 100644 --- 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 index 0000000000..7bf6231f7d --- /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 84d764fccd..90a408003c 100644 --- 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