diff --git a/flake.nix b/flake.nix index c5c40e2..0317113 100755 --- a/flake.nix +++ b/flake.nix @@ -271,7 +271,7 @@ apps.${system}.default = { type = "app"; - program = "${self.Archimedes}/bin/Archimedes"; + program = "${self.Archimedes.examples.minimal}/bin/Archimedes"; }; }; diff --git a/include/utils/Module/Module.h b/include/utils/Module/Module.h index 078850e..222d10a 100644 --- a/include/utils/Module/Module.h +++ b/include/utils/Module/Module.h @@ -11,10 +11,11 @@ namespace Archimedes { friend class App; - static std::list modules; public: typedef Module* create_t(void*, App*); + + static std::list modules; static std::list& GetModules() { return modules; } @@ -41,4 +42,6 @@ namespace Archimedes { }; } +auto Archimedes::Module::modules = std::list(); + #endif diff --git a/src/example_apps/MinimalApp/MinimalApp.cpp b/src/example_apps/MinimalApp/MinimalApp.cpp index 0ee394d..104ded8 100644 --- a/src/example_apps/MinimalApp/MinimalApp.cpp +++ b/src/example_apps/MinimalApp/MinimalApp.cpp @@ -6,7 +6,7 @@ void MinimalApp::run() { for(auto* m : modules) m->onLoad(); - for(auto* s : Archimedes::Module::GetModules()) + for(auto* s : Archimedes::Module::modules) std::cout << "Module: " << (s ? *s : "nullptr") << std::endl; // Main loop while (!done && !modules.empty()) { diff --git a/src/example_apps/MinimalApp/MinimalApp.h b/src/example_apps/MinimalApp/MinimalApp.h index 2689427..d68fb17 100644 --- a/src/example_apps/MinimalApp/MinimalApp.h +++ b/src/example_apps/MinimalApp/MinimalApp.h @@ -23,9 +23,9 @@ class MinimalApp : public Archimedes::App { void run(); - void stopModule(std::list::iterator); + //void stopModule(std::list::iterator); - void startModule(std::string); + //void startModule(std::string); };