Added Makefile dependency generation, and did some cleanup

This commit is contained in:
Clownacy 2019-02-11 18:36:56 +00:00
parent 1546e6ed4e
commit a5860afeb9

View file

@ -1,13 +1,14 @@
ifeq ($(RELEASE), 1)
CXXFLAGS := -O3 -s
CXXFLAGS = -O3 -s
FILENAME_DEF = release
else
CXXFLAGS := -O0 -g
CXXFLAGS = -O0 -g
FILENAME_DEF = debug
endif
ifeq ($(JAPANESE), 1)
CXXFLAGS += -DJAPANESE
ifeq ($(RELEASE), 1)
FILENAME_DEF = releasejp
else
@ -28,11 +29,12 @@ ifeq ($(WINDOWS), 1)
ifeq ($(JAPANESE), 1)
LIBS += -liconv
endif
CXXFLAGS += -DWINDOWS
LIBS += -lkernel32
endif
CXXFLAGS += `sdl2-config --cflags` `pkg-config freetype2 --cflags`
CXXFLAGS += `sdl2-config --cflags` `pkg-config freetype2 --cflags` -MMD -MP -MF $@.d
LIBS += `sdl2-config --static-libs` `pkg-config freetype2 --libs`
ifeq ($(STATIC), 1)
@ -188,6 +190,7 @@ ifneq ($(WINDOWS), 1)
endif
OBJECTS = $(addprefix obj/$(FILENAME)/, $(addsuffix .o, $(SOURCES)))
DEPENDENCIES = $(addprefix obj/$(FILENAME)/, $(addsuffix .o.d, $(SOURCES)))
ifeq ($(WINDOWS), 1)
OBJECTS += obj/$(FILENAME)/win_icon.o
@ -197,18 +200,18 @@ all: build/$(FILENAME)
build/$(FILENAME): $(OBJECTS)
@mkdir -p $(@D)
@g++ $(CXXFLAGS) $^ -o $@ $(LIBS)
@$(CXX) $(CXXFLAGS) $^ -o $@ $(LIBS)
@echo Finished compiling: $@
obj/$(FILENAME)/%.o: src/%.cpp
@mkdir -p $(@D)
@echo Compiling $^
@g++ $(CXXFLAGS) $^ -o $@ -c
@echo Compiling $<
@$(CXX) $(CXXFLAGS) $< -o $@ -c
obj/$(FILENAME)/Resource.o: src/Resource.cpp $(addprefix src/Resource/, $(addsuffix .h, $(RESOURCES)))
@mkdir -p $(@D)
@echo Compiling $<
@g++ $(CXXFLAGS) $< -o $@ -c
@$(CXX) $(CXXFLAGS) $< -o $@ -c
src/Resource/%.h: res/% obj/bin2h
@mkdir -p $(@D)
@ -218,7 +221,9 @@ src/Resource/%.h: res/% obj/bin2h
obj/bin2h: res/bin2h.c
@mkdir -p $(@D)
@echo Compiling $^
@gcc -O3 -s -static $^ -o $@
@$(CC) -O3 -s -static $^ -o $@
include $(wildcard $(DEPENDENCIES))
obj/$(FILENAME)/win_icon.o: res/ICON/ICON.rc res/ICON/0.ico res/ICON/ICON_MINI.ico
@mkdir -p $(@D)