From 786dccd2bc0946d48b8a2758ef2c607678bc8dd9 Mon Sep 17 00:00:00 2001
From: XaviDCR92 <xavi.dcr@gmail.com>
Date: Fri, 8 Sep 2017 18:39:22 +0200
Subject: Removed Building and GameStructures modules. Restructured SW for Unit
 and Player, still a lot TODO

---
 Makefile | 43 +++++++++++++++++++++++++++++--------------
 1 file changed, 29 insertions(+), 14 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 148c236..abd17f8 100644
--- a/Makefile
+++ b/Makefile
@@ -13,11 +13,13 @@ OBJ_DIR = Obj
 SRC_DIR = .
 
 OBJECTS=$(addprefix $(OBJ_DIR)/,main.o Gameplay.o System.o Gfx.o Pad.o \
-								Player.o Camera.o Unit.o Menu.o Building.o)
+								Player.o Camera.o Unit.o Menu.o )
+
+DEPS = $(OBJECTS:.o=.d)
 
 build: libs $(EXE_DIR)/$(PROJECT).HEX
 	avr-size $(EXE_DIR)/$(PROJECT).ELF
-	
+
 rebuild:
 	make clean
 	make build
@@ -28,25 +30,38 @@ libs:
 	make -C Libs/petit_fatfs
 	make -C Libs/tinyFAT
 
+run: $(EXE_DIR)/$(PROJECT).ELF
+	$(GBSIM) $^
+
+depend: $(DEPS)
+
+$(OBJ_DIR)/%.d: $(SRC_DIR)/%.c
+	$(CC) $< $(DEFINE) $(INCLUDE)  -M -MF $@
+
+$(OBJ_DIR)/%.d: $(SRC_DIR)/%.cpp
+	$(CXX) $< $(DEFINE) $(INCLUDE) -M -MF $@
+
+$(OBJ_DIR)/%.o: $(SRC_DIR)/%.cpp $(OBJ_DIR)/%.d
+	$(CXX) $< -o $@ $(INCLUDE) $(DEFINE) $(CC_FLAGS)
+
+$(OBJ_DIR)/%.o: $(SRC_DIR)/%.c $(OBJ_DIR)/%.d
+	$(CC) $< -o $@ $(INCLUDE) $(DEFINE) $(CC_FLAGS)
+
+-include $(DEPS)
+
 clean:
 	rm *.elf -f
-	rm $(OBJ_DIR)/*.o -f
+	rm $(OBJ_DIR)/*.o $(OBJ_DIR)/*.d -f
 	make -C $$PWD/Libs/libarduino clean
-	make -C $$PWD/Libs/libgamebuino clean 
+	make -C $$PWD/Libs/libgamebuino clean
 	make -C $$PWD/Libs/petit_fatfs clean
 	make -C $$PWD/Libs/tinyFAT clean
-	
-$(OBJ_DIR)/%.o: $(SRC_DIR)/%.cpp
-	$(CXX) $< -o $@ $(INCLUDE) $(DEFINE) $(CC_FLAGS)
-	
-$(OBJ_DIR)/%.o: $(SRC_DIR)/%.c
-	$(CC) $< -o $@ $(INCLUDE) $(DEFINE) $(CC_FLAGS)
-	
+
 $(EXE_DIR)/$(PROJECT).ELF: $(OBJECTS)
 	mkdir -p $(EXE_DIR)
-	$(LINKER) $^ -o $@ -g $(DEFINE) $(LIBS) $(INCLUDE) -flto -Xlinker -Map=$(EXE_DIR)/POCKET.MAP -Wl,-emain -Wl,--gc-sections 
- 
+	$(LINKER) $^ -o $@ -g $(DEFINE) $(LIBS) $(INCLUDE) -flto -Xlinker -Map=$(EXE_DIR)/POCKET.MAP -Wl,-emain -Wl,--gc-sections
+
 $(EXE_DIR)/$(PROJECT).HEX: $(EXE_DIR)/$(PROJECT).ELF
 	avr-objcopy -j.text -j.data -j.bss -O ihex $^ $@
 
-.PHONY: all libs clean
+.PHONY: all libs clean run depend
-- 
cgit v1.2.3