diff --git a/src/nostalgia/modules/CMakeLists.txt b/src/nostalgia/modules/CMakeLists.txt index 252bb4a2..fa2b812d 100644 --- a/src/nostalgia/modules/CMakeLists.txt +++ b/src/nostalgia/modules/CMakeLists.txt @@ -16,12 +16,6 @@ target_link_libraries( NostalgiaCore-Keel NostalgiaScene-Keel ) -target_compile_definitions( - NostalgiaKeelModules PUBLIC - OLYMPIC_PROJECT_NAME="Nostalgia" - OLYMPIC_PROJECT_NAMESPACE=nostalgia - OLYMPIC_PROJECT_DATADIR=".nostalgia" -) install( FILES keelmodules.hpp @@ -48,3 +42,11 @@ if(TURBINE_BUILD_TYPE STREQUAL "Native") include/nostalgia/modules ) endif() + +add_library(NostalgiaProfile INTERFACE) +target_compile_definitions( + NostalgiaProfile INTERFACE + OLYMPIC_PROJECT_NAME="Nostalgia" + OLYMPIC_PROJECT_NAMESPACE=nostalgia + OLYMPIC_PROJECT_DATADIR=".nostalgia" +) diff --git a/src/nostalgia/studio/CMakeLists.txt b/src/nostalgia/studio/CMakeLists.txt index 12f46aab..1d0374c6 100644 --- a/src/nostalgia/studio/CMakeLists.txt +++ b/src/nostalgia/studio/CMakeLists.txt @@ -1,5 +1,3 @@ -set(CMAKE_INCLUDE_CURRENT_DIR ON) - add_executable( nostalgia-studio WIN32 MACOSX_BUNDLE ${OLYMPIC_PATH}/applib/applib.cpp @@ -7,6 +5,7 @@ add_executable( target_link_libraries( nostalgia-studio + NostalgiaProfile NostalgiaStudioModules NostalgiaKeelModules StudioAppLib diff --git a/src/nostalgia/studio/Info.plist b/src/nostalgia/studio/Info.plist index 6b080832..d2ca8b5c 100644 --- a/src/nostalgia/studio/Info.plist +++ b/src/nostalgia/studio/Info.plist @@ -3,7 +3,7 @@ CFBundleExecutable - nostalgia-studio + Nostalgia Studio CFBundleGetInfoString Nostalgia Studio CFBundleIconFile diff --git a/src/nostalgia/tools/CMakeLists.txt b/src/nostalgia/tools/CMakeLists.txt index 28bb4b88..d13dff20 100644 --- a/src/nostalgia/tools/CMakeLists.txt +++ b/src/nostalgia/tools/CMakeLists.txt @@ -6,6 +6,8 @@ add_executable( target_link_libraries( nostalgia-pack KeelPack-AppLib + NostalgiaKeelModules + NostalgiaProfile ) if(CMAKE_BUILD_TYPE STREQUAL "Release" AND NOT WIN32)