mirror of
https://github.com/TerryCavanagh/VVVVVV.git
synced 2024-12-22 09:39:43 +01:00
correctly set VVV_CXX_SRC flags (set_source_files_properties isn't cumulative)
This commit is contained in:
parent
4587fa46b0
commit
11d0e7f91e
1 changed files with 3 additions and 11 deletions
|
@ -280,17 +280,15 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
|
||||||
target_compile_options(VVVVVV PRIVATE -Wno-c99-extensions)
|
target_compile_options(VVVVVV PRIVATE -Wno-c99-extensions)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
# Set standards version, disable exceptions and RTTI
|
||||||
if(MSVC)
|
if(MSVC)
|
||||||
# MSVC doesn't have /std:c99 or /std:c++98 switches!
|
# MSVC doesn't have /std:c99 or /std:c++98 switches!
|
||||||
|
|
||||||
# MSVC does not officially support disabling exceptions,
|
# MSVC does not officially support disabling exceptions,
|
||||||
# so this is as far as we are willing to go to disable them.
|
# so this is as far as we are willing to go to disable them.
|
||||||
string(REGEX REPLACE "/EH[a-z]+" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
|
string(REGEX REPLACE "/EH[a-z]+" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
|
||||||
set_source_files_properties(${VVV_CXX_SRC} PROPERTIES COMPILE_FLAGS /EHsc)
|
|
||||||
|
|
||||||
# Disable RTTI
|
|
||||||
string(REPLACE "/GR" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
|
string(REPLACE "/GR" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
|
||||||
set_source_files_properties(${VVV_CXX_SRC} PROPERTIES COMPILE_FLAGS /GR-)
|
set_source_files_properties(${VVV_CXX_SRC} PROPERTIES COMPILE_FLAGS "/EHsc /GR-")
|
||||||
|
|
||||||
if(MSVC_VERSION GREATER 1900)
|
if(MSVC_VERSION GREATER 1900)
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /utf-8")
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /utf-8")
|
||||||
|
@ -301,15 +299,9 @@ else()
|
||||||
set_source_files_properties(${VVV_C_SRC} PROPERTIES COMPILE_FLAGS -std=c99)
|
set_source_files_properties(${VVV_C_SRC} PROPERTIES COMPILE_FLAGS -std=c99)
|
||||||
|
|
||||||
string(REGEX REPLACE "-std=[a-z0-9+]+" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
|
string(REGEX REPLACE "-std=[a-z0-9+]+" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
|
||||||
set_source_files_properties(${VVV_CXX_SRC} PROPERTIES COMPILE_FLAGS -std=c++98)
|
|
||||||
|
|
||||||
# Disable exceptions
|
|
||||||
string(REPLACE "-fexceptions" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
|
string(REPLACE "-fexceptions" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
|
||||||
set_source_files_properties(${VVV_CXX_SRC} PROPERTIES COMPILE_FLAGS -fno-exceptions)
|
|
||||||
|
|
||||||
# Disable RTTI
|
|
||||||
string(REPLACE "-frtti" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
|
string(REPLACE "-frtti" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
|
||||||
set_source_files_properties(${VVV_CXX_SRC} PROPERTIES COMPILE_FLAGS -fno-rtti)
|
set_source_files_properties(${VVV_CXX_SRC} PROPERTIES COMPILE_FLAGS "-std=c++98 -fno-exceptions -fno-rtti")
|
||||||
|
|
||||||
# Dependencies (as needed)
|
# Dependencies (as needed)
|
||||||
set_source_files_properties(${FAUDIO_SRC} PROPERTIES COMPILE_FLAGS -std=c99)
|
set_source_files_properties(${FAUDIO_SRC} PROPERTIES COMPILE_FLAGS -std=c99)
|
||||||
|
|
Loading…
Reference in a new issue