diff --git a/flake.nix b/flake.nix index 073e079..2caf8d5 100755 --- a/flake.nix +++ b/flake.nix @@ -169,9 +169,19 @@ gcc ]; + buildInputs = with pkgs; [ + glfw + ]; + buildPhase = '' g++ \ modules/TestImgui/src/*.cpp src/App.cpp \ + $imgui/backends/imgui_impl_glfw.cpp \ + $imgui/backends/imgui_impl_opengl.cpp \ + utils/Renderer/*.cpp utils/Renderer/RendererOpenGL/*.cpp \ + utils/Window/*.cpp utils/Window/WindowGLFW/*.cpp \ + -DRENDERER_OPENGL \ + -DWINDOW_GLFW \ -fpic -shared \ -I src -I include \ -Wall \ diff --git a/utils/Renderer/Renderer.h b/utils/Renderer/Renderer.h index c6dcba8..f27d003 100644 --- a/utils/Renderer/Renderer.h +++ b/utils/Renderer/Renderer.h @@ -3,7 +3,6 @@ #include "Archimedes.h" -#define RENDERER_OPENGL #include "RendererOpenGL/RendererOpenGL.h" namespace Archimedes { diff --git a/utils/Window/WindowGLFW/WindowGLFW.h b/utils/Window/WindowGLFW/WindowGLFW.h index 047f4d6..a811d60 100644 --- a/utils/Window/WindowGLFW/WindowGLFW.h +++ b/utils/Window/WindowGLFW/WindowGLFW.h @@ -1,3 +1,6 @@ +#ifdef WINDOW_GLFW +#undef WINDOW_GLFW + #include "Archimedes.h" #include @@ -25,3 +28,5 @@ namespace Archimedes { typedef WindowGLFW WindowImpl; } + +#endif