From 1877193d6cbf8193f1231b082e99c5f14acfbf44 Mon Sep 17 00:00:00 2001 From: Jonathan Bradley Date: Mon, 29 Sep 2025 16:31:16 -0400 Subject: libpke: fold imgui into libpke --- Makefile | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/Makefile b/Makefile index dabc45a..d2f92a1 100644 --- a/Makefile +++ b/Makefile @@ -156,18 +156,6 @@ $(DIR_OBJ)/%.$(OBJ_EXT) : runtime/%.cpp | prepare $(DIR_OBJ)/%.$(OBJ_EXT) : tests/%.cpp | prepare $(cxx-command) $(FLG_TST) -$(DIR_OBJ)/libpke-imgui.$(LIB_EXT): $(DIR_OBJ)/imgui.$(OBJ_EXT) -$(DIR_OBJ)/libpke-imgui.$(LIB_EXT): $(DIR_OBJ)/imgui_demo.$(OBJ_EXT) -$(DIR_OBJ)/libpke-imgui.$(LIB_EXT): $(DIR_OBJ)/imgui_draw.$(OBJ_EXT) -$(DIR_OBJ)/libpke-imgui.$(LIB_EXT): $(DIR_OBJ)/imgui_tables.$(OBJ_EXT) -$(DIR_OBJ)/libpke-imgui.$(LIB_EXT): $(DIR_OBJ)/imgui_widgets.$(OBJ_EXT) -$(DIR_OBJ)/libpke-imgui.$(LIB_EXT): $(DIR_OBJ)/imgui_impl_glfw.$(OBJ_EXT) -$(DIR_OBJ)/libpke-imgui.$(LIB_EXT): $(DIR_OBJ)/imgui_impl_vulkan.$(OBJ_EXT) -$(DIR_OBJ)/libpke-imgui.$(LIB_EXT): $(DIR_OBJ)/imgui_stdlib.$(OBJ_EXT) -$(DIR_OBJ)/libpke-imgui.$(LIB_EXT): $(DIR_OBJ)/vendor-imgui-ext.$(OBJ_EXT) - ar rc $@ $^ - ranlib $@ - $(DIR_OBJ)/libpke-bullet3.$(LIB_EXT): (cd sub/bullet3/build3 && ./premake4_linux64 gmake) ${MAKE} no-demos=1 no-extras=1 no-test=1 config=$(BLT_BUILD_MODE) -C sub/bullet3/build3/gmake \ @@ -223,6 +211,15 @@ $(DIR_OBJ)/libpke.$(LIB_EXT): $(DIR_OBJ)/vendor-cgltf-include.$(OBJ_EXT) $(DIR_OBJ)/libpke.$(LIB_EXT): $(DIR_OBJ)/vendor-pkh-include.$(OBJ_EXT) $(DIR_OBJ)/libpke.$(LIB_EXT): $(DIR_OBJ)/vendor-stb-image-include.$(OBJ_EXT) $(DIR_OBJ)/libpke.$(LIB_EXT): $(DIR_OBJ)/window.$(OBJ_EXT) +$(DIR_OBJ)/libpke.$(LIB_EXT): $(DIR_OBJ)/imgui.$(OBJ_EXT) +$(DIR_OBJ)/libpke.$(LIB_EXT): $(DIR_OBJ)/imgui_demo.$(OBJ_EXT) +$(DIR_OBJ)/libpke.$(LIB_EXT): $(DIR_OBJ)/imgui_draw.$(OBJ_EXT) +$(DIR_OBJ)/libpke.$(LIB_EXT): $(DIR_OBJ)/imgui_tables.$(OBJ_EXT) +$(DIR_OBJ)/libpke.$(LIB_EXT): $(DIR_OBJ)/imgui_widgets.$(OBJ_EXT) +$(DIR_OBJ)/libpke.$(LIB_EXT): $(DIR_OBJ)/imgui_impl_glfw.$(OBJ_EXT) +$(DIR_OBJ)/libpke.$(LIB_EXT): $(DIR_OBJ)/imgui_impl_vulkan.$(OBJ_EXT) +$(DIR_OBJ)/libpke.$(LIB_EXT): $(DIR_OBJ)/imgui_stdlib.$(OBJ_EXT) +$(DIR_OBJ)/libpke.$(LIB_EXT): $(DIR_OBJ)/vendor-imgui-ext.$(OBJ_EXT) $(DIR_OBJ)/libpke.$(LIB_EXT): ar rc $@ $(filter %.$(OBJ_EXT),$^) ranlib $@ @@ -239,7 +236,6 @@ $(DIR_OBJ)/libpke-editor.$(LIB_EXT): $(DIR_OBJ)/libpke-editor.$(OBJ_EXT): $(DIR_OBJ)/libpke-editor.$(LIB_EXT) $(DIR_OBJ)/libpke-editor.$(OBJ_EXT): $(DIR_OBJ)/libmsdf-atlas-gen.$(LIB_EXT) $(DIR_OBJ)/libpke-editor.$(OBJ_EXT): $(DIR_OBJ)/libmsdfgen.$(LIB_EXT) -$(DIR_OBJ)/libpke-editor.$(OBJ_EXT): $(DIR_OBJ)/libpke-imgui.$(LIB_EXT) $(CXX) -rdynamic -shared -Wl,-soname,libpke-editor.$(OBJ_EXT).$(PKE_VERSION_MAJ).$(PKE_VERSION_MIN) -Wl,--whole-archive $^ -Wl,--no-whole-archive $(LDFLAGS) -o $@ $(DIR_OBJ)/libpke-example.$(LIB_EXT): $(DIR_OBJ)/example.$(OBJ_EXT) @@ -257,30 +253,27 @@ $(DIR_OBJ)/libpke-test.$(LIB_EXT): $(DIR_OBJ)/pke-test-font.$(OBJ_EXT) ar rcs $@ $(filter %.$(OBJ_EXT),$^) $(DIR_OBJ)/libpke-runtime.$(LIB_EXT): $(DIR_OBJ)/libpke.$(LIB_EXT) -$(DIR_OBJ)/libpke-runtime.$(LIB_EXT): $(DIR_OBJ)/libpke-imgui.$(LIB_EXT) $(DIR_OBJ)/libpke-runtime.$(LIB_EXT): $(DIR_OBJ)/libpke-bullet3.$(LIB_EXT) mkdir -p tmp ar x --output tmp $(DIR_OBJ)/libpke.$(LIB_EXT) - ar x --output tmp $(DIR_OBJ)/libpke-imgui.$(LIB_EXT) ar x --output tmp $(DIR_OBJ)/libpke-bullet3.$(LIB_EXT) ar rcs $@ tmp/*.o rm -rf tmp $(DIR_EXE)/pke-editor: $(DIR_OBJ)/libpke-editor.$(LIB_EXT) $(DIR_EXE)/pke-editor: $(DIR_OBJ)/libpke.$(LIB_EXT) -$(DIR_EXE)/pke-editor: $(DIR_OBJ)/libpke-imgui.$(LIB_EXT) $(DIR_EXE)/pke-editor: $(DIR_OBJ)/libpke-bullet3.$(LIB_EXT) $(DIR_EXE)/pke-editor: $(DIR_OBJ)/libmsdf-atlas-gen.$(LIB_EXT) $(DIR_EXE)/pke-editor: $(DIR_OBJ)/libmsdfgen.$(LIB_EXT) $(DIR_EXE)/pke-editor: $(DIR_OBJ)/editor-main.$(OBJ_EXT) $(CXX) -v -std=c++23 $(OPT_FLAGS) $(INCS) $^ $(LDFLAGS) $(CXXFLAGS) -o $@ -$(DIR_EXE)/pke-runtime: $(DIR_OBJ)/libpke.$(LIB_EXT) $(DIR_OBJ)/libpke-bullet3.$(LIB_EXT) $(DIR_OBJ)/libpke-imgui.$(LIB_EXT) +$(DIR_EXE)/pke-runtime: $(DIR_OBJ)/libpke.$(LIB_EXT) $(DIR_OBJ)/libpke-bullet3.$(LIB_EXT) $(DIR_EXE)/pke-runtime: $(DIR_OBJ)/runtime.$(OBJ_EXT) @echo $^ - $(CXX) -v -std=c++23 $(CXXFLAGS) $(OPT_FLAGS) $(INCS) $(DIR_OBJ)/runtime.$(OBJ_EXT) -Lobj -Wl,--whole-archive $(DIR_OBJ)/libpke.$(LIB_EXT) $(DIR_OBJ)/libpke-bullet3.$(LIB_EXT) $(DIR_OBJ)/libpke-imgui.$(LIB_EXT) -Wl,--no-whole-archive -ldl $(LDFLAGS) -o $@ + $(CXX) -v -std=c++23 $(CXXFLAGS) $(OPT_FLAGS) $(INCS) $(DIR_OBJ)/runtime.$(OBJ_EXT) -Lobj -Wl,--whole-archive $(DIR_OBJ)/libpke.$(LIB_EXT) $(DIR_OBJ)/libpke-bullet3.$(LIB_EXT) -Wl,--no-whole-archive -ldl $(LDFLAGS) -o $@ -$(DIR_EXE)/pke-test: $(DIR_OBJ)/libpke-test.$(LIB_EXT) $(DIR_OBJ)/libpke.$(LIB_EXT) $(DIR_OBJ)/libpke-imgui.$(LIB_EXT) $(DIR_OBJ)/libpke-bullet3.$(LIB_EXT) +$(DIR_EXE)/pke-test: $(DIR_OBJ)/libpke-test.$(LIB_EXT) $(DIR_OBJ)/libpke.$(LIB_EXT) $(DIR_OBJ)/libpke-bullet3.$(LIB_EXT) $(DIR_EXE)/pke-test: $(DIR_OBJ)/pke-test.$(OBJ_EXT) @echo $^ $(CXX) -v -std=c++23 $(OPT_FLAGS) $(INCS) $^ $(LDFLAGS) $(CXXFLAGS) -o $@ -- cgit v1.2.3