diff --git a/ExampleModules.nix b/ExampleModules.nix index f9eaa44..3fa3d2d 100644 --- a/ExampleModules.nix +++ b/ExampleModules.nix @@ -133,6 +133,7 @@ modules/ImguiModule/src/*.cpp \ $imgui/backends/imgui_impl_glfw.cpp \ $imgui/backends/imgui_impl_opengl3.cpp \ + $imgui/misc/cpp/*.cpp \ $imgui/*.cpp \ -DRENDERER_OPENGL \ -DWINDOW_GLFW \ diff --git a/flake.nix b/flake.nix index 978f5da..100b881 100755 --- a/flake.nix +++ b/flake.nix @@ -83,10 +83,10 @@ modules/WindowModule/src/*.cpp \ $imgui/backends/imgui_impl_glfw.cpp \ $imgui/backends/imgui_impl_opengl3.cpp \ + $imgui/misc/cpp/*.cpp \ $imgui/*.cpp \ -DRENDERER_OPENGL \ -DWINDOW_GLFW \ - -DGUIMODULE \ -DIMGUIMODULE_DYNAMIC \ -fpic -shared \ -I src -I include -I $imgui -I . \ @@ -127,6 +127,7 @@ modules/WindowModule/src/*.cpp \ $imgui/backends/imgui_impl_glfw.cpp \ $imgui/backends/imgui_impl_opengl3.cpp \ + $imgui/misc/cpp/*.cpp \ $imgui/*.cpp \ -DRENDERER_OPENGL \ -DWINDOW_GLFW \ diff --git a/modules/ImguiModule/src/ImguiModule.h b/modules/ImguiModule/src/ImguiModule.h index 441857b..7914dfb 100644 --- a/modules/ImguiModule/src/ImguiModule.h +++ b/modules/ImguiModule/src/ImguiModule.h @@ -5,6 +5,7 @@ #include "Archimedes.h" #include "imgui.h" +#include "misc/cpp/imgui_stdlib.h" class ImguiModule : public Archimedes::Module { diff --git a/modules/MainGUI/src/MainGUI.cpp b/modules/MainGUI/src/MainGUI.cpp index 70d685e..2537d58 100644 --- a/modules/MainGUI/src/MainGUI.cpp +++ b/modules/MainGUI/src/MainGUI.cpp @@ -1,6 +1,6 @@ #include "MainGUI.h" #include "modules/ImguiModule/src/ImguiModule.h" -#include "misc/cpp/imgui_stdlib.h" + MainGUI::MainGUI(Archimedes::App* a, void* h) : Archimedes::Module(a, h) {