From 942d548fdd227d7b364664f5a44cabe76287986f Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Fri, 20 Dec 2019 00:13:23 -0600 Subject: [PATCH] [nostalgia] Make BUILD_STUDIO setting a build parameter --- CMakeLists.txt | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 27eb00da..652e2eee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,13 +5,14 @@ project(nostalgia) set(NOSTALGIA_BUILD_TYPE "Native" CACHE STRING "The type of build to produce(Native/GBA)") set(NOSTALGIA_IDE_BUILD ON CACHE STRING "Build for IDE's to run") set(NOSTALGIA_QT_PATH "" CACHE STRING "Path to Qt Libraries") +set(NOSTALGIA_BUILD_STUDIO ON CACHE STRING "Build Studio") if(NOSTALGIA_BUILD_TYPE STREQUAL "GBA") - set(NOSTALGIA_BUILD_STUDIO FALSE) + set(NOSTALGIA_BUILD_STUDIO OFF) set(OX_BARE_METAL ON) set(OX_USE_STDLIB OFF) else() - set(NOSTALGIA_BUILD_STUDIO TRUE) + set(NOSTALGIA_BUILD_STUDIO ON) set(CMAKE_PREFIX_PATH ${NOSTALGIA_QT_PATH}) endif() @@ -76,10 +77,6 @@ if(NOT MSVC) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3") endif() - - if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") - endif() endif() if(NOSTALGIA_IDE_BUILD)