From f1b60ef29c73953025f28aa2bd0df2720a9aeecc Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Sat, 23 Dec 2023 15:03:19 -0600 Subject: [PATCH] Squashed 'deps/nostalgia/' changes from 9cb6bd4a..5b167fd5 5b167fd5 [nfde] Bump minimum CMake for NFDE to silence CMake warning a701a241 [imgui] Add target_include_directories for ImGui 9907bb8f [nostalgia] Allow building Studio mods without Studio app git-subtree-dir: deps/nostalgia git-subtree-split: 5b167fd53bd513a3a071b81fcc3b74b011d48e31 --- deps/imgui/CMakeLists.txt | 5 +++++ deps/nfde/CMakeLists.txt | 2 +- src/nostalgia/CMakeLists.txt | 7 ++++++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/deps/imgui/CMakeLists.txt b/deps/imgui/CMakeLists.txt index c18ca47..3fbdb9e 100644 --- a/deps/imgui/CMakeLists.txt +++ b/deps/imgui/CMakeLists.txt @@ -15,3 +15,8 @@ add_library( backends/imgui_impl_glfw.cpp backends/imgui_impl_opengl3.cpp ) + +target_include_directories( + imgui SYSTEM PUBLIC + . +) \ No newline at end of file diff --git a/deps/nfde/CMakeLists.txt b/deps/nfde/CMakeLists.txt index 0b6949a..863eb4f 100644 --- a/deps/nfde/CMakeLists.txt +++ b/deps/nfde/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(nativefiledialog-extended) if(NOT MSVC) diff --git a/src/nostalgia/CMakeLists.txt b/src/nostalgia/CMakeLists.txt index d644bae..4600ff5 100644 --- a/src/nostalgia/CMakeLists.txt +++ b/src/nostalgia/CMakeLists.txt @@ -5,11 +5,16 @@ project(nostalgia CXX) set(NOSTALGIA_BUILD_PLAYER ON CACHE BOOL "Build Player") set(NOSTALGIA_BUILD_STUDIO ON CACHE BOOL "Build Studio") +set(NOSTALGIA_BUILD_STUDIO_APP ON CACHE BOOL "Build Studio App") if(BUILDCORE_TARGET STREQUAL "gba") set(NOSTALGIA_BUILD_STUDIO OFF) endif() +if(NOT NOSTALGIA_BUILD_STUDIO) + set(NOSTALGIA_BUILD_STUDIO_APP OFF) +endif() + if(APPLE) set(CMAKE_INSTALL_NAME_DIR "@executable_path/../Library/nostalgia") set(NOSTALGIA_DIST_BIN NostalgiaStudio.app/Contents/MacOS) @@ -32,7 +37,7 @@ endif() if(NOT BUILDCORE_TARGET STREQUAL "gba") add_subdirectory(tools) - if(${NOSTALGIA_BUILD_STUDIO}) + if(${NOSTALGIA_BUILD_STUDIO_APP}) add_subdirectory(studio) endif() endif()