diff options
author | Nadia Holmquist Pedersen <nadia@nhp.sh> | 2020-06-03 13:54:28 +0200 |
---|---|---|
committer | Nadia Holmquist Pedersen <nadia@nhp.sh> | 2020-06-03 13:54:28 +0200 |
commit | f9f366e296a68be0aa2eb7bfd0552da31896a18c (patch) | |
tree | f52760d5505b84074a9c1b50b4fe16e40035ba06 /CMakeLists.txt | |
parent | b746c0b7279d1f5b4bcfd02c115b09d583e9df4f (diff) | |
parent | d6332f96f162849ad0dde2738cacd3fae6e76e5d (diff) |
Merge remote-tracking branch 'remotes/upstream/master' into feature/qt-platform
# Conflicts:
# src/frontend/qt_sdl/CMakeLists.txt
# src/frontend/qt_sdl/Platform.cpp
# src/frontend/qt_sdl/main.cpp
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 488da81..885f0dd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,23 +10,17 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) project(melonDS) -if(NOT CMAKE_BUILD_TYPE) +if (NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE Release) endif() -if (CMAKE_BUILD_TYPE STREQUAL Release) - option(ENABLE_LTO "Enable link-time optimization" ON) -else() - option(ENABLE_LTO "Enable link-time optimization" OFF) +if (CMAKE_BUILD_TYPE STREQUAL Debug) + add_compile_options(-Og) endif() -if(ENABLE_LTO) - add_compile_options(-O3 -flto) - set(CMAKE_AR "gcc-ar") - set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> qcs <TARGET> <LINK_FLAGS> <OBJECTS>") - set(CMAKE_C_ARCHIVE_FINISH true) - set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> qcs <TARGET> <LINK_FLAGS> <OBJECTS>") - set(CMAKE_CXX_ARCHIVE_FINISH true) +if (CMAKE_BUILD_TYPE STREQUAL Release) + add_compile_options(-O3) + add_link_options(-s) endif() add_compile_options(-fno-pic) @@ -34,12 +28,12 @@ add_link_options(-no-pie) option(BUILD_QT_SDL "Build Qt/SDL frontend" ON) +if (WIN32) + option(BUILD_STATIC "Statically link dependencies" OFF) +endif() + add_subdirectory(src) if (BUILD_QT_SDL) add_subdirectory(src/frontend/qt_sdl) endif() - -configure_file( - ${CMAKE_SOURCE_DIR}/romlist.bin - ${CMAKE_BINARY_DIR}/romlist.bin COPYONLY) |