From eca8648b3275738ab46052955438502fe126792a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hatvani=20Tam=C3=A1s?= Date: Wed, 25 Feb 2026 18:51:34 +0100 Subject: [PATCH] submodule updates --- .gitmodules | 1 + Makefile | 68 ++++ SakuraVNE/src/Application.h | 28 +- compile_commands.json | 784 ++++++++++++++++++++++++++++++++++++ libs/imgui | 2 +- libs/imgui-node-editor | 2 +- premake5.lua | 13 +- 7 files changed, 876 insertions(+), 22 deletions(-) create mode 100644 Makefile create mode 100644 compile_commands.json diff --git a/.gitmodules b/.gitmodules index bf2cd19..0d646f2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,6 +7,7 @@ [submodule "libs/imgui-node-editor"] path = libs/imgui-node-editor url = https://github.com/thedmd/imgui-node-editor.git + branch = develop [submodule "plugins/ecc"] path = plugins/ecc url = https://github.com/MattBystrin/premake-ecc.git diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..57e5d4e --- /dev/null +++ b/Makefile @@ -0,0 +1,68 @@ +# Alternative GNU Make workspace makefile autogenerated by Premake + +ifndef config + config=debug +endif + +ifndef verbose + SILENT = @ +endif + +ifeq ($(config),debug) + ImGui_config = debug + ImGuiNodeEditor_config = debug + SakuraVNE_config = debug + +else ifeq ($(config),release) + ImGui_config = release + ImGuiNodeEditor_config = release + SakuraVNE_config = release + +else + $(error "invalid configuration $(config)") +endif + +PROJECTS := ImGui ImGuiNodeEditor SakuraVNE + +.PHONY: all clean help $(PROJECTS) + +all: $(PROJECTS) + +ImGui: +ifneq (,$(ImGui_config)) + @echo "==== Building ImGui ($(ImGui_config)) ====" + @${MAKE} --no-print-directory -C libs/imgui -f Makefile config=$(ImGui_config) +endif + +ImGuiNodeEditor: +ifneq (,$(ImGuiNodeEditor_config)) + @echo "==== Building ImGuiNodeEditor ($(ImGuiNodeEditor_config)) ====" + @${MAKE} --no-print-directory -C libs/imgui-node-editor -f Makefile config=$(ImGuiNodeEditor_config) +endif + +SakuraVNE: ImGui ImGuiNodeEditor +ifneq (,$(SakuraVNE_config)) + @echo "==== Building SakuraVNE ($(SakuraVNE_config)) ====" + @${MAKE} --no-print-directory -C SakuraVNE -f Makefile config=$(SakuraVNE_config) +endif + +clean: + @${MAKE} --no-print-directory -C libs/imgui -f Makefile clean + @${MAKE} --no-print-directory -C libs/imgui-node-editor -f Makefile clean + @${MAKE} --no-print-directory -C SakuraVNE -f Makefile clean + +help: + @echo "Usage: make [config=name] [target]" + @echo "" + @echo "CONFIGURATIONS:" + @echo " debug" + @echo " release" + @echo "" + @echo "TARGETS:" + @echo " all (default)" + @echo " clean" + @echo " ImGui" + @echo " ImGuiNodeEditor" + @echo " SakuraVNE" + @echo "" + @echo "For more information, see https://github.com/premake/premake-core/wiki" \ No newline at end of file diff --git a/SakuraVNE/src/Application.h b/SakuraVNE/src/Application.h index 1751e06..a32cd48 100644 --- a/SakuraVNE/src/Application.h +++ b/SakuraVNE/src/Application.h @@ -3,13 +3,12 @@ #include "SDL.h" struct WindowData { - int width = 1280; - int height = 720; - const char* title = "Sakura Visual Novel Engine"; + int width = 1920; + int height = 1080; + const char *title = "Sakura Visual Novel Engine"; }; -class Application -{ +class Application { public: Application(); ~Application(); @@ -18,19 +17,20 @@ public: void Run(); void Shutdown(); - static inline WindowData& GetWindowData() { return m_WindowData; } - inline SDL_Window* GetSDLWindow() { return m_Window; } - inline SDL_Surface* GetSDLWindowSurface() { return m_Surface; } - inline void SetSDLWindowSurface(SDL_Surface* newSurface) { m_Surface = newSurface; } + static inline WindowData &GetWindowData() { return m_WindowData; } + inline SDL_Window *GetSDLWindow() { return m_Window; } + inline SDL_Surface *GetSDLWindowSurface() { return m_Surface; } + inline void SetSDLWindowSurface(SDL_Surface *newSurface) { m_Surface = newSurface; } - static bool& GetRunningState() { return m_isRunning; } + static bool &GetRunningState() { return m_isRunning; } static void SetRunningState(bool isRunning) { m_isRunning = isRunning; } + private: - SDL_Window* m_Window; - SDL_Surface* m_Surface; - SDL_Renderer* m_Renderer; + SDL_Window *m_Window; + SDL_Surface *m_Surface; + SDL_Renderer *m_Renderer; static WindowData m_WindowData; static bool m_isRunning; -}; \ No newline at end of file +}; diff --git a/compile_commands.json b/compile_commands.json new file mode 100644 index 0000000..8bbd311 --- /dev/null +++ b/compile_commands.json @@ -0,0 +1,784 @@ +[ + { + "arguments": [ + "g++", + "-MD", + "-MP", + "-I.", + "-I/usr/include/SDL2", + "-m64", + "-fPIC", + "-g", + "-std=c++17", + "-c", + "-o", + "../../build/bin-int/Debug-linux-x86_64/ImGui/imgui_impl_sdl2.o", + "backends/imgui_impl_sdl2.cpp" + ], + "directory": "/home/tom/Dev/SakuraVNE/libs/imgui", + "file": "/home/tom/Dev/SakuraVNE/libs/imgui/backends/imgui_impl_sdl2.cpp", + "output": "/home/tom/Dev/SakuraVNE/build/bin-int/Debug-linux-x86_64/ImGui/imgui_impl_sdl2.o" + }, + { + "arguments": [ + "g++", + "-MD", + "-MP", + "-I.", + "-I/usr/include/SDL2", + "-m64", + "-fPIC", + "-g", + "-std=c++17", + "-c", + "-o", + "../../build/bin-int/Debug-linux-x86_64/ImGui/imgui_impl_sdl2.o", + "backends/imgui_impl_sdl2.h" + ], + "directory": "/home/tom/Dev/SakuraVNE/libs/imgui", + "file": "/home/tom/Dev/SakuraVNE/libs/imgui/backends/imgui_impl_sdl2.h", + "output": "/home/tom/Dev/SakuraVNE/build/bin-int/Debug-linux-x86_64/ImGui/imgui_impl_sdl2.o" + }, + { + "arguments": [ + "g++", + "-MD", + "-MP", + "-I.", + "-I/usr/include/SDL2", + "-m64", + "-fPIC", + "-g", + "-std=c++17", + "-c", + "-o", + "../../build/bin-int/Debug-linux-x86_64/ImGui/imgui_impl_sdlrenderer2.o", + "backends/imgui_impl_sdlrenderer2.cpp" + ], + "directory": "/home/tom/Dev/SakuraVNE/libs/imgui", + "file": "/home/tom/Dev/SakuraVNE/libs/imgui/backends/imgui_impl_sdlrenderer2.cpp", + "output": "/home/tom/Dev/SakuraVNE/build/bin-int/Debug-linux-x86_64/ImGui/imgui_impl_sdlrenderer2.o" + }, + { + "arguments": [ + "g++", + "-MD", + "-MP", + "-I.", + "-I/usr/include/SDL2", + "-m64", + "-fPIC", + "-g", + "-std=c++17", + "-c", + "-o", + "../../build/bin-int/Debug-linux-x86_64/ImGui/imgui_impl_sdlrenderer2.o", + "backends/imgui_impl_sdlrenderer2.h" + ], + "directory": "/home/tom/Dev/SakuraVNE/libs/imgui", + "file": "/home/tom/Dev/SakuraVNE/libs/imgui/backends/imgui_impl_sdlrenderer2.h", + "output": "/home/tom/Dev/SakuraVNE/build/bin-int/Debug-linux-x86_64/ImGui/imgui_impl_sdlrenderer2.o" + }, + { + "arguments": [ + "g++", + "-MD", + "-MP", + "-I.", + "-I/usr/include/SDL2", + "-m64", + "-fPIC", + "-g", + "-std=c++17", + "-c", + "-o", + "../../build/bin-int/Debug-linux-x86_64/ImGui/imconfig.o", + "imconfig.h" + ], + "directory": "/home/tom/Dev/SakuraVNE/libs/imgui", + "file": "/home/tom/Dev/SakuraVNE/libs/imgui/imconfig.h", + "output": "/home/tom/Dev/SakuraVNE/build/bin-int/Debug-linux-x86_64/ImGui/imconfig.o" + }, + { + "arguments": [ + "g++", + "-MD", + "-MP", + "-I.", + "-I/usr/include/SDL2", + "-m64", + "-fPIC", + "-g", + "-std=c++17", + "-c", + "-o", + "../../build/bin-int/Debug-linux-x86_64/ImGui/imgui.o", + "imgui.cpp" + ], + "directory": "/home/tom/Dev/SakuraVNE/libs/imgui", + "file": "/home/tom/Dev/SakuraVNE/libs/imgui/imgui.cpp", + "output": "/home/tom/Dev/SakuraVNE/build/bin-int/Debug-linux-x86_64/ImGui/imgui.o" + }, + { + "arguments": [ + "g++", + "-MD", + "-MP", + "-I.", + "-I/usr/include/SDL2", + "-m64", + "-fPIC", + "-g", + "-std=c++17", + "-c", + "-o", + "../../build/bin-int/Debug-linux-x86_64/ImGui/imgui.o", + "imgui.h" + ], + "directory": "/home/tom/Dev/SakuraVNE/libs/imgui", + "file": "/home/tom/Dev/SakuraVNE/libs/imgui/imgui.h", + "output": "/home/tom/Dev/SakuraVNE/build/bin-int/Debug-linux-x86_64/ImGui/imgui.o" + }, + { + "arguments": [ + "g++", + "-MD", + "-MP", + "-I.", + "-I/usr/include/SDL2", + "-m64", + "-fPIC", + "-g", + "-std=c++17", + "-c", + "-o", + "../../build/bin-int/Debug-linux-x86_64/ImGui/imgui_demo.o", + "imgui_demo.cpp" + ], + "directory": "/home/tom/Dev/SakuraVNE/libs/imgui", + "file": "/home/tom/Dev/SakuraVNE/libs/imgui/imgui_demo.cpp", + "output": "/home/tom/Dev/SakuraVNE/build/bin-int/Debug-linux-x86_64/ImGui/imgui_demo.o" + }, + { + "arguments": [ + "g++", + "-MD", + "-MP", + "-I.", + "-I/usr/include/SDL2", + "-m64", + "-fPIC", + "-g", + "-std=c++17", + "-c", + "-o", + "../../build/bin-int/Debug-linux-x86_64/ImGui/imgui_draw.o", + "imgui_draw.cpp" + ], + "directory": "/home/tom/Dev/SakuraVNE/libs/imgui", + "file": "/home/tom/Dev/SakuraVNE/libs/imgui/imgui_draw.cpp", + "output": "/home/tom/Dev/SakuraVNE/build/bin-int/Debug-linux-x86_64/ImGui/imgui_draw.o" + }, + { + "arguments": [ + "g++", + "-MD", + "-MP", + "-I.", + "-I/usr/include/SDL2", + "-m64", + "-fPIC", + "-g", + "-std=c++17", + "-c", + "-o", + "../../build/bin-int/Debug-linux-x86_64/ImGui/imgui_internal.o", + "imgui_internal.h" + ], + "directory": "/home/tom/Dev/SakuraVNE/libs/imgui", + "file": "/home/tom/Dev/SakuraVNE/libs/imgui/imgui_internal.h", + "output": "/home/tom/Dev/SakuraVNE/build/bin-int/Debug-linux-x86_64/ImGui/imgui_internal.o" + }, + { + "arguments": [ + "g++", + "-MD", + "-MP", + "-I.", + "-I/usr/include/SDL2", + "-m64", + "-fPIC", + "-g", + "-std=c++17", + "-c", + "-o", + "../../build/bin-int/Debug-linux-x86_64/ImGui/imgui_tables.o", + "imgui_tables.cpp" + ], + "directory": "/home/tom/Dev/SakuraVNE/libs/imgui", + "file": "/home/tom/Dev/SakuraVNE/libs/imgui/imgui_tables.cpp", + "output": "/home/tom/Dev/SakuraVNE/build/bin-int/Debug-linux-x86_64/ImGui/imgui_tables.o" + }, + { + "arguments": [ + "g++", + "-MD", + "-MP", + "-I.", + "-I/usr/include/SDL2", + "-m64", + "-fPIC", + "-g", + "-std=c++17", + "-c", + "-o", + "../../build/bin-int/Debug-linux-x86_64/ImGui/imgui_widgets.o", + "imgui_widgets.cpp" + ], + "directory": "/home/tom/Dev/SakuraVNE/libs/imgui", + "file": "/home/tom/Dev/SakuraVNE/libs/imgui/imgui_widgets.cpp", + "output": "/home/tom/Dev/SakuraVNE/build/bin-int/Debug-linux-x86_64/ImGui/imgui_widgets.o" + }, + { + "arguments": [ + "g++", + "-MD", + "-MP", + "-I.", + "-I/usr/include/SDL2", + "-m64", + "-fPIC", + "-g", + "-std=c++17", + "-c", + "-o", + "../../build/bin-int/Debug-linux-x86_64/ImGui/imstb_rectpack.o", + "imstb_rectpack.h" + ], + "directory": "/home/tom/Dev/SakuraVNE/libs/imgui", + "file": "/home/tom/Dev/SakuraVNE/libs/imgui/imstb_rectpack.h", + "output": "/home/tom/Dev/SakuraVNE/build/bin-int/Debug-linux-x86_64/ImGui/imstb_rectpack.o" + }, + { + "arguments": [ + "g++", + "-MD", + "-MP", + "-I.", + "-I/usr/include/SDL2", + "-m64", + "-fPIC", + "-g", + "-std=c++17", + "-c", + "-o", + "../../build/bin-int/Debug-linux-x86_64/ImGui/imstb_textedit.o", + "imstb_textedit.h" + ], + "directory": "/home/tom/Dev/SakuraVNE/libs/imgui", + "file": "/home/tom/Dev/SakuraVNE/libs/imgui/imstb_textedit.h", + "output": "/home/tom/Dev/SakuraVNE/build/bin-int/Debug-linux-x86_64/ImGui/imstb_textedit.o" + }, + { + "arguments": [ + "g++", + "-MD", + "-MP", + "-I.", + "-I/usr/include/SDL2", + "-m64", + "-fPIC", + "-g", + "-std=c++17", + "-c", + "-o", + "../../build/bin-int/Debug-linux-x86_64/ImGui/imstb_truetype.o", + "imstb_truetype.h" + ], + "directory": "/home/tom/Dev/SakuraVNE/libs/imgui", + "file": "/home/tom/Dev/SakuraVNE/libs/imgui/imstb_truetype.h", + "output": "/home/tom/Dev/SakuraVNE/build/bin-int/Debug-linux-x86_64/ImGui/imstb_truetype.o" + }, + { + "arguments": [ + "g++", + "-MD", + "-MP", + "-I.", + "-I/usr/include/SDL2", + "-m64", + "-fPIC", + "-g", + "-std=c++17", + "-c", + "-o", + "../../build/bin-int/Debug-linux-x86_64/ImGui/imgui_stdlib.o", + "misc/cpp/imgui_stdlib.cpp" + ], + "directory": "/home/tom/Dev/SakuraVNE/libs/imgui", + "file": "/home/tom/Dev/SakuraVNE/libs/imgui/misc/cpp/imgui_stdlib.cpp", + "output": "/home/tom/Dev/SakuraVNE/build/bin-int/Debug-linux-x86_64/ImGui/imgui_stdlib.o" + }, + { + "arguments": [ + "g++", + "-MD", + "-MP", + "-I.", + "-I/usr/include/SDL2", + "-m64", + "-fPIC", + "-g", + "-std=c++17", + "-c", + "-o", + "../../build/bin-int/Debug-linux-x86_64/ImGui/imgui_stdlib.o", + "misc/cpp/imgui_stdlib.h" + ], + "directory": "/home/tom/Dev/SakuraVNE/libs/imgui", + "file": "/home/tom/Dev/SakuraVNE/libs/imgui/misc/cpp/imgui_stdlib.h", + "output": "/home/tom/Dev/SakuraVNE/build/bin-int/Debug-linux-x86_64/ImGui/imgui_stdlib.o" + }, + { + "arguments": [ + "g++", + "-MD", + "-MP", + "-I.", + "-I../imgui", + "-m64", + "-fPIC", + "-g", + "-std=c++20", + "-c", + "-o", + "../../build/bin-int/Debug-linux-x86_64/ImGuiNodeEditor/crude_json.o", + "crude_json.cpp" + ], + "directory": "/home/tom/Dev/SakuraVNE/libs/imgui-node-editor", + "file": "/home/tom/Dev/SakuraVNE/libs/imgui-node-editor/crude_json.cpp", + "output": "/home/tom/Dev/SakuraVNE/build/bin-int/Debug-linux-x86_64/ImGuiNodeEditor/crude_json.o" + }, + { + "arguments": [ + "g++", + "-MD", + "-MP", + "-I.", + "-I../imgui", + "-m64", + "-fPIC", + "-g", + "-std=c++20", + "-c", + "-o", + "../../build/bin-int/Debug-linux-x86_64/ImGuiNodeEditor/crude_json.o", + "crude_json.h" + ], + "directory": "/home/tom/Dev/SakuraVNE/libs/imgui-node-editor", + "file": "/home/tom/Dev/SakuraVNE/libs/imgui-node-editor/crude_json.h", + "output": "/home/tom/Dev/SakuraVNE/build/bin-int/Debug-linux-x86_64/ImGuiNodeEditor/crude_json.o" + }, + { + "arguments": [ + "g++", + "-MD", + "-MP", + "-I.", + "-I../imgui", + "-m64", + "-fPIC", + "-g", + "-std=c++20", + "-c", + "-o", + "../../build/bin-int/Debug-linux-x86_64/ImGuiNodeEditor/imgui_bezier_math.o", + "imgui_bezier_math.h" + ], + "directory": "/home/tom/Dev/SakuraVNE/libs/imgui-node-editor", + "file": "/home/tom/Dev/SakuraVNE/libs/imgui-node-editor/imgui_bezier_math.h", + "output": "/home/tom/Dev/SakuraVNE/build/bin-int/Debug-linux-x86_64/ImGuiNodeEditor/imgui_bezier_math.o" + }, + { + "arguments": [ + "g++", + "-MD", + "-MP", + "-I.", + "-I../imgui", + "-m64", + "-fPIC", + "-g", + "-std=c++20", + "-c", + "-o", + "../../build/bin-int/Debug-linux-x86_64/ImGuiNodeEditor/imgui_bezier_math.o", + "imgui_bezier_math.inl" + ], + "directory": "/home/tom/Dev/SakuraVNE/libs/imgui-node-editor", + "file": "/home/tom/Dev/SakuraVNE/libs/imgui-node-editor/imgui_bezier_math.inl", + "output": "/home/tom/Dev/SakuraVNE/build/bin-int/Debug-linux-x86_64/ImGuiNodeEditor/imgui_bezier_math.o" + }, + { + "arguments": [ + "g++", + "-MD", + "-MP", + "-I.", + "-I../imgui", + "-m64", + "-fPIC", + "-g", + "-std=c++20", + "-c", + "-o", + "../../build/bin-int/Debug-linux-x86_64/ImGuiNodeEditor/imgui_canvas.o", + "imgui_canvas.cpp" + ], + "directory": "/home/tom/Dev/SakuraVNE/libs/imgui-node-editor", + "file": "/home/tom/Dev/SakuraVNE/libs/imgui-node-editor/imgui_canvas.cpp", + "output": "/home/tom/Dev/SakuraVNE/build/bin-int/Debug-linux-x86_64/ImGuiNodeEditor/imgui_canvas.o" + }, + { + "arguments": [ + "g++", + "-MD", + "-MP", + "-I.", + "-I../imgui", + "-m64", + "-fPIC", + "-g", + "-std=c++20", + "-c", + "-o", + "../../build/bin-int/Debug-linux-x86_64/ImGuiNodeEditor/imgui_canvas.o", + "imgui_canvas.h" + ], + "directory": "/home/tom/Dev/SakuraVNE/libs/imgui-node-editor", + "file": "/home/tom/Dev/SakuraVNE/libs/imgui-node-editor/imgui_canvas.h", + "output": "/home/tom/Dev/SakuraVNE/build/bin-int/Debug-linux-x86_64/ImGuiNodeEditor/imgui_canvas.o" + }, + { + "arguments": [ + "g++", + "-MD", + "-MP", + "-I.", + "-I../imgui", + "-m64", + "-fPIC", + "-g", + "-std=c++20", + "-c", + "-o", + "../../build/bin-int/Debug-linux-x86_64/ImGuiNodeEditor/imgui_extra_math.o", + "imgui_extra_math.h" + ], + "directory": "/home/tom/Dev/SakuraVNE/libs/imgui-node-editor", + "file": "/home/tom/Dev/SakuraVNE/libs/imgui-node-editor/imgui_extra_math.h", + "output": "/home/tom/Dev/SakuraVNE/build/bin-int/Debug-linux-x86_64/ImGuiNodeEditor/imgui_extra_math.o" + }, + { + "arguments": [ + "g++", + "-MD", + "-MP", + "-I.", + "-I../imgui", + "-m64", + "-fPIC", + "-g", + "-std=c++20", + "-c", + "-o", + "../../build/bin-int/Debug-linux-x86_64/ImGuiNodeEditor/imgui_extra_math.o", + "imgui_extra_math.inl" + ], + "directory": "/home/tom/Dev/SakuraVNE/libs/imgui-node-editor", + "file": "/home/tom/Dev/SakuraVNE/libs/imgui-node-editor/imgui_extra_math.inl", + "output": "/home/tom/Dev/SakuraVNE/build/bin-int/Debug-linux-x86_64/ImGuiNodeEditor/imgui_extra_math.o" + }, + { + "arguments": [ + "g++", + "-MD", + "-MP", + "-I.", + "-I../imgui", + "-m64", + "-fPIC", + "-g", + "-std=c++20", + "-c", + "-o", + "../../build/bin-int/Debug-linux-x86_64/ImGuiNodeEditor/imgui_node_editor.o", + "imgui_node_editor.cpp" + ], + "directory": "/home/tom/Dev/SakuraVNE/libs/imgui-node-editor", + "file": "/home/tom/Dev/SakuraVNE/libs/imgui-node-editor/imgui_node_editor.cpp", + "output": "/home/tom/Dev/SakuraVNE/build/bin-int/Debug-linux-x86_64/ImGuiNodeEditor/imgui_node_editor.o" + }, + { + "arguments": [ + "g++", + "-MD", + "-MP", + "-I.", + "-I../imgui", + "-m64", + "-fPIC", + "-g", + "-std=c++20", + "-c", + "-o", + "../../build/bin-int/Debug-linux-x86_64/ImGuiNodeEditor/imgui_node_editor.o", + "imgui_node_editor.h" + ], + "directory": "/home/tom/Dev/SakuraVNE/libs/imgui-node-editor", + "file": "/home/tom/Dev/SakuraVNE/libs/imgui-node-editor/imgui_node_editor.h", + "output": "/home/tom/Dev/SakuraVNE/build/bin-int/Debug-linux-x86_64/ImGuiNodeEditor/imgui_node_editor.o" + }, + { + "arguments": [ + "g++", + "-MD", + "-MP", + "-I.", + "-I../imgui", + "-m64", + "-fPIC", + "-g", + "-std=c++20", + "-c", + "-o", + "../../build/bin-int/Debug-linux-x86_64/ImGuiNodeEditor/imgui_node_editor_api.o", + "imgui_node_editor_api.cpp" + ], + "directory": "/home/tom/Dev/SakuraVNE/libs/imgui-node-editor", + "file": "/home/tom/Dev/SakuraVNE/libs/imgui-node-editor/imgui_node_editor_api.cpp", + "output": "/home/tom/Dev/SakuraVNE/build/bin-int/Debug-linux-x86_64/ImGuiNodeEditor/imgui_node_editor_api.o" + }, + { + "arguments": [ + "g++", + "-MD", + "-MP", + "-I.", + "-I../imgui", + "-m64", + "-fPIC", + "-g", + "-std=c++20", + "-c", + "-o", + "../../build/bin-int/Debug-linux-x86_64/ImGuiNodeEditor/imgui_node_editor_internal.o", + "imgui_node_editor_internal.h" + ], + "directory": "/home/tom/Dev/SakuraVNE/libs/imgui-node-editor", + "file": "/home/tom/Dev/SakuraVNE/libs/imgui-node-editor/imgui_node_editor_internal.h", + "output": "/home/tom/Dev/SakuraVNE/build/bin-int/Debug-linux-x86_64/ImGuiNodeEditor/imgui_node_editor_internal.o" + }, + { + "arguments": [ + "g++", + "-MD", + "-MP", + "-I.", + "-I../imgui", + "-m64", + "-fPIC", + "-g", + "-std=c++20", + "-c", + "-o", + "../../build/bin-int/Debug-linux-x86_64/ImGuiNodeEditor/imgui_node_editor_internal.o", + "imgui_node_editor_internal.inl" + ], + "directory": "/home/tom/Dev/SakuraVNE/libs/imgui-node-editor", + "file": "/home/tom/Dev/SakuraVNE/libs/imgui-node-editor/imgui_node_editor_internal.inl", + "output": "/home/tom/Dev/SakuraVNE/build/bin-int/Debug-linux-x86_64/ImGuiNodeEditor/imgui_node_editor_internal.o" + }, + { + "arguments": [ + "g++", + "-MD", + "-MP", + "-DPLATFORM_LINUX", + "-DDEBUG", + "-Isrc", + "-I../libs/spdlog/include", + "-I../libs/imgui", + "-I../libs/imgui/misc", + "-I../libs/imgui/backends", + "-I../libs/imgui-node-editor", + "-I/usr/include/SDL2", + "-m64", + "-g", + "-std=c++20", + "-c", + "-o", + "../build/bin-int/Debug-linux-x86_64/SakuraVNE/Application.o", + "src/Application.cpp" + ], + "directory": "/home/tom/Dev/SakuraVNE/SakuraVNE", + "file": "/home/tom/Dev/SakuraVNE/SakuraVNE/src/Application.cpp", + "output": "/home/tom/Dev/SakuraVNE/build/bin-int/Debug-linux-x86_64/SakuraVNE/Application.o" + }, + { + "arguments": [ + "g++", + "-MD", + "-MP", + "-DPLATFORM_LINUX", + "-DDEBUG", + "-Isrc", + "-I../libs/spdlog/include", + "-I../libs/imgui", + "-I../libs/imgui/misc", + "-I../libs/imgui/backends", + "-I../libs/imgui-node-editor", + "-I/usr/include/SDL2", + "-m64", + "-g", + "-std=c++20", + "-c", + "-o", + "../build/bin-int/Debug-linux-x86_64/SakuraVNE/Application.o", + "src/Application.h" + ], + "directory": "/home/tom/Dev/SakuraVNE/SakuraVNE", + "file": "/home/tom/Dev/SakuraVNE/SakuraVNE/src/Application.h", + "output": "/home/tom/Dev/SakuraVNE/build/bin-int/Debug-linux-x86_64/SakuraVNE/Application.o" + }, + { + "arguments": [ + "g++", + "-MD", + "-MP", + "-DPLATFORM_LINUX", + "-DDEBUG", + "-Isrc", + "-I../libs/spdlog/include", + "-I../libs/imgui", + "-I../libs/imgui/misc", + "-I../libs/imgui/backends", + "-I../libs/imgui-node-editor", + "-I/usr/include/SDL2", + "-m64", + "-g", + "-std=c++20", + "-c", + "-o", + "../build/bin-int/Debug-linux-x86_64/SakuraVNE/Event.o", + "src/Event.cpp" + ], + "directory": "/home/tom/Dev/SakuraVNE/SakuraVNE", + "file": "/home/tom/Dev/SakuraVNE/SakuraVNE/src/Event.cpp", + "output": "/home/tom/Dev/SakuraVNE/build/bin-int/Debug-linux-x86_64/SakuraVNE/Event.o" + }, + { + "arguments": [ + "g++", + "-MD", + "-MP", + "-DPLATFORM_LINUX", + "-DDEBUG", + "-Isrc", + "-I../libs/spdlog/include", + "-I../libs/imgui", + "-I../libs/imgui/misc", + "-I../libs/imgui/backends", + "-I../libs/imgui-node-editor", + "-I/usr/include/SDL2", + "-m64", + "-g", + "-std=c++20", + "-c", + "-o", + "../build/bin-int/Debug-linux-x86_64/SakuraVNE/Event.o", + "src/Event.h" + ], + "directory": "/home/tom/Dev/SakuraVNE/SakuraVNE", + "file": "/home/tom/Dev/SakuraVNE/SakuraVNE/src/Event.h", + "output": "/home/tom/Dev/SakuraVNE/build/bin-int/Debug-linux-x86_64/SakuraVNE/Event.o" + }, + { + "arguments": [ + "g++", + "-MD", + "-MP", + "-DPLATFORM_LINUX", + "-DDEBUG", + "-Isrc", + "-I../libs/spdlog/include", + "-I../libs/imgui", + "-I../libs/imgui/misc", + "-I../libs/imgui/backends", + "-I../libs/imgui-node-editor", + "-I/usr/include/SDL2", + "-m64", + "-g", + "-std=c++20", + "-c", + "-o", + "../build/bin-int/Debug-linux-x86_64/SakuraVNE/Log.o", + "src/Log.cpp" + ], + "directory": "/home/tom/Dev/SakuraVNE/SakuraVNE", + "file": "/home/tom/Dev/SakuraVNE/SakuraVNE/src/Log.cpp", + "output": "/home/tom/Dev/SakuraVNE/build/bin-int/Debug-linux-x86_64/SakuraVNE/Log.o" + }, + { + "arguments": [ + "g++", + "-MD", + "-MP", + "-DPLATFORM_LINUX", + "-DDEBUG", + "-Isrc", + "-I../libs/spdlog/include", + "-I../libs/imgui", + "-I../libs/imgui/misc", + "-I../libs/imgui/backends", + "-I../libs/imgui-node-editor", + "-I/usr/include/SDL2", + "-m64", + "-g", + "-std=c++20", + "-c", + "-o", + "../build/bin-int/Debug-linux-x86_64/SakuraVNE/Log.o", + "src/Log.h" + ], + "directory": "/home/tom/Dev/SakuraVNE/SakuraVNE", + "file": "/home/tom/Dev/SakuraVNE/SakuraVNE/src/Log.h", + "output": "/home/tom/Dev/SakuraVNE/build/bin-int/Debug-linux-x86_64/SakuraVNE/Log.o" + }, + { + "arguments": [ + "g++", + "-MD", + "-MP", + "-DPLATFORM_LINUX", + "-DDEBUG", + "-Isrc", + "-I../libs/spdlog/include", + "-I../libs/imgui", + "-I../libs/imgui/misc", + "-I../libs/imgui/backends", + "-I../libs/imgui-node-editor", + "-I/usr/include/SDL2", + "-m64", + "-g", + "-std=c++20", + "-c", + "-o", + "../build/bin-int/Debug-linux-x86_64/SakuraVNE/main.o", + "src/main.cpp" + ], + "directory": "/home/tom/Dev/SakuraVNE/SakuraVNE", + "file": "/home/tom/Dev/SakuraVNE/SakuraVNE/src/main.cpp", + "output": "/home/tom/Dev/SakuraVNE/build/bin-int/Debug-linux-x86_64/SakuraVNE/main.o" + }, +] \ No newline at end of file diff --git a/libs/imgui b/libs/imgui index ffe409d..adecdae 160000 --- a/libs/imgui +++ b/libs/imgui @@ -1 +1 @@ -Subproject commit ffe409d7fba4bf8b09246d8bf9b66555d82436c8 +Subproject commit adecdae5418860846c718ab82f9428c88a9b9e98 diff --git a/libs/imgui-node-editor b/libs/imgui-node-editor index e78e447..ccdf3b4 160000 --- a/libs/imgui-node-editor +++ b/libs/imgui-node-editor @@ -1 +1 @@ -Subproject commit e78e447900909a051817a760efe13fe83e6e1afc +Subproject commit ccdf3b4238db6a8961621c08309f0f775db96de3 diff --git a/premake5.lua b/premake5.lua index 8c38d02..b01e3ba 100644 --- a/premake5.lua +++ b/premake5.lua @@ -16,6 +16,7 @@ workspace "SakuraVNE" IncludeDir["ImGuiNodeEditor"] = "/libs/imgui-node-editor" include "libs/imgui" + include "libs/imgui-node-editor" project "SakuraVNE" --project under solution location "SakuraVNE" @@ -38,18 +39,18 @@ project "SakuraVNE" --project under solution "libs/spdlog/include", "libs/imgui", "libs/imgui/misc", - "libs/imgui/backends" + "libs/imgui/backends", + "libs/imgui-node-editor" } libdirs{ - "build/bin/" .. outputdir .. "/ImGui" - } - links{ --reference - "ImGui" + "build/bin/" .. outputdir .. "/ImGui", + "build/bin/" .. outputdir .. "/ImGuiNodeEditor" } links{ - "ImGui" + "ImGui", + "ImGuiNodeEditor" } filter "system:windows"