heavy refactoring

include/utils/GuiModule/GuiModule.h

@@ -3,7 +3,9 @@
 
 #include "utils/Module/Module.h"
 
+#ifndef WINDOWMODULE_STATIC
 #define WINDOWMODULE_STATIC
+#endif
 #include "modules/WindowModule/src/WindowModule.h"
 
 namespace Archimedes {
@@ -14,15 +16,15 @@ namespace Archimedes {
             typedef GuiModule* create_t(void*, App*);
 
             GuiModule(void* h, App* a) : Module(h, a) {
-                windowModule = new WindowModule(nullptr, a);
-                deps["WindowModule"] = windowModule;
+                //wm = new WindowModule(nullptr, a);
+                deps["WindowModule"] = new WindowModule(nullptr, a);
             }
             virtual ~GuiModule() {}
             virtual void onLoad() = 0;
             virtual void run() = 0;
 
         protected:
-            WindowModule* windowModule;
+            //WindowModule* wm;
     };
 }