From b78594456048d342c4d3a2d02212bbacbb0068c4 Mon Sep 17 00:00:00 2001 From: scribam Date: Mon, 20 Nov 2023 18:40:55 +0100 Subject: [PATCH] cmake: use CMAKE_CXX_EXTENSIONS for Nintendo Switch --- CMakeLists.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 543d102f2e..d0599e8612 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,7 +31,11 @@ endif() set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) -set(CMAKE_CXX_EXTENSIONS OFF) +if(NINTENDO_SWITCH) + set(CMAKE_CXX_EXTENSIONS ON) +else() + set(CMAKE_CXX_EXTENSIONS OFF) +endif() include(DetectArchitecture) if(NOT DEFINED ARCHITECTURE) @@ -194,9 +198,7 @@ if(WINDOWS_STORE) set(USE_VULKAN OFF) endif() -set_target_properties(${PROJECT_NAME} PROPERTIES - CXX_EXTENSIONS OFF - LINK_FLAGS_RELEASE -s) +set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS_RELEASE -s) if(MSVC) target_compile_options(${PROJECT_NAME} PRIVATE /GR /GS-) if(WINDOWS_STORE) @@ -224,7 +226,6 @@ target_compile_definitions(${PROJECT_NAME} PRIVATE $<$:_CRT_SECURE_NO_WARNINGS> $<$:_WINSOCK_DEPRECATED_NO_WARNING> $<$:NOMINMAX> - $<$:_DEFAULT_SOURCE> $<$:TEST_AUTOMATION> $<$:NOCRYPT> $<$,$>:_USE_MATH_DEFINES>) @@ -575,7 +576,6 @@ target_sources(${PROJECT_NAME} PRIVATE core/deps/chdpsr/cdipsr.h) add_subdirectory(core/deps/nowide EXCLUDE_FROM_ALL) -target_compile_definitions(nowide PRIVATE $<$:_DEFAULT_SOURCE>) target_link_libraries(${PROJECT_NAME} PRIVATE nowide::nowide) if(NOT MINIUPNP_FOUND)