From 6c7d49ad503190f943380f36812c7128453710c1 Mon Sep 17 00:00:00 2001 From: Clownacy Date: Tue, 16 Jul 2019 12:25:22 +0000 Subject: [PATCH] Added DoConfig to the Makefile --- Makefile | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 86e4f5cb..af9ee0a6 100644 --- a/Makefile +++ b/Makefile @@ -11,9 +11,11 @@ ifeq ($(RELEASE), 1) CXXFLAGS = -O3 -flto LDFLAGS = -s FILENAME_DEF = CSE2 + DOCONFIG_FILENAME_DEF = DoConfig else CXXFLAGS = -Og -g3 FILENAME_DEF = CSE2_debug + DOCONFIG_FILENAME_DEF = DoConfig_debug endif ifeq ($(JAPANESE), 1) @@ -25,6 +27,7 @@ else endif FILENAME ?= $(FILENAME_DEF) +DOCONFIG_FILENAME ?= $(DOCONFIG_FILENAME_DEF) ifeq ($(FIX_BUGS), 1) CXXFLAGS += -DFIX_BUGS @@ -218,7 +221,7 @@ ifeq ($(WINDOWS), 1) OBJECTS += obj/$(FILENAME)/win_icon.o endif -all: $(BUILD_DIRECTORY)/$(FILENAME) $(BUILD_DIRECTORY)/data +all: $(BUILD_DIRECTORY)/$(FILENAME) $(BUILD_DIRECTORY)/data $(BUILD_DIRECTORY)/$(DOCONFIG_FILENAME) @echo Finished $(BUILD_DIRECTORY)/data: $(DATA_DIRECTORY) @@ -257,6 +260,15 @@ obj/$(FILENAME)/win_icon.o: $(ASSETS_DIRECTORY)/resources/ICON/ICON.rc $(ASSETS_ @mkdir -p $(@D) @windres $< $@ +$(BUILD_DIRECTORY)/$(DOCONFIG_FILENAME): DoConfig/DoConfig.cpp + @mkdir -p $(@D) + @echo Linking $@ +ifeq ($(STATIC), 1) + @$(CXX) -O3 -s -std=c++98 -static $^ -o $@ `fltk-config --cxxflags --libs --ldstaticflags` +else + @$(CXX) -O3 -s -std=c++98 $^ -o $@ `fltk-config --cxxflags --libs --ldflags` +endif + # TODO clean: @rm -rf obj