From ad44a1c8fd9f12fd569a8ae888aed222d879e78e Mon Sep 17 00:00:00 2001 From: Jonathan Bradley Date: Wed, 20 Aug 2025 16:21:57 -0400 Subject: Makefile: msdf use submodule --- .gitmodules | 6 ++++++ Makefile | 28 +++++++++++++++++++++------- sub/msdf-atlas-gen | 1 + sub/msdfgen | 1 + 4 files changed, 29 insertions(+), 7 deletions(-) create mode 160000 sub/msdf-atlas-gen create mode 160000 sub/msdfgen diff --git a/.gitmodules b/.gitmodules index 73a00e6..5c4c9ab 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,3 +10,9 @@ [submodule "sub/bullet3"] path = sub/bullet3 url = https://github.com/bulletphysics/bullet3.git +[submodule "sub/msdfgen"] + path = sub/msdfgen + url = https://github.com/jonpikum/msdfgen.git +[submodule "sub/msdf-atlas-gen"] + path = sub/msdf-atlas-gen + url = https://github.com/jonpikum/msdf-atlas-gen.git diff --git a/Makefile b/Makefile index 258a3eb..0454bb4 100644 --- a/Makefile +++ b/Makefile @@ -61,7 +61,7 @@ $(1): $(2) endef FLG_PKE = -Isub/imgui -Isub/stb -Isub/cgltf -Isub/bullet3/src -FLG_EDT = $(FLG_PKE) -Isrc -I/home/pikum/build/msdfgen -I/home/pikum/build/msdf-atlas-gen +FLG_EDT = $(FLG_PKE) -Isrc -Isub/msdfgen -Isub/msdf-atlas-gen FLG_MPL = $(FLG_PKE) -Isrc FLG_RUN = $(FLG_PKE) -Isrc FLG_TST = $(FLG_PKE) -Isrc @@ -168,7 +168,6 @@ $(DIR_OBJ)/libpke-imgui.$(LIB_EXT): $(DIR_OBJ)/vendor-imgui-ext.$(OBJ_EXT) ar rc $@ $^ ranlib $@ -# -j$$((`nproc`-1)) $(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 \ @@ -176,6 +175,16 @@ $(DIR_OBJ)/libpke-bullet3.$(LIB_EXT): ar rc $@ sub/bullet3/build3/gmake/obj/x64/$(BLT_BUILD_DIR)/*/*.o ranlib $@ +$(DIR_OBJ)/libmsdfgen.$(LIB_EXT): prepare + ${MAKE} -C sub/msdfgen $@ + ar rc $@ sub/msdfgen/$(DIR_OBJ)/*.$(OBJ_EXT) + ranlib $@ + +$(DIR_OBJ)/libmsdf-atlas-gen.$(LIB_EXT): prepare + ${MAKE} -C sub/msdf-atlas-gen $@ + ar rc $@ sub/msdf-atlas-gen/$(DIR_OBJ)/*.$(OBJ_EXT) + ranlib $@ + $(DIR_OBJ)/libpke.$(LIB_EXT): $(DST_SHADERS) $(DIR_OBJ)/libpke.$(LIB_EXT): $(DIR_OBJ)/arg-handler.$(OBJ_EXT) $(DIR_OBJ)/libpke.$(LIB_EXT): $(DIR_OBJ)/asset-manager.$(OBJ_EXT) @@ -228,9 +237,9 @@ $(DIR_OBJ)/libpke-editor.$(LIB_EXT): ranlib $@ $(DIR_OBJ)/libpke-editor.$(OBJ_EXT): $(DIR_OBJ)/libpke-editor.$(LIB_EXT) -$(DIR_OBJ)/libpke-editor.$(OBJ_EXT): /home/pikum/build/msdf-atlas-gen/dbg/msdf-atlas-gen.a -$(DIR_OBJ)/libpke-editor.$(OBJ_EXT): /home/pikum/build/msdfgen/dbg/msdfgen.a - $(CXX) -shared -Wl,-soname,libpke-editor.$(OBJ_EXT).$(PKE_VERSION_MAJ).$(PKE_VERSION_MIN) -o $@ -Wl,--whole-archive $^ -Wl,--no-whole-archive $(LDFLAGS) +$(DIR_OBJ)/libpke-editor.$(OBJ_EXT): $(DIR_OBJ)/libmsdf-atlas-gen.$(LIB_EXT) +$(DIR_OBJ)/libpke-editor.$(OBJ_EXT): $(DIR_OBJ)/libmsdfgen.$(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) ar rc $@ $(filter %.$(OBJ_EXT),$^) @@ -243,9 +252,14 @@ $(DIR_OBJ)/libpke-test.$(LIB_EXT): $(DIR_OBJ)/pke-test-serialization.$(OBJ_EXT) $(DIR_OBJ)/libpke-test.$(LIB_EXT): $(DIR_OBJ)/pke-test-asset-manager.$(OBJ_EXT) ar rcs $@ $(filter %.$(OBJ_EXT),$^) -$(DIR_EXE)/pke-editor: $(DIR_OBJ)/libpke-editor.$(LIB_EXT) $(DIR_OBJ)/libpke.$(LIB_EXT) $(DIR_OBJ)/libpke-imgui.$(LIB_EXT) $(DIR_OBJ)/libpke-bullet3.$(LIB_EXT) +$(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) $^ /home/pikum/build/msdf-atlas-gen/dbg/msdf-atlas-gen.a /home/pikum/build/msdfgen/dbg/msdfgen.a $(LDFLAGS) $(CXXFLAGS) -o $@ + $(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)/runtime.$(OBJ_EXT) diff --git a/sub/msdf-atlas-gen b/sub/msdf-atlas-gen new file mode 160000 index 0000000..1a2f3e4 --- /dev/null +++ b/sub/msdf-atlas-gen @@ -0,0 +1 @@ +Subproject commit 1a2f3e42c605bfbdf18dcc0d4d8a09bb900f7f74 diff --git a/sub/msdfgen b/sub/msdfgen new file mode 160000 index 0000000..f875e63 --- /dev/null +++ b/sub/msdfgen @@ -0,0 +1 @@ +Subproject commit f875e635dd96fbaa8a218bff187828dc92e8263f -- cgit v1.2.3