mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-03-14 01:27:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Cotire to 1.7.3

Browse Source 
It fixes some bugs. Also use add_compile_options instead of add_defenitions where necessary
This commit is contained in:
Danila Malyutin 2015-08-15 01:14:49 +03:00 committed by Nekotekina
parent aeee0758c2
commit 0fb8ad8c5a
2 changed files with 878 additions and 540 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rpcs3/CMakeLists.txt
View File

@ -1,6 +1,7 @@
cmake_minimum_required(VERSION 2.8)
cmake_minimum_required(VERSION 2.8.12)
set (CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake_modules")
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake_modules")
set(CMAKE_VERBOSE_MAKEFILE ON)
include(cotire)
project(rpcs3)
@ -17,7 +18,7 @@ if (CMAKE_COMPILER_IS_GNUCXX)
message(FATAL_ERROR "GCC ${CMAKE_CXX_COMPILER_VERSION} is too old.")
endif()
# Warnings
add_definitions(-Wno-attributes -Wno-enum-compare -Wno-invalid-offsetof)
add_compile_options(-Wno-attributes -Wno-enum-compare -Wno-invalid-offsetof)
elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
# TODO: stdlib?
endif()
@ -33,7 +34,7 @@ if (NOT MSVC)
set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -Os -D_NDEBUG")
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O1 -D_NDEBUG")
set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O1 -g -D_NDEBUG")
add_definitions(-msse -msse2 -mcx16 -mssse3)
add_compile_options(-msse -msse2 -mcx16 -mssse3)
else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHa /Zc:throwingNew /D _CRT_SECURE_NO_DEPRECATE=1 /D _CRT_NON_CONFORMING_SWPRINTFS=1 /D _SCL_SECURE_NO_WARNINGS=1")
endif()

1409
rpcs3/cmake_modules/cotire.cmake
View File

File diff suppressed because it is too large Load Diff