drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions Releases 9 Activity

[olympic/applib] Make applib module loading optional

Browse Source
This commit is contained in:
Gary Talent 2023-12-10 20:59:15 -06:00
parent 393259a010
commit 6a1e2f7566
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/olympic/applib/applib.cpp
View File

@ -17,6 +17,14 @@
#define OLYMPIC_PROJECT_DATADIR ".keel" #define OLYMPIC_PROJECT_DATADIR ".keel"
#endif #endif
#ifndef OLYMPIC_LOAD_KEEL_MODULES
#define OLYMPIC_LOAD_KEEL_MODULES 1
#endif
#ifndef OLYMPIC_LOAD_STUDIO_MODULES
#define OLYMPIC_LOAD_STUDIO_MODULES 0
#endif
ox::Error run( ox::Error run(
ox::StringView appName, ox::StringView appName,
ox::StringView projectDataDir, ox::StringView projectDataDir,
@ -41,8 +49,12 @@ int WinMain() {
int main(int argc, const char **argv) { int main(int argc, const char **argv) {
#endif #endif
OX_INIT_DEBUG_LOGGER(loggerConn, olympic::appName()) OX_INIT_DEBUG_LOGGER(loggerConn, olympic::appName())
#if OLYMPIC_LOAD_KEEL_MODULES
OLYMPIC_PROJECT_NAMESPACE::registerKeelModules(); OLYMPIC_PROJECT_NAMESPACE::registerKeelModules();
#endif
#if OLYMPIC_LOAD_STUDIO_MODULES
OLYMPIC_PROJECT_NAMESPACE::registerStudioModules(); OLYMPIC_PROJECT_NAMESPACE::registerStudioModules();
#endif
auto const err = run(olympic::appName(), OLYMPIC_PROJECT_DATADIR, argc, argv); auto const err = run(olympic::appName(), OLYMPIC_PROJECT_DATADIR, argc, argv);
oxAssert(err, "Something went wrong..."); oxAssert(err, "Something went wrong...");
if (err) { if (err) {

5
src/studio/applib/src/CMakeLists.txt
View File

@ -9,7 +9,10 @@ add_library(
projecttreemodel.cpp projecttreemodel.cpp
studioapp.cpp studioapp.cpp
) )
target_compile_definitions(
StudioAppLib PUBLIC
OLYMPIC_LOAD_STUDIO_MODULES=1
)
target_link_libraries( target_link_libraries(
StudioAppLib PUBLIC StudioAppLib PUBLIC
OxClArgs OxClArgs