diff --git a/CMake/Packages/FindTBB.cmake b/CMake/Packages/FindTBB.cmake index 3303c45493a..862106055d0 100644 --- a/CMake/Packages/FindTBB.cmake +++ b/CMake/Packages/FindTBB.cmake @@ -50,19 +50,6 @@ set(TBB_INC_SEARCH_PATH ${TBB_INC_SEARCH_PATH} ${TBB_PREFIX_PATH}) # select the right files. (Chances are the distributions are shipping their # custom version of tbb, anyway, so the problem is probably nonexistant.) if (WIN32 AND MSVC) - set(COMPILER_PREFIX "vc7.1") - if (MSVC_VERSION EQUAL 1400) - set(COMPILER_PREFIX "vc8") - endif () - if (MSVC_VERSION EQUAL 1500) - set(COMPILER_PREFIX "vc9") - endif () - if (MSVC_VERSION EQUAL 1600) - set(COMPILER_PREFIX "vc10") - endif () - if (MSVC_VERSION EQUAL 1700) - set(COMPILER_PREFIX "vc11") - endif () if (MSVC_VERSION EQUAL 1800) set(COMPILER_PREFIX "vc12") endif () diff --git a/CMake/Templates/Package_vc1700.WindowsPhone.appxmanifest.in b/CMake/Templates/Package_vc1700.WindowsPhone.appxmanifest.in deleted file mode 100644 index 58034c86b47..00000000000 --- a/CMake/Templates/Package_vc1700.WindowsPhone.appxmanifest.in +++ /dev/null @@ -1,35 +0,0 @@ - - - - - ApplicationIcon.png - - - - - - - - - - - - FlipCycleTileSmall.png - 0 - FlipCycleTileMedium.png - @SHORT_NAME@ - - - - - - - - - - - - - - - diff --git a/CMake/Templates/Package_vc1700.WindowsStore.appxmanifest.in b/CMake/Templates/Package_vc1700.WindowsStore.appxmanifest.in deleted file mode 100644 index 3466cab3ae3..00000000000 --- a/CMake/Templates/Package_vc1700.WindowsStore.appxmanifest.in +++ /dev/null @@ -1,24 +0,0 @@ - - - - - @SHORT_NAME@ - Torus Knot Software - StoreLogo.png - - - 6.2.1 - 6.2.1 - - - - - - - - - - - - - diff --git a/CMake/Templates/vcrt_vc8.wxi.in b/CMake/Templates/vcrt_vc8.wxi.in deleted file mode 100644 index 6a0ecfb43ed..00000000000 --- a/CMake/Templates/vcrt_vc8.wxi.in +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/CMake/Templates/vcrt_vc9.wxi.in b/CMake/Templates/vcrt_vc9.wxi.in deleted file mode 100644 index 2d3f2df033d..00000000000 --- a/CMake/Templates/vcrt_vc9.wxi.in +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index da8354dec6e..ab2e4c84c79 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -200,19 +200,11 @@ if (MSVC) # object files can get large with Unity builds set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj") endif () - if (MSVC_VERSION GREATER 1500 OR MSVC_VERSION EQUAL 1500) - option(OGRE_BUILD_MSVC_MP "Enable build with multiple processes in Visual Studio" TRUE) - else() - set(OGRE_BUILD_MSVC_MP FALSE CACHE BOOL "Compiler option /MP requires at least Visual Studio 2008 (VS9) or newer" FORCE) - endif() + option(OGRE_BUILD_MSVC_MP "Enable build with multiple processes in Visual Studio" TRUE) if(OGRE_BUILD_MSVC_MP) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP") endif () - if(MSVC_VERSION GREATER 1400 OR MSVC_VERSION EQUAL 1400) - option(OGRE_BUILD_MSVC_ZM "Add /Zm256 compiler option to Visual Studio to fix PCH errors" TRUE) - else() - set(OGRE_BUILD_MSVC_ZM FALSE CACHE BOOL "Compiler option /Zm256 requires at least Visual Studio 2005 (VS8) or newer" FORCE) - endif() + option(OGRE_BUILD_MSVC_ZM "Add /Zm256 compiler option to Visual Studio to fix PCH errors" TRUE) if(OGRE_BUILD_MSVC_ZM) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zm256") endif ()