diff --git a/src/nostalgia/studio/CMakeLists.txt b/src/nostalgia/studio/CMakeLists.txt index e54ff6c8..ef14f695 100644 --- a/src/nostalgia/studio/CMakeLists.txt +++ b/src/nostalgia/studio/CMakeLists.txt @@ -3,6 +3,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) add_executable( nostalgia-studio MACOSX_BUNDLE aboutpopup.cpp + builtinmodules.cpp clawviewer.cpp filedialogmanager.cpp main.cpp @@ -31,13 +32,6 @@ if(APPLE) set_target_properties(nostalgia-studio PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist) endif() -install( - FILES - nostalgia-studio.json - DESTINATION - ${NOSTALGIA_DIST_RESOURCES} -) - install( FILES ns_logo128.png diff --git a/src/nostalgia/studio/builtinmodules.cpp b/src/nostalgia/studio/builtinmodules.cpp new file mode 100644 index 00000000..8391b4ff --- /dev/null +++ b/src/nostalgia/studio/builtinmodules.cpp @@ -0,0 +1,22 @@ +/* + * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + */ + +#include + +#include +#include + +namespace nostalgia { + +[[maybe_unused]] // GCC warns about the existence of this "unused" inline list in a header file... +ox::Vector()>> BuiltinModules = { + []() -> ox::UPtr { + return ox::UPtr(new core::StudioModule()); + }, + []() -> ox::UPtr { + return ox::UPtr(new scene::StudioModule()); + }, +}; + +} diff --git a/src/nostalgia/studio/builtinmodules.hpp b/src/nostalgia/studio/builtinmodules.hpp index af276365..0b937d46 100644 --- a/src/nostalgia/studio/builtinmodules.hpp +++ b/src/nostalgia/studio/builtinmodules.hpp @@ -4,21 +4,12 @@ #pragma once -#include +#include "lib/module.hpp" -#include -#include +#include namespace nostalgia { -[[maybe_unused]] // GCC warns about the existence of this "unused" inline list in a header file... -inline ox::Vector()>, 2> BuiltinModules = { - []() -> ox::UPtr { - return ox::UPtr(new core::StudioModule()); - }, - []() -> ox::UPtr { - return ox::UPtr(new scene::StudioModule()); - }, -}; +extern ox::Vector()>> BuiltinModules; -} +} \ No newline at end of file