Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove old unused files and msvc references <version 1800 #372

Closed
wants to merge 9 commits into from
Closed

remove old unused files and msvc references <version 1800 #372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ccff517
remove old msvc references
mosfet80 Apr 18, 2023
73b4a30
revome old MSVC references
mosfet80 Apr 18, 2023
1378b7c
Update OgreHeaderPrefix.h
mosfet80 Apr 21, 2023
e52f975
Update OgrePlatform.h
mosfet80 Apr 21, 2023
11d5494
Merge branch 'OGRECave:master' into removeFiles
mosfet80 May 8, 2023
4bcd2e0
Merge branch 'OGRECave:master' into removeFiles
mosfet80 May 13, 2023
e1302f7
Merge branch 'OGRECave:master' into removeFiles
mosfet80 Oct 4, 2023
04ab392
Merge branch 'OGRECave:master' into removeFiles
mosfet80 Mar 6, 2024
c4ae95a
Merge branch 'OGRECave:master' into removeFiles
mosfet80 Apr 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions CMake/Packages/FindTBB.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ()
Expand Down
35 changes: 0 additions & 35 deletions CMake/Templates/Package_vc1700.WindowsPhone.appxmanifest.in
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions CMake/Templates/Package_vc1700.WindowsStore.appxmanifest.in
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions CMake/Templates/vcrt_vc8.wxi.in
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions CMake/Templates/vcrt_vc9.wxi.in
View file
Open in desktop

This file was deleted.

12 changes: 2 additions & 10 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ()
Expand Down
Loading