diff --git a/include/props.mak b/include/props.mak new file mode 100644 index 0000000..56245fe --- /dev/null +++ b/include/props.mak @@ -0,0 +1,11 @@ +CPPFLAGS := $(CPPFLAGS) -MMD -MP +ifeq ($(CFG),Debug) +CPPFLAGS := $(CPPFLAGS) -D_DEBUG +CXXFLAGS := -Og +else +CPPFLAGS := $(CPPFLAGS) -DNDEBUG +CXXFLAGS := -O3 +endif + +OBJS := $(SRCS:%=%.o) +DEPS := $(OBJS:.o=.d) diff --git a/include/targets.mak b/include/targets.mak new file mode 100644 index 0000000..aeba1bb --- /dev/null +++ b/include/targets.mak @@ -0,0 +1,5 @@ +%.h.gch: %.h + $(CXX) $(CPPFLAGS) $(CXXFLAGS) -x c++-header -o $@ -c $< + +%.cpp.o: %.cpp + $(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ -c $< diff --git a/lib/libZRCola/build/Makefile b/lib/libZRCola/build/Makefile index 9313797..e3f9dc3 100644 --- a/lib/libZRCola/build/Makefile +++ b/lib/libZRCola/build/Makefile @@ -1,12 +1,4 @@ -CPPFLAGS := $(CPPFLAGS) -MMD -MP -I../../stdex/include -ifeq ($(CFG),Debug) -CPPFLAGS := $(CPPFLAGS) -D_DEBUG -CXXFLAGS := -Og -else -CPPFLAGS := $(CPPFLAGS) -DNDEBUG -CXXFLAGS := -O3 -endif - +CPPFLAGS := -I../../stdex/include SRCS := \ ../src/character.cpp \ ../src/common.cpp \ @@ -16,20 +8,15 @@ SRCS := \ ../src/pch.cpp \ ../src/tag.cpp \ ../src/translate.cpp -OBJS := $(SRCS:%=%.o) -DEPS := $(OBJS:.o=.d) + +include ../../../include/props.mak ../lib/libZRCola.a : ../src/pch.h.gch $(OBJS) $(AR) $(ARFLAGS) $@ $(OBJS) -%.h.gch: %.h - $(CXX) $(CPPFLAGS) $(CXXFLAGS) -x c++-header -o $@ -c $< - -%.cpp.o: %.cpp - $(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ -c $< - .PHONY: clean clean: -rm -r ../src/*.h.gch ../src/*.cpp.o ../lib/libZRCola.a +include ../../../include/targets.mak -include $(DEPS)