...

ExampleModules.nix

@@ -12,7 +12,7 @@
 
             buildPhase = ''
                 clang++ \
-                modules/Archimedes-Modules/TestMenu/*.cpp \
+                ${inputs.Archimedes-Modules}/TestMenu/*.cpp \
                 -fpic -shared \
                 -Wall \
                 -DTESTMENU_DYNAMIC \
@@ -42,7 +42,7 @@
 
             buildPhase = ''
                 clang++ \
-                modules/Archimedes-Modules/TestNotCurses/*.cpp \
+                ${inputs.Archimedes-Modules}/TestNotCurses/*.cpp \
                 -fpic -shared \
                 -I include \
                 -Wall \
@@ -70,7 +70,7 @@
 
             buildPhase = ''
                 clang++ \
-                modules/Archimedes-Modules/Print/*.cpp \
+                ${inputs.Archimedes-Modules}/Print/*.cpp \
                 -fpic -shared \
                 -I include \
                 -Wall \
@@ -97,7 +97,7 @@
 
             buildPhase = ''
                 clang++ \
-                modules/Archimedes-Modules/DependsOnPrint/*.cpp \
+                ${inputs.Archimedes-Modules}/DependsOnPrint/*.cpp \
                 -fpic -shared \
                 -I include \
                 -Wall \
@@ -124,8 +124,8 @@
 
             buildPhase = ''
                 clang++ \
-                modules/Archimedes-Modules/DependsOnPrintStatic/*.cpp \
+                ${inputs.Archimedes-Modules}/DependsOnPrintStatic/*.cpp \
-                modules/Archimedes-Modules/Print/*.cpp \
+                ${inputs.Archimedes-Modules}/Print/*.cpp \
                 -fpic -shared \
                 -I include -I . \
                 -DDEPENDSONPRINTSTATIC_DYNAMIC \
@@ -159,15 +159,15 @@
 
             buildPhase = ''
                 clang++ \
-                modules/Archimedes-Modules/TestImgui/*.cpp \
+                ${inputs.Archimedes-Modules}/TestImgui/*.cpp \
                 modules/WindowModule/*.cpp \
                 modules/ImguiModule/*.cpp \
                 $imgui/backends/imgui_impl_glfw.cpp \
                 $imgui/backends/imgui_impl_opengl3.cpp \
                 $imgui/misc/cpp/*.cpp \
                 $imgui/*.cpp \
-                -DRENDERER_OPENGL \
+                -DRENDERER=1 \
-                -DWINDOW_GLFW \
+                -DWINDOW=1 \
                 -DTESTIMGUI_DYNAMIC \
                 -fpic -shared \
                 -I include -I $imgui -I . \
@@ -197,11 +197,11 @@
 
             buildPhase = ''
                 clang++ \
-                modules/Archimedes-Modules/TestClay/*.cpp \
+                ${inputs.Archimedes-Modules}/TestClay/*.cpp \
                 -fpic -shared \
                 -I include \
-                -DRENDERER_OPENGL \
+                -DRENDERER=1 \
-                -DWINDOW_GLFW \
+                -DWINDOW=1 \
                 -DTESTCLAY_DYNAMIC \
                 -Wall \
                 -o $name 
@@ -230,7 +230,7 @@
 
             buildPhase = ''
                 clang++ \
-                modules/Archimedes-Modules/ChatServer/*.cpp \
+                ${inputs.Archimedes-Modules}/Chat/ChatServer/*.cpp \
                 modules/ServerModule/*.cpp \
                 -fpic -shared \
                 -I ${pkgs.gamenetworkingsockets}/include/GameNetworkingSockets \
@@ -264,7 +264,7 @@
 
             buildPhase = ''
                 clang++ \
-                modules/Archimedes-Modules/ChatServerVoice/*.cpp \
+                ${inputs.Archimedes-Modules}/ChatVoice/ChatServerVoice/*.cpp \
                 modules/ServerModule/*.cpp \
                 -fpic -shared \
                 -I ${pkgs.gamenetworkingsockets}/include/GameNetworkingSockets \
@@ -302,7 +302,7 @@
 
             buildPhase = ''
                 clang++ \
-                modules/Archimedes-Modules/ChatClient/*.cpp \
+                ${inputs.Archimedes-Modules}/Chat/ChatClient/*.cpp \
                 modules/ClientModule/*.cpp \
                 -I ${pkgs.gamenetworkingsockets}/include/GameNetworkingSockets \
                 -lGameNetworkingSockets \
@@ -313,8 +313,8 @@
                 $imgui/backends/imgui_impl_opengl3.cpp \
                 $imgui/misc/cpp/*.cpp \
                 $imgui/*.cpp \
-                -DRENDERER_OPENGL \
+                -DRENDERER=1 \
-                -DWINDOW_GLFW \
+                -DWINDOW=1 \
                 -fpic -shared \
                 -I include -I $imgui -I . \
                 -lGL -lglfw -lGLEW \
@@ -349,7 +349,7 @@
 
             buildPhase = ''
                 clang++ \
-                modules/Archimedes-Modules/ChatClientVoice/*.cpp \
+                ${inputs.Archimedes-Modules}/ChatVoice/ChatClientVoice/*.cpp \
                 modules/ClientModule/*.cpp \
                 -I ${pkgs.gamenetworkingsockets}/include/GameNetworkingSockets \
                 -lGameNetworkingSockets \
@@ -395,7 +395,7 @@
 
         buildPhase = ''
         clang++ \
-        modules/Terminal/*.cpp \
+        ${inputs.Archimedes-Modules}/Terminal/*.cpp \
         modules/ImguiModule/*.cpp \
         modules/WindowModule/*.cpp \
         $imgui/backends/imgui_impl_glfw.cpp \
@@ -441,7 +441,7 @@
 
         buildPhase = ''
         clang++ \
-        modules/Ollama/*.cpp \
+        ${inputs.Archimedes-Modules}/Ollama/*.cpp \
         modules/ImguiModule/*.cpp \
         modules/WindowModule/*.cpp \
         $imgui/backends/imgui_impl_glfw.cpp \

flake.lock

@@ -1,13 +1,29 @@
 {
   "nodes": {
+    "Archimedes-Modules": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1747079936,
+        "narHash": "sha256-+lpnX9reLMTq6WDl4Covcn0jVVE3BX8syiIpo+Kpy/c=",
+        "ref": "refs/heads/master",
+        "rev": "550f20602f514c4396878ca25cc62a9ffead00e8",
+        "revCount": 8,
+        "type": "git",
+        "url": "ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/Archimedes-Modules"
+      },
+      "original": {
+        "type": "git",
+        "url": "ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/Archimedes-Modules"
+      }
+    },
     "clay": {
       "flake": false,
       "locked": {
-        "lastModified": 1742509368,
+        "lastModified": 1746753934,
-        "narHash": "sha256-XSaMuWCADZgZnRaGcBgf+u40O6jS5kkpq3Xruy6z+I0=",
+        "narHash": "sha256-7Kx536YsmPTXUjs/jBknGAmqYsqqDh6T11AlarTeGLM=",
         "owner": "nicbarker",
         "repo": "clay",
-        "rev": "ad49977f1b37ccd7664333181f30f575d08d3838",
+        "rev": "76265e4c3c97ebe5a4aab081d5c5a05e5a979d5d",
         "type": "github"
       },
       "original": {
@@ -19,11 +35,11 @@
     "imgui": {
       "flake": false,
       "locked": {
-        "lastModified": 1741968903,
+        "lastModified": 1747034542,
-        "narHash": "sha256-4L37NRR+dlkhdxuDjhLR45kgjyZK2uelKBlGZ1nQzgY=",
+        "narHash": "sha256-kVbyG7LXXHIOiI6dlZVID9DLErR+XNoAGp/R82TEpgo=",
         "owner": "ocornut",
         "repo": "imgui",
-        "rev": "126d004f9e1eef062bf4b044b3b2faaf58d48c51",
+        "rev": "e33069ce56d07751ca875eb239f41febef0ebcd3",
         "type": "github"
       },
       "original": {
@@ -35,11 +51,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1742136038,
+        "lastModified": 1746957726,
-        "narHash": "sha256-DDe16FJk18sadknQKKG/9FbwEro7A57tg9vB5kxZ8kY=",
+        "narHash": "sha256-k9ut1LSfHCr0AW82ttEQzXVCqmyWVA5+SHJkS5ID/Jo=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "a1185f4064c18a5db37c5c84e5638c78b46e3341",
+        "rev": "a39ed32a651fdee6842ec930761e31d1f242cb94",
         "type": "github"
       },
       "original": {
@@ -51,6 +67,7 @@
     },
     "root": {
       "inputs": {
+        "Archimedes-Modules": "Archimedes-Modules",
         "clay": "clay",
         "imgui": "imgui",
         "nixpkgs": "nixpkgs"

flake.nix

@@ -11,9 +11,13 @@
             url = "github:nicbarker/clay";
             flake = false;
         };
+        Archimedes-Modules = {
+            url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/Archimedes-Modules";
+            flake = false;
+        };
     };
 
-    outputs = { self, nixpkgs, imgui, clay }@inputs: let
+    outputs = { self, nixpkgs, imgui, clay, ... }@inputs: let
             system = "x86_64-linux";
             pkgs = import nixpkgs { inherit system; };
     in {
@@ -255,6 +259,8 @@
 
             };
 
+        };
+
         packages.${system}.default = self.Archimedes.examples.MinimalApp;
 
         apps.${system}.default = {
@@ -263,6 +269,4 @@
         };
 
     };
-
-    };
 }

include/endModule.h

@@ -1,12 +1,5 @@
-#include "Archimedes.h"
-
-#ifdef MODULE_TYPE
-
 extern "C" { 
     Archimedes::Module* create(Archimedes::App* app, void* handle) {
-        return new MODULE_TYPE(app, handle);
+        return new mtype(app, handle);
     }
 }
-
-#undef MODULE_TYPE
-#endif

modules/ClientModule/ClientModule.h

@@ -68,6 +68,6 @@ class ClientModule : public Archimedes::Module {
 };
 
 #ifdef CLIENTMODULE_DYNAMIC
-#define MODULE_TYPE ClientModule
+typedef ClientModule mtype;
 #include "endModule.h"
 #endif

modules/ImguiModule/ImguiModule.h

@@ -4,7 +4,7 @@
 #include "imgui.h"
 #include "misc/cpp/imgui_stdlib.h"
 
-#include "modules/WindowModule/src/WindowModule.h"
+#include "modules/WindowModule/WindowModule.h"
 
 #if RENDERER == 1
 
@@ -106,7 +106,7 @@ class ImguiModule : public Archimedes::Module {
 };
 
 #ifdef IMGUIMODULE_DYNAMIC
-#define MODULE_TYPE ImguiModule
+typedef ImguiModule mtype;
 #include "endModule.h"
 #endif
 

modules/MainGUI/MainGUI.cpp

@@ -1,5 +1,5 @@
 #include "MainGUI.h"
-#include "modules/ImguiModule/src/ImguiModule.h"
+#include "modules/ImguiModule/ImguiModule.h"
 
 
 MainGUI::MainGUI(Archimedes::App* a, void* h) : Archimedes::Module(a, h) {

modules/MainGUI/MainGUI.h

@@ -17,6 +17,6 @@ class MainGUI : public Archimedes::Module {
 };
 
 #ifdef MAINGUI_DYNAMIC
-#define MODULE_TYPE MainGUI
+typedef MainGUI mtype;
 #include "endModule.h"
 #endif

modules/ServerModule/ServerModule.h

@@ -88,7 +88,7 @@ class ServerModule : public Archimedes::Module {
 };
 
 #ifdef SERVERMODULE_DYNAMIC
-#define MODULE_TYPE ServerModule
+typedef ServerModule mtype;
 #include "endModule.h"
 #endif
 

modules/WindowModule/WindowModule.h

@@ -80,7 +80,7 @@ class WindowModule : public Archimedes::Module {
 
 
 #ifdef WINDOWMODULE_DYNAMIC
-#define MODULE_TYPE WindowModule
+typedef WindowModule mtype;
 #include "endModule.h"
 #endif
 

src/example_apps/ImguiEmbed/ImguiEmbed.h

@@ -1,7 +1,7 @@
 #define ENTRYPOINT
 #include "Archimedes.h"
 
-#include "modules/examples/TestImgui/src/TestImgui.h"
+#include "modules/Archimedes-Modules/TestImgui/TestImgui.h"
 
 class ImguiEmbed : public Archimedes::App {
 

src/example_apps/TerminalEmbed/TerminalEmbed.h

@@ -1,7 +1,7 @@
 #define ENTRYPOINT
 #include "Archimedes.h"
 
-#include "modules/Terminal/src/Terminal.h"
+#include "modules/Archimedes-Modules/Terminal/Terminal.h"
 
 class TerminalEmbed : public Archimedes::App {