Skip to content

Commit 44dd104

Browse files
committed
Added 'POST' to specify post-included Makefiles; added Makefile_post to specify lib dependencies rather than automatically depending on all
1 parent f61f7a6 commit 44dd104

File tree

3 files changed

+12
-7
lines changed

3 files changed

+12
-7
lines changed

Makefile

+3-2
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ BUILD_DEP=$(CXX) $(CXXFLAGS) -MM $(BR) -MT '$(DIR_O)$*.o' $< -MF $@
101101
$(call PAT_D,$(NAMES_EXE)): $(DIR_O)%.d: $(DIR_APP)%.cpp; $(BUILD_DEP)
102102
$(call PAT_D,$(NAMES_SO)): $(DIR_O)%.d: $(DIR_SRC)%.cpp; $(BUILD_DEP)
103103

104-
$(call PAT_EXE,$(NAMES_EXE)): $(DIR_BIN)%: $(DIR_O)%.o $(DIR_O)%.d $(FILES_SO) $(DEPS_$*)
104+
$(call PAT_EXE,$(NAMES_EXE)): $(DIR_BIN)%: $(DIR_O)%.o $(DIR_O)%.d $(DEPS_$*) #$(FILES_SO) $(DEPS_$*)
105105
$(CXX) $(LDFLAGS)\
106106
$(strip -o $@ $< $(LDLIBS) $(LDLIBS_$*) $(sort $(call CONFIG_SO,$(REQ_$*))))
107107

@@ -120,9 +120,10 @@ $(DIR_O)%.o: $(DIR_SRC)%.cpp $(DIR_DEP)%.d \
120120
$(CXX) $(CXXFLAGS) $(CXXFLAGS_$*) $(sort $(call CONFIG_O,$(REQ_$*))) -fPIC -c \
121121
$(strip -o $@ $(call PAT_SRC,$*) $<)
122122

123+
#SOS_view=$(call REPAT,CPP,SO,$(wildcard $(call PAT_CPP,$(patsubst -l%,%,$(filter -l%,$(LDLIBS_view))))))
123124
# Generate auto-dep injection - what could go wrong?
124125
#-include $(call PAT_D,$(NAMES_EXE) $(NAMES_SO))
125-
include $(wildcard $(DEPS_EXE) $(DEPS_SO)) Doxygen.mk
126+
include $(wildcard $(DEPS_EXE) $(DEPS_SO)) Doxygen.mk $(wildcard $(POST))
126127

127128
debug: override CXXFLAGS+=-Og -ggdb -g3 -fno-omit-frame-pointer
128129
debug: clean default

Makefile.conf

+7-5
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ STD?=-std=c++14
44
COLOR?=-fdiagnostics-color=always
55
OPT?=-O3
66
CXXFLAGS+=$(STD) $(COLOR) $(OPT)
7+
78
# override CXXFLAGS+=$(STD) -fdiagnostics-color=always -O3
89
override REQ_SDL2+=sdl2 SDL2_image SDL2_ttf
910
#override REQ_ALL:=$(REQ_SDL2)
@@ -18,20 +19,19 @@ LDLIBS_SDL2:=$$(pkg-config --libs $(REQ_SDL2))
1819
#CXXFLAGS_SDL2:=$(call CONFIG_O,$(REQ_SDL2))
1920
#LDLIBS_SDL2:=$(call CONFIG_SO,$(REQ_SDL2))
2021

21-
22-
CXXFLAGS_joystick:=$(CXXFLAGS_SDL2)
23-
LDLIBS_joystick:=$(LDLIBS_SDL2)
24-
#LDLIBS_joystick:=-lglbinding $(LDLIBS_SDL2)
25-
2622
CXXFLAGS_context:=$(CXXFLAGS_SDL2)
2723
LDLIBS_context:=$(LDLIBS_view)
2824
CXXFLAGS_frame:=$(CXXFLAGS_SDL2)
2925
LDLIBS_frame:=$(LDLIBS_view) -lcontext
26+
3027
CXXFLAGS_shader:=$(CXXFLAGS_SDL2)
3128
LDLIBS_shader:=$(LDLIBS_view)
3229
CXXFLAGS_view:=$(CXXFLAGS_SDL2)
3330
LDLIBS_view:=$(LDLIBS_SDL2) -lglbinding -lcontext -lshader -lframe
3431

32+
#bin/view: lib/libframe.so
33+
#$(call PAT_EXE,view): $(call PAT_O,view)
34+
3535

3636
LDLIBS_image+=$(shell libpng-config --ldflags)
3737
CXXFLAGS_image+=$(shell libpng-config --cflags)
@@ -45,3 +45,5 @@ DEPS_shader:=$(call PAT_SO,reader)
4545
CXXFLAGS_COMPLETE+=$(CXXFLAGS_SDL2) $(shell libpng-config --cflags)
4646

4747
TARGET:=
48+
49+
POST=Makefile_post

Makefile_post

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
$(call PAT_O,frame): $(call PAT_SO,context)
2+
$(call PAT_O,view): $(call PAT_SO,context shader frame)

0 commit comments

Comments
 (0)