diff --git a/Makefile b/Makefile
index b610ea84..3585e7d0 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ endif
 ifeq ($(JAPANESE), 1)
 	DATA_DIRECTORY = $(ASSETS_DIRECTORY)/data_jp
 
-	ALL_CXXFLAGS += -DJAPANESE
+	CSE2_CXXFLAGS += -DJAPANESE
 else
 	DATA_DIRECTORY = $(ASSETS_DIRECTORY)/data_en
 endif
@@ -39,11 +39,11 @@ FILENAME ?= $(FILENAME_DEF)
 DOCONFIG_FILENAME ?= $(DOCONFIG_FILENAME_DEF)
 
 ifeq ($(FIX_BUGS), 1)
-	ALL_CXXFLAGS += -DFIX_BUGS
+	CSE2_CXXFLAGS += -DFIX_BUGS
 endif
 
 ifeq ($(DEBUG_SAVE), 1)
-	ALL_CXXFLAGS += -DDEBUG_SAVE
+	CSE2_CXXFLAGS += -DDEBUG_SAVE
 endif
 
 ifeq ($(WARNINGS), 1)
@@ -64,13 +64,16 @@ ifeq ($(WARNINGS_FATAL), 1)
 	ALL_CXXFLAGS += -Werror
 endif
 
-ALL_CXXFLAGS += -std=c++98 -MMD -MP -MF $@.d `pkg-config sdl2 --cflags` `pkg-config freetype2 --cflags`
+ALL_CXXFLAGS += -std=c++98 -MMD -MP -MF $@.d
+CSE2_CXXFLAGS += `pkg-config sdl2 --cflags` `pkg-config freetype2 --cflags`
 
 ifeq ($(STATIC), 1)
 	ALL_LDFLAGS += -static
-	ALL_LIBS += `pkg-config sdl2 --libs --static` `pkg-config freetype2 --libs --static` -lfreetype
+	CSE2_LIBS += `pkg-config sdl2 --libs --static` `pkg-config freetype2 --libs --static` -lfreetype
+	DOCONFIG_LIBS += `fltk-config --cxxflags --libs --ldstaticflags`
 else
-	ALL_LIBS += `pkg-config sdl2 --libs` `pkg-config freetype2 --libs`
+	CSE2_LIBS += `pkg-config sdl2 --libs` `pkg-config freetype2 --libs`
+	DOCONFIG_LIBS += `fltk-config --cxxflags --libs --ldflags`
 endif
 
 SOURCES = \
@@ -223,19 +226,19 @@ endif
 
 ifeq ($(RENDERER), OpenGL3)
 	SOURCES += src/Backends/Rendering/OpenGL3
-	ALL_CXXFLAGS += `pkg-config glew --cflags`
+	CSE2_CXXFLAGS += `pkg-config glew --cflags`
 
 	ifeq ($(STATIC), 1)
-		ALL_CXXFLAGS += -DGLEW_STATIC
-		ALL_LIBS += `pkg-config glew --libs --static`
+		CSE2_CXXFLAGS += -DGLEW_STATIC
+		CSE2_LIBS += `pkg-config glew --libs --static`
 	else
-		ALL_LIBS += `pkg-config glew --libs`
+		CSE2_LIBS += `pkg-config glew --libs`
 	endif
 
 	ifeq ($(WINDOWS), 1)
-		ALL_LIBS += -lopengl32
+		CSE2_LIBS += -lopengl32
 	else
-		ALL_LIBS += -lGL
+		CSE2_LIBS += -lGL
 	endif
 else ifeq ($(RENDERER), SDLTexture)
 	SOURCES += src/Backends/Rendering/SDLTexture
@@ -265,17 +268,17 @@ $(BUILD_DIRECTORY)/data: $(DATA_DIRECTORY)
 $(BUILD_DIRECTORY)/$(FILENAME): $(OBJECTS)
 	@mkdir -p $(@D)
 	@echo Linking $@
-	@$(CXX) $(ALL_CXXFLAGS) $(ALL_LDFLAGS) $^ -o $@ $(ALL_LIBS)
+	@$(CXX) $(ALL_CXXFLAGS) $(CSE2_CXXFLAGS) $(ALL_LDFLAGS) $^ -o $@ $(ALL_LIBS) $(CSE2_LIBS)
 
 obj/$(FILENAME)/%.o: %.cpp
 	@mkdir -p $(@D)
 	@echo Compiling $<
-	@$(CXX) $(ALL_CXXFLAGS) $< -o $@ -c
+	@$(CXX) $(ALL_CXXFLAGS) $(CSE2_CXXFLAGS) $< -o $@ -c
 
 obj/$(FILENAME)/src/Resource.o: src/Resource.cpp $(addprefix src/Resource/, $(addsuffix .h, $(RESOURCES)))
 	@mkdir -p $(@D)
 	@echo Compiling $<
-	@$(CXX) $(ALL_CXXFLAGS) $< -o $@ -c
+	@$(CXX) $(ALL_CXXFLAGS) $(CSE2_CXXFLAGS) $< -o $@ -c
 
 src/Resource/%.h: $(ASSETS_DIRECTORY)/resources/% obj/bin2h
 	@mkdir -p $(@D)
@@ -297,11 +300,7 @@ obj/$(FILENAME)/windows_resources.o: $(ASSETS_DIRECTORY)/resources/CSE2.rc $(ASS
 $(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
+	@$(CXX) $(ALL_CXXFLAGS) $(ALL_LDFLAGS) $^ -o $@ $(DOCONFIG_LIBS)
 
 # TODO
 clean: