drinkingtea/nostalgia
2
0
Fork 0
Code Issues 4 Pull Requests Actions Releases 13 Activity

[nostalgia,studio] Make module handling consistent

Browse Source
This commit is contained in:
Gary Talent
2023-06-03 14:44:33 -05:00
parent 2874620bc6
commit ed169eb9b8
34 changed files with 257 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/nostalgia/studio/CMakeLists.txt
View File

@@ -7,9 +7,8 @@ add_executable(
target_link_libraries(
nostalgia-studio
NostalgiaAppModules
NostalgiaCore-Studio
NostalgiaScene-Studio
NostalgiaStudioModules
NostalgiaKeelModules
StudioAppLib
)
@@ -35,4 +34,4 @@ install(
RUNTIME DESTINATION
${NOSTALGIA_DIST_BIN}
BUNDLE DESTINATION .
)
)

24
src/nostalgia/studio/main.cpp
View File

@@ -2,27 +2,13 @@
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#include <ox/std/memory.hpp>
#include <nostalgia/appmodules/appmodules.hpp>
#include <nostalgia/core/studio/module.hpp>
#include <nostalgia/scene/studio/module.hpp>
#include <nostalgia/appmodules/keelmodules.hpp>
#include <nostalgia/appmodules/studiomodules.hpp>
#include <studioapp/studioapp.hpp>
using namespace nostalgia;
[[maybe_unused]] // GCC warns about the existence of this "unused" inline list in a header file...
ox::Vector<std::function<ox::UPtr<studio::Module>()>> BuiltinModules = {
[]() -> ox::UPtr<studio::Module> {
return ox::UPtr<studio::Module>(new core::StudioModule());
},
[]() -> ox::UPtr<studio::Module> {
return ox::UPtr<studio::Module>(new scene::StudioModule());
},
};
int main(int argc, const char **argv) {
nostalgia::loadModules();
nostalgia::registerKeelModules();
nostalgia::registerStudioModules();
return studio::main("Nostalgia Studio", ".nostalgia", argc, argv);
}
}