From 700e4222705f3132809f6f7b8c5433dd443c10b5 Mon Sep 17 00:00:00 2001 From: Nathan Date: Mon, 12 May 2025 00:14:11 -0500 Subject: [PATCH] no src --- ExampleApps.nix | 24 +++--- ExampleModules.nix | 81 +++++++++---------- flake.nix | 34 ++++---- modules/Archimedes-Modules | 2 +- .../ClientModule/{src => }/ClientModule.cpp | 0 modules/ClientModule/{src => }/ClientModule.h | 0 modules/ImguiModule/{src => }/ImguiModule.cpp | 0 modules/ImguiModule/{src => }/ImguiModule.h | 0 modules/MainGUI/{src => }/MainGUI.cpp | 0 modules/MainGUI/{src => }/MainGUI.h | 0 .../ServerModule/{src => }/ServerModule.cpp | 0 modules/ServerModule/{src => }/ServerModule.h | 0 .../WindowModule/{src => }/WindowModule.cpp | 0 modules/WindowModule/{src => }/WindowModule.h | 0 14 files changed, 70 insertions(+), 71 deletions(-) rename modules/ClientModule/{src => }/ClientModule.cpp (100%) rename modules/ClientModule/{src => }/ClientModule.h (100%) rename modules/ImguiModule/{src => }/ImguiModule.cpp (100%) rename modules/ImguiModule/{src => }/ImguiModule.h (100%) rename modules/MainGUI/{src => }/MainGUI.cpp (100%) rename modules/MainGUI/{src => }/MainGUI.h (100%) rename modules/ServerModule/{src => }/ServerModule.cpp (100%) rename modules/ServerModule/{src => }/ServerModule.h (100%) rename modules/WindowModule/{src => }/WindowModule.cpp (100%) rename modules/WindowModule/{src => }/WindowModule.h (100%) diff --git a/ExampleApps.nix b/ExampleApps.nix index 92db8bb..801e6b2 100644 --- a/ExampleApps.nix +++ b/ExampleApps.nix @@ -54,16 +54,16 @@ buildPhase = '' clang++ \ src/example_apps/ImguiEmbed/*.cpp \ - modules/examples/TestImgui/src/*.cpp \ - modules/WindowModule/src/*.cpp \ - modules/ImguiModule/src/*.cpp \ + modules/examples/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 \ - -DWINDOW_GLFW \ - -I src -I include -I $imgui -I . \ + -DRENDERER=1 \ + -DWINDOW=1 \ + -I include -I $imgui -I . \ -lGL -lglfw -lGLEW \ -Wall \ -o $name @@ -96,16 +96,16 @@ buildPhase = '' clang++ \ src/example_apps/TerminalEmbed/*.cpp \ - modules/Terminal/src/*.cpp \ - modules/WindowModule/src/*.cpp \ - modules/ImguiModule/src/*.cpp \ + modules/Terminal/*.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 \ - -DWINDOW_GLFW \ - -I src -I include -I $imgui -I . \ + -DRENDERER=1 \ + -DWINDOW=1 \ + -I include -I $imgui -I . \ -lGL -lglfw -lGLEW \ -Wall \ -o $name diff --git a/ExampleModules.nix b/ExampleModules.nix index d4394e6..5cb8c43 100644 --- a/ExampleModules.nix +++ b/ExampleModules.nix @@ -12,9 +12,8 @@ buildPhase = '' clang++ \ - modules/Archimedes-Modules/TestMenu/src/*.cpp \ + modules/Archimedes-Modules/TestMenu/*.cpp \ -fpic -shared \ - -I src \ -Wall \ -DTESTMENU_DYNAMIC \ -o $name @@ -43,9 +42,9 @@ buildPhase = '' clang++ \ - modules/Archimedes-Modules/TestNotCurses/src/*.cpp \ + modules/Archimedes-Modules/TestNotCurses/*.cpp \ -fpic -shared \ - -I src -I include \ + -I include \ -Wall \ -lnotcurses \ -DTESTNOTCURSES_DYNAMIC \ @@ -71,9 +70,9 @@ buildPhase = '' clang++ \ - modules/Archimedes-Modules/Print/src/*.cpp \ + modules/Archimedes-Modules/Print/*.cpp \ -fpic -shared \ - -I src -I include \ + -I include \ -Wall \ -DPRINT_DYNAMIC \ -o $name @@ -98,9 +97,9 @@ buildPhase = '' clang++ \ - modules/Archimedes-Modules/DependsOnPrint/src/*.cpp \ + modules/Archimedes-Modules/DependsOnPrint/*.cpp \ -fpic -shared \ - -I src -I include \ + -I include \ -Wall \ -DDEPENDSONPRINT_DYNAMIC \ -o $name @@ -125,10 +124,10 @@ buildPhase = '' clang++ \ - modules/Archimedes-Modules/DependsOnPrintStatic/src/*.cpp \ - modules/Archimedes-Modules/Print/src/*.cpp \ + modules/Archimedes-Modules/DependsOnPrintStatic/*.cpp \ + modules/Archimedes-Modules/Print/*.cpp \ -fpic -shared \ - -I src -I include -I . \ + -I include -I . \ -DDEPENDSONPRINTSTATIC_DYNAMIC \ -Wall \ -o $name @@ -160,9 +159,9 @@ buildPhase = '' clang++ \ - modules/Archimedes-Modules/TestImgui/src/*.cpp \ - modules/WindowModule/src/*.cpp \ - modules/ImguiModule/src/*.cpp \ + modules/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 \ @@ -171,7 +170,7 @@ -DWINDOW_GLFW \ -DTESTIMGUI_DYNAMIC \ -fpic -shared \ - -I src -I include -I $imgui -I . \ + -I include -I $imgui -I . \ -lGL -lglfw -lGLEW \ -Wall \ -o $name @@ -198,9 +197,9 @@ buildPhase = '' clang++ \ - modules/Archimedes-Modules/TestClay/src/*.cpp \ + modules/Archimedes-Modules/TestClay/*.cpp \ -fpic -shared \ - -I src -I include \ + -I include \ -DRENDERER_OPENGL \ -DWINDOW_GLFW \ -DTESTCLAY_DYNAMIC \ @@ -231,11 +230,11 @@ buildPhase = '' clang++ \ - modules/Archimedes-Modules/ChatServer/src/*.cpp \ - modules/ServerModule/src/*.cpp \ + modules/Archimedes-Modules/ChatServer/*.cpp \ + modules/ServerModule/*.cpp \ -fpic -shared \ -I ${pkgs.gamenetworkingsockets}/include/GameNetworkingSockets \ - -I src -I include -I . \ + -I include -I . \ -lGameNetworkingSockets \ -DCHATSERVER_DYNAMIC \ -Wall \ @@ -265,11 +264,11 @@ buildPhase = '' clang++ \ - modules/Archimedes-Modules/ChatServerVoice/src/*.cpp \ - modules/ServerModule/src/*.cpp \ + modules/Archimedes-Modules/ChatServerVoice/*.cpp \ + modules/ServerModule/*.cpp \ -fpic -shared \ -I ${pkgs.gamenetworkingsockets}/include/GameNetworkingSockets \ - -I src -I include -I . \ + -I include -I . \ -lGameNetworkingSockets \ -DCHATSERVERVOICE_DYNAMIC \ -Wall \ @@ -303,13 +302,13 @@ buildPhase = '' clang++ \ - modules/Archimedes-Modules/ChatClient/src/*.cpp \ - modules/ClientModule/src/*.cpp \ + modules/Archimedes-Modules/ChatClient/*.cpp \ + modules/ClientModule/*.cpp \ -I ${pkgs.gamenetworkingsockets}/include/GameNetworkingSockets \ -lGameNetworkingSockets \ -DCHATCLIENT_DYNAMIC \ - modules/WindowModule/src/*.cpp \ - modules/ImguiModule/src/*.cpp \ + modules/WindowModule/*.cpp \ + modules/ImguiModule/*.cpp \ $imgui/backends/imgui_impl_glfw.cpp \ $imgui/backends/imgui_impl_opengl3.cpp \ $imgui/misc/cpp/*.cpp \ @@ -317,7 +316,7 @@ -DRENDERER_OPENGL \ -DWINDOW_GLFW \ -fpic -shared \ - -I src -I include -I $imgui -I . \ + -I include -I $imgui -I . \ -lGL -lglfw -lGLEW \ -Wall \ -o $name @@ -350,13 +349,13 @@ buildPhase = '' clang++ \ - modules/Archimedes-Modules/ChatClientVoice/src/*.cpp \ - modules/ClientModule/src/*.cpp \ + modules/Archimedes-Modules/ChatClientVoice/*.cpp \ + modules/ClientModule/*.cpp \ -I ${pkgs.gamenetworkingsockets}/include/GameNetworkingSockets \ -lGameNetworkingSockets \ -DCHATCLIENTVOICE_DYNAMIC \ - modules/WindowModule/src/*.cpp \ - modules/ImguiModule/src/*.cpp \ + modules/WindowModule/*.cpp \ + modules/ImguiModule/*.cpp \ $imgui/backends/imgui_impl_sdl3.cpp \ $imgui/backends/imgui_impl_opengl3.cpp \ $imgui/misc/cpp/*.cpp \ @@ -364,7 +363,7 @@ -DRENDERER=1 \ -DWINDOW=2 \ -fpic -shared \ - -I src -I include -I $imgui -I . \ + -I include -I $imgui -I . \ -lGL -lSDL3 -lGLEW \ -Wall \ -o $name @@ -396,9 +395,9 @@ buildPhase = '' clang++ \ - modules/Terminal/src/*.cpp \ - modules/ImguiModule/src/*.cpp \ - modules/WindowModule/src/*.cpp \ + modules/Terminal/*.cpp \ + modules/ImguiModule/*.cpp \ + modules/WindowModule/*.cpp \ $imgui/backends/imgui_impl_glfw.cpp \ $imgui/backends/imgui_impl_opengl3.cpp \ $imgui/misc/cpp/*.cpp \ @@ -407,7 +406,7 @@ -DWINDOW=1 \ -DTERMINAL_DYNAMIC \ -fpic -shared \ - -I src -I include -I $imgui -I . \ + -I include -I $imgui -I . \ -lGL -lglfw -lGLEW \ -Wall \ -o $name @@ -442,9 +441,9 @@ buildPhase = '' clang++ \ - modules/Ollama/src/*.cpp \ - modules/ImguiModule/src/*.cpp \ - modules/WindowModule/src/*.cpp \ + modules/Ollama/*.cpp \ + modules/ImguiModule/*.cpp \ + modules/WindowModule/*.cpp \ $imgui/backends/imgui_impl_glfw.cpp \ $imgui/backends/imgui_impl_opengl3.cpp \ $imgui/misc/cpp/*.cpp \ @@ -453,7 +452,7 @@ -DWINDOW=1 \ -DOLLAMA_DYNAMIC \ -fpic -shared \ - -I src -I include -I $imgui -I . \ + -I include -I $imgui -I . \ -lGL -lglfw -lGLEW \ $(curl-config --cflags) \ $(curl-config --libs) \ diff --git a/flake.nix b/flake.nix index ff566d0..8f6306a 100755 --- a/flake.nix +++ b/flake.nix @@ -41,9 +41,9 @@ buildPhase = '' clang++ \ - modules/ServerModule/src/*.cpp \ + modules/ServerModule/*.cpp \ -fpic -shared \ - -I src -I include \ + -I include \ -I ${pkgs.gamenetworkingsockets}/include/GameNetworkingSockets \ -lGameNetworkingSockets \ -DSERVERMODULE_DYNAMIC \ @@ -74,9 +74,9 @@ buildPhase = '' clang++ \ - modules/ClientModule/src/*.cpp \ + modules/ClientModule/*.cpp \ -fpic -shared \ - -I src -I include \ + -I include \ -I ${pkgs.gamenetworkingsockets}/include/GameNetworkingSockets \ -lGameNetworkingSockets \ -DCLIENTMODULE_DYNAMIC \ @@ -108,9 +108,9 @@ buildPhase = '' clang++ \ - modules/WindowModule/src/*.cpp \ + modules/WindowModule/*.cpp \ -fpic -shared \ - -I src -I include \ + -I include \ -DRENDERER=1 \ -DWINDOW=1 \ -DWINDOWMODULE_DYNAMIC \ @@ -145,8 +145,8 @@ buildPhase = '' clang++ \ - modules/ImguiModule/src/*.cpp \ - modules/WindowModule/src/*.cpp \ + modules/ImguiModule/*.cpp \ + modules/WindowModule/*.cpp \ $imgui/backends/imgui_impl_glfw.cpp \ $imgui/backends/imgui_impl_opengl3.cpp \ $imgui/misc/cpp/*.cpp \ @@ -156,7 +156,7 @@ -DIMGUIMODULE_DYNAMIC \ -DCUSTOMFONT=${pkgs.fira-code}/share/fonts/truetype/FiraCode-VF.ttf \ -fpic -shared \ - -I src -I include -I $imgui -I . \ + -I include -I $imgui -I . \ -lGL -lglfw -lGLEW \ -Wall \ -o $name @@ -187,9 +187,9 @@ buildPhase = '' clang++ \ - modules/MainGUI/src/*.cpp \ - modules/ImguiModule/src/*.cpp \ - modules/WindowModule/src/*.cpp \ + modules/MainGUI/*.cpp \ + modules/ImguiModule/*.cpp \ + modules/WindowModule/*.cpp \ $imgui/backends/imgui_impl_sdl3.cpp \ $imgui/backends/imgui_impl_sdlrenderer3.cpp \ $imgui/misc/cpp/*.cpp \ @@ -198,7 +198,7 @@ -DWINDOW=2 \ -DMAINGUI_DYNAMIC \ -fpic -shared \ - -I src -I include -I $imgui -I . \ + -I include -I $imgui -I . \ -lSDL3 \ -Wall \ -o $name @@ -231,9 +231,9 @@ buildPhase = '' clang++ \ - modules/MainGUI/src/*.cpp \ - modules/ImguiModule/src/*.cpp \ - modules/WindowModule/src/*.cpp \ + modules/MainGUI/*.cpp \ + modules/ImguiModule/*.cpp \ + modules/WindowModule/*.cpp \ $imgui/backends/imgui_impl_glfw.cpp \ $imgui/backends/imgui_impl_opengl3.cpp \ $imgui/misc/cpp/*.cpp \ @@ -242,7 +242,7 @@ -DWINDOW=1 \ -DMAINGUI_DYNAMIC \ -fpic -shared \ - -I src -I include -I $imgui -I . \ + -I include -I $imgui -I . \ -lGL -lglfw -lGLEW \ -Wall \ -o $name diff --git a/modules/Archimedes-Modules b/modules/Archimedes-Modules index 5906938..3c4a75e 160000 --- a/modules/Archimedes-Modules +++ b/modules/Archimedes-Modules @@ -1 +1 @@ -Subproject commit 59069388adae716f4c13eb76b86f56f1503881e4 +Subproject commit 3c4a75ec21b02b6e75bf2cc5f2e4e2482099db9b diff --git a/modules/ClientModule/src/ClientModule.cpp b/modules/ClientModule/ClientModule.cpp similarity index 100% rename from modules/ClientModule/src/ClientModule.cpp rename to modules/ClientModule/ClientModule.cpp diff --git a/modules/ClientModule/src/ClientModule.h b/modules/ClientModule/ClientModule.h similarity index 100% rename from modules/ClientModule/src/ClientModule.h rename to modules/ClientModule/ClientModule.h diff --git a/modules/ImguiModule/src/ImguiModule.cpp b/modules/ImguiModule/ImguiModule.cpp similarity index 100% rename from modules/ImguiModule/src/ImguiModule.cpp rename to modules/ImguiModule/ImguiModule.cpp diff --git a/modules/ImguiModule/src/ImguiModule.h b/modules/ImguiModule/ImguiModule.h similarity index 100% rename from modules/ImguiModule/src/ImguiModule.h rename to modules/ImguiModule/ImguiModule.h diff --git a/modules/MainGUI/src/MainGUI.cpp b/modules/MainGUI/MainGUI.cpp similarity index 100% rename from modules/MainGUI/src/MainGUI.cpp rename to modules/MainGUI/MainGUI.cpp diff --git a/modules/MainGUI/src/MainGUI.h b/modules/MainGUI/MainGUI.h similarity index 100% rename from modules/MainGUI/src/MainGUI.h rename to modules/MainGUI/MainGUI.h diff --git a/modules/ServerModule/src/ServerModule.cpp b/modules/ServerModule/ServerModule.cpp similarity index 100% rename from modules/ServerModule/src/ServerModule.cpp rename to modules/ServerModule/ServerModule.cpp diff --git a/modules/ServerModule/src/ServerModule.h b/modules/ServerModule/ServerModule.h similarity index 100% rename from modules/ServerModule/src/ServerModule.h rename to modules/ServerModule/ServerModule.h diff --git a/modules/WindowModule/src/WindowModule.cpp b/modules/WindowModule/WindowModule.cpp similarity index 100% rename from modules/WindowModule/src/WindowModule.cpp rename to modules/WindowModule/WindowModule.cpp diff --git a/modules/WindowModule/src/WindowModule.h b/modules/WindowModule/WindowModule.h similarity index 100% rename from modules/WindowModule/src/WindowModule.h rename to modules/WindowModule/WindowModule.h