From 5955166ac0e91dc318b0968ee8dbc8d5a3b9c9f2 Mon Sep 17 00:00:00 2001 From: Nathan Date: Sat, 29 Mar 2025 18:44:14 -0500 Subject: [PATCH] linking error? --- flake.nix | 4 ++-- include/entryPoint.h | 13 +++++++++---- src/example_apps/MinimalApp/MinimalApp.h | 4 +++- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/flake.nix b/flake.nix index a02e9e8..c5c40e2 100755 --- a/flake.nix +++ b/flake.nix @@ -35,8 +35,8 @@ buildPhase = '' clang++ \ - src/example_apps/MinimalApp/*.cpp \ - include/utils/App/*.cpp \ + src/example_apps/MinimalApp/MinimalApp.cpp \ + include/utils/App/App.cpp \ -I src -I include \ -Wall \ -o $name diff --git a/include/entryPoint.h b/include/entryPoint.h index 3213dbc..71e93b8 100644 --- a/include/entryPoint.h +++ b/include/entryPoint.h @@ -1,9 +1,14 @@ -#ifdef APP_TYPE +#ifdef ENTRYPOINT +#undef ENTRYPOINT + +#include "utils/App/App.h" + +Archimedes::App* MakeApp(); int main(int argc, char* argv[]) { - APP_TYPE app; - app.handleArgs(argc, argv); - app.run(); + Archimedes::App* app = MakeApp(); + app->handleArgs(argc, argv); + app->run(); } #endif diff --git a/src/example_apps/MinimalApp/MinimalApp.h b/src/example_apps/MinimalApp/MinimalApp.h index dbe06be..2689427 100644 --- a/src/example_apps/MinimalApp/MinimalApp.h +++ b/src/example_apps/MinimalApp/MinimalApp.h @@ -1,4 +1,4 @@ -#define APP_TYPE MinimalApp +#define ENTRYPOINT #include "Archimedes.h" class MinimalApp : public Archimedes::App { @@ -28,3 +28,5 @@ class MinimalApp : public Archimedes::App { void startModule(std::string); }; + +Archimedes::App* MakeApp() { return new MinimalApp(); }