From 07a5333fbd78ce5cbe9c2b6894b398ccaf59abbd Mon Sep 17 00:00:00 2001 From: anulax1225 Date: Sat, 28 Sep 2024 14:26:31 +0200 Subject: [PATCH] Putting imgui docking and no dicking version --- Makefile | 16 ++++++++-------- dependencies | 2 +- package.json | 8 ++++---- premake5.lua | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 2117e049..b44e7641 100644 --- a/Makefile +++ b/Makefile @@ -35,17 +35,17 @@ define POSTBUILDCMDS endef ifeq ($(config),debug) -TARGETDIR = ../../bin/linux-x86_64-Debug/ImGui -TARGET = $(TARGETDIR)/libImGui.a -OBJDIR = ../../bin-int/linux-x86_64-Debug/ImGui +TARGETDIR = ../../bin/linux-x86_64-Debug/ImGuiDocking +TARGET = $(TARGETDIR)/libImGuiDocking.a +OBJDIR = ../../bin-int/linux-x86_64-Debug/ImGuiDocking ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -fPIC -g ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -fPIC -g -std=c++17 ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -m64 else ifeq ($(config),release) -TARGETDIR = ../../bin/linux-x86_64-Release/ImGui -TARGET = $(TARGETDIR)/libImGui.a -OBJDIR = ../../bin-int/linux-x86_64-Release/ImGui +TARGETDIR = ../../bin/linux-x86_64-Release/ImGuiDocking +TARGET = $(TARGETDIR)/libImGuiDocking.a +OBJDIR = ../../bin-int/linux-x86_64-Release/ImGuiDocking ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -O2 -fPIC ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -O2 -fPIC -std=c++17 ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -m64 -s @@ -81,7 +81,7 @@ all: $(TARGET) $(TARGET): $(GENERATED) $(OBJECTS) $(LDDEPS) | $(TARGETDIR) $(PRELINKCMDS) - @echo Linking ImGui + @echo Linking ImGuiDocking $(SILENT) $(LINKCMD) $(POSTBUILDCMDS) @@ -102,7 +102,7 @@ else endif clean: - @echo Cleaning ImGui + @echo Cleaning ImGuiDocking ifeq (posix,$(SHELLTYPE)) $(SILENT) rm -f $(TARGET) $(SILENT) rm -rf $(GENERATED) diff --git a/dependencies b/dependencies index 025a5b61..d4967e93 100644 --- a/dependencies +++ b/dependencies @@ -1 +1 @@ -IncludeDirs["imgui"] = "%{wks.location}/vendor/imgui" +IncludeDirs["imgui-docking"] = "%{wks.location}/vendor/imgui" diff --git a/package.json b/package.json index e29028fb..a01b6561 100644 --- a/package.json +++ b/package.json @@ -1,14 +1,14 @@ { - "name": "ImGui", + "name": "ImGuiDocking", "author": "anulax1225", - "git": "https://github.com/anulax1225/imgui", + "git": "https://github.com/anulax1225/imgui-docking", "links": [ - "ImGui" + "ImGuiDocking" ], "includes": [ - "imgui" + "imgui-docking" ], "packages":[] } diff --git a/premake5.lua b/premake5.lua index 09e6fb23..ba2e667e 100644 --- a/premake5.lua +++ b/premake5.lua @@ -1,4 +1,4 @@ -project "ImGui" +project "ImGuiDocking" kind "StaticLib" language "C++" systemversion "latest"