drinkingtea/jasper
drinkingtea/jasper
2
0
Fork 0
Code Issues 2 Pull Requests Actions Releases Activity

Squashed 'deps/nostalgia/' changes from 9cb6bd4a..5b167fd5

Browse Source 
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
This commit is contained in:
Gary Talent 2023-12-23 15:03:19 -06:00
parent 587dd92414
commit f1b60ef29c
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
deps/imgui/CMakeLists.txt vendored
View File

@ -15,3 +15,8 @@ add_library(
backends/imgui_impl_glfw.cpp
backends/imgui_impl_opengl3.cpp
)
target_include_directories(
imgui SYSTEM PUBLIC
.
)

2
deps/nfde/CMakeLists.txt vendored
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)
project(nativefiledialog-extended)
if(NOT MSVC)

7
src/nostalgia/CMakeLists.txt
View File

@ -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()