summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJonathan Bradley <jcb@pikum.xyz>2025-08-20 16:21:57 -0400
committerJonathan Bradley <jcb@pikum.xyz>2025-08-20 16:21:57 -0400
commitad44a1c8fd9f12fd569a8ae888aed222d879e78e (patch)
tree5ca92d76be3835aaf0692eae3f450857e0baaeb7 /Makefile
parent687e3a317973eef368f4caf5648ac9f8ef848b79 (diff)
Makefile: msdf use submodule
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile28
1 files changed, 21 insertions, 7 deletions
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)