From a2361c3fd9b7e64af62a1a1ebc50d5467af6a173 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Sun, 10 Dec 2023 22:10:37 -0600 Subject: [PATCH] [keel,nostalgia] AppLib-ize nost-pack --- src/keel/CMakeLists.txt | 15 +++++++++++++++ src/nostalgia/tools/CMakeLists.txt | 9 +++++---- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/src/keel/CMakeLists.txt b/src/keel/CMakeLists.txt index 8f8df73b..c64739c9 100644 --- a/src/keel/CMakeLists.txt +++ b/src/keel/CMakeLists.txt @@ -43,5 +43,20 @@ install( ) if(TURBINE_BUILD_TYPE STREQUAL "Native") + add_library( + KeelPack-AppLib + pack-applib.cpp + ) + target_compile_definitions( + KeelPack-AppLib PUBLIC + OLYMPIC_LOAD_KEEL_MODULES=1 + OLYMPIC_APP_NAME="Keel Pack" + ) + target_link_libraries( + KeelPack-AppLib + OxClArgs + OxLogConn + NostalgiaKeelModules + ) add_subdirectory(test) endif() diff --git a/src/nostalgia/tools/CMakeLists.txt b/src/nostalgia/tools/CMakeLists.txt index 028b5e63..bc642931 100644 --- a/src/nostalgia/tools/CMakeLists.txt +++ b/src/nostalgia/tools/CMakeLists.txt @@ -1,10 +1,11 @@ -add_executable(nost-pack pack.cpp) +add_executable( + nost-pack + ${OLYMPIC_PATH}/applib/applib.cpp +) target_link_libraries( nost-pack - OxClArgs - OxLogConn - NostalgiaKeelModules + KeelPack-AppLib ) if(CMAKE_BUILD_TYPE STREQUAL "Release" AND NOT WIN32)