From f0b654b9bf3bc2a93c1f89d4cc3edcf77b948555 Mon Sep 17 00:00:00 2001 From: XaviDCR92 Date: Mon, 9 Jul 2018 19:26:13 +0200 Subject: Game has been restructured in favor of OOP --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index d98733d..d047fd3 100644 --- a/Makefile +++ b/Makefile @@ -8,11 +8,12 @@ INCLUDE= $(foreach dir,$(INCLUDE_FOLDERS),-I$/../include/$(dir)) EXE_DIR=Exe CC_FLAGS += -Werror -Wfatal-errors +CXX_FLAGS = $(CC_FLAGS) -std=c++11 OBJ_DIR = Obj SRC_DIR = . -OBJECTS=$(addprefix $(OBJ_DIR)/,main.o Gameplay.o System.o Gfx.o Pad.o \ +OBJECTS=$(addprefix $(OBJ_DIR)/,main.o Game.o System.o HumanPlayer.o Sprite.o \ Player.o Camera.o Unit.o Menu.o ) DEPS = $(OBJECTS:.o=.d) @@ -36,7 +37,7 @@ run: $(EXE_DIR)/$(PROJECT).ELF -include $(DEPS) $(OBJ_DIR)/%.o: $(SRC_DIR)/%.cpp $(OBJ_DIR)/%.d - $(CXX) $< -o $@ $(INCLUDE) $(DEFINE) $(CC_FLAGS) -MMD + $(CXX) $< -o $@ $(INCLUDE) $(DEFINE) $(CXX_FLAGS) -MMD $(OBJ_DIR)/%.o: $(SRC_DIR)/%.c $(OBJ_DIR)/%.d $(CC) $< -o $@ $(INCLUDE) $(DEFINE) $(CC_FLAGS) -MMD -- cgit v1.2.3