Putting imgui docking and no dicking version

docking
anulax1225 ago%!(EXTRA string=9 months)
parent b165973d1a
commit 07a5333fbd
  1. 16
      Makefile
  2. 2
      dependencies
  3. 8
      package.json
  4. 2
      premake5.lua

@ -35,17 +35,17 @@ define POSTBUILDCMDS
endef endef
ifeq ($(config),debug) ifeq ($(config),debug)
TARGETDIR = ../../bin/linux-x86_64-Debug/ImGui TARGETDIR = ../../bin/linux-x86_64-Debug/ImGuiDocking
TARGET = $(TARGETDIR)/libImGui.a TARGET = $(TARGETDIR)/libImGuiDocking.a
OBJDIR = ../../bin-int/linux-x86_64-Debug/ImGui OBJDIR = ../../bin-int/linux-x86_64-Debug/ImGuiDocking
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -fPIC -g ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -fPIC -g
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -fPIC -g -std=c++17 ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -fPIC -g -std=c++17
ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -m64 ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -m64
else ifeq ($(config),release) else ifeq ($(config),release)
TARGETDIR = ../../bin/linux-x86_64-Release/ImGui TARGETDIR = ../../bin/linux-x86_64-Release/ImGuiDocking
TARGET = $(TARGETDIR)/libImGui.a TARGET = $(TARGETDIR)/libImGuiDocking.a
OBJDIR = ../../bin-int/linux-x86_64-Release/ImGui OBJDIR = ../../bin-int/linux-x86_64-Release/ImGuiDocking
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -O2 -fPIC ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -O2 -fPIC
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -O2 -fPIC -std=c++17 ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -O2 -fPIC -std=c++17
ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -m64 -s ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -m64 -s
@ -81,7 +81,7 @@ all: $(TARGET)
$(TARGET): $(GENERATED) $(OBJECTS) $(LDDEPS) | $(TARGETDIR) $(TARGET): $(GENERATED) $(OBJECTS) $(LDDEPS) | $(TARGETDIR)
$(PRELINKCMDS) $(PRELINKCMDS)
@echo Linking ImGui @echo Linking ImGuiDocking
$(SILENT) $(LINKCMD) $(SILENT) $(LINKCMD)
$(POSTBUILDCMDS) $(POSTBUILDCMDS)
@ -102,7 +102,7 @@ else
endif endif
clean: clean:
@echo Cleaning ImGui @echo Cleaning ImGuiDocking
ifeq (posix,$(SHELLTYPE)) ifeq (posix,$(SHELLTYPE))
$(SILENT) rm -f $(TARGET) $(SILENT) rm -f $(TARGET)
$(SILENT) rm -rf $(GENERATED) $(SILENT) rm -rf $(GENERATED)

@ -1 +1 @@
IncludeDirs["imgui"] = "%{wks.location}/vendor/imgui" IncludeDirs["imgui-docking"] = "%{wks.location}/vendor/imgui"

@ -1,14 +1,14 @@
{ {
"name": "ImGui", "name": "ImGuiDocking",
"author": "anulax1225", "author": "anulax1225",
"git": "https://github.com/anulax1225/imgui", "git": "https://github.com/anulax1225/imgui-docking",
"links": "links":
[ [
"ImGui" "ImGuiDocking"
], ],
"includes": "includes":
[ [
"imgui" "imgui-docking"
], ],
"packages":[] "packages":[]
} }

@ -1,4 +1,4 @@
project "ImGui" project "ImGuiDocking"
kind "StaticLib" kind "StaticLib"
language "C++" language "C++"
systemversion "latest" systemversion "latest"

Loading…
Cancel
Save