From 3a82e9b4ec9ee9c2d39d65cc12dd834d33026b95 Mon Sep 17 00:00:00 2001
From: Nathan <nathanblunkall5@gmail.com>
Date: Mon, 12 May 2025 14:32:13 -0500
Subject: [PATCH] use typedef

---
 include/endModule.h                 | 9 +--------
 modules/Archimedes-Modules          | 2 +-
 modules/ClientModule/ClientModule.h | 2 +-
 modules/ImguiModule/ImguiModule.h   | 2 +-
 modules/MainGUI/MainGUI.h           | 2 +-
 modules/ServerModule/ServerModule.h | 2 +-
 modules/WindowModule/WindowModule.h | 2 +-
 7 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/include/endModule.h b/include/endModule.h
index 59dbe5c..92204af 100644
--- a/include/endModule.h
+++ b/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
diff --git a/modules/Archimedes-Modules b/modules/Archimedes-Modules
index 3fa7af2..63cbf85 160000
--- a/modules/Archimedes-Modules
+++ b/modules/Archimedes-Modules
@@ -1 +1 @@
-Subproject commit 3fa7af246ab4510cea4d81c1c01a27992fc7f25f
+Subproject commit 63cbf855f8c9ffb7dbd7c8295d9af9b66756ca75
diff --git a/modules/ClientModule/ClientModule.h b/modules/ClientModule/ClientModule.h
index ff0c5c8..bff0da8 100644
--- a/modules/ClientModule/ClientModule.h
+++ b/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
diff --git a/modules/ImguiModule/ImguiModule.h b/modules/ImguiModule/ImguiModule.h
index 29a5435..7a7eba5 100644
--- a/modules/ImguiModule/ImguiModule.h
+++ b/modules/ImguiModule/ImguiModule.h
@@ -106,7 +106,7 @@ class ImguiModule : public Archimedes::Module {
 };
 
 #ifdef IMGUIMODULE_DYNAMIC
-#define MODULE_TYPE ImguiModule
+typedef ImguiModule mtype;
 #include "endModule.h"
 #endif
 
diff --git a/modules/MainGUI/MainGUI.h b/modules/MainGUI/MainGUI.h
index 7b00974..f1294b1 100644
--- a/modules/MainGUI/MainGUI.h
+++ b/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
diff --git a/modules/ServerModule/ServerModule.h b/modules/ServerModule/ServerModule.h
index 2e19749..c84e5c3 100644
--- a/modules/ServerModule/ServerModule.h
+++ b/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
 
diff --git a/modules/WindowModule/WindowModule.h b/modules/WindowModule/WindowModule.h
index e721eb7..86ea2f8 100644
--- a/modules/WindowModule/WindowModule.h
+++ b/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