Removed Building and GameStructures modules. Restructured SW for Unit and Player, still a lot TODO

4 files changed, 44 insertions, 30 deletions

diff --git a/Libs/libarduino/Makefile b/Libs/libarduino/Makefile
index 04253ec..eb324b6 100644
--- a/Libs/libarduino/Makefile
+++ b/Libs/libarduino/Makefile
@@ -2,28 +2,31 @@ include ../../Makefile.cfg
 
 PROJECT=arduino
 LIBNAME=lib$(PROJECT).a
-INCDIR=../../../include/$(PROJECT)
+
+INCLUDE_FOLDER=../../../include/$(PROJECT)
 LIBS_FOLDER=../../../lib
 
 OBJECTS= wiring.o wiring_analog.o wiring_digital.o \
         wiring_pulse.o wiring_shift.o HardwareSerial.o Print.o   \
         Tone.o WMath.o WString.o WInterrupts.o forward.o SPI.o
 
-default: $(OBJECTS)
-	avr-ar rcs $(LIBNAME) $^
-	mkdir -p $(INCDIR)
-	cp *.h $(INCDIR)/
-	mkdir -p $(LIBS_FOLDER)
-	mv $(LIBNAME) $(LIBS_FOLDER)
-	avr-size $(LIBS_FOLDER)/$(LIBNAME)
+default: $(LIBNAME)
+	cp *.h $(INCLUDE_FOLDER)/$(PROJECT)
 	
+$(LIBNAME): $(OBJECTS)
+	avr-ar rcs $@ $^
+	mkdir -p $(INCLUDE_FOLDER)/$(PROJECT)
+	mv $@ $(LIBS_FOLDER)
+	avr-size $(LIBS_FOLDER)/$@
+
 %.o: %.cpp
-	$(CXX) $< -o $@ $(DEFINE) $(INCLUDE)  $(CC_FLAGS)
+	$(CXX) $< -o $@ $(INCLUDE) $(DEFINE) $(CC_FLAGS)
 	
 %.o: %.c
-	$(CC) $< -o $@ $(DEFINE) $(INCLUDE) $(CC_FLAGS)
+	$(CC) $< -o $@ $(INCLUDE) $(DEFINE) $(CC_FLAGS)
 
 clean:
-	rm -f *.o
+	rm -f $(OBJECTS)
+	rm -f $(LIBS_FOLDER)/$(LIBNAME)
 
-.PHONY: default
+.PHONY: default clean
diff --git a/Libs/libgamebuino/Makefile b/Libs/libgamebuino/Makefile
index e1facfb..b7aa854 100644
--- a/Libs/libgamebuino/Makefile
+++ b/Libs/libgamebuino/Makefile
@@ -12,12 +12,14 @@ CFLAGS=-mmcu=$(MCU) $(CPU_SPEED) -Wall -Os -c -ffunction-sections -fdata-section
 OBJECTS= Backlight.o Battery.o Buttons.o Display.o font3x3.o \
 		font3x5.o font5x7.o Gamebuino.o settings.o Sound.o
 
-default: $(OBJECTS)
-	avr-ar rcs $(LIBNAME).a $^
-	mkdir -p $(INCLUDE_FOLDER)/$(PROJECT)
+default: $(LIBNAME)
 	cp *.h $(INCLUDE_FOLDER)/$(PROJECT)
-	cp settings.c $(INCLUDE_FOLDER)/$(PROJECT)
-	mv $(LIBNAME).a $(LIBS_FOLDER)
+	
+$(LIBNAME): $(OBJECTS)
+	avr-ar rcs $@ $^
+	mkdir -p $(INCLUDE_FOLDER)/$(PROJECT)
+	mv $@ $(LIBS_FOLDER)
+	avr-size $(LIBS_FOLDER)/$@
 
 %.o: %.cpp
 	$(CXX) $< -o $@ $(INCLUDE) $(DEFINE) $(CC_FLAGS)
@@ -25,7 +27,8 @@ default: $(OBJECTS)
 %.o: %.c
 	$(CC) $< -o $@ $(INCLUDE) $(DEFINE) $(CC_FLAGS)
 
-
 clean:
-	rm -f *.o
-	rm -f $(LIBS_FOLDER)/$(LIBNAME).a
+	rm -f $(OBJECTS)
+	rm -f $(LIBS_FOLDER)/$(LIBNAME)
+	
+.PHONY: default clean
diff --git a/Libs/petit_fatfs/Makefile b/Libs/petit_fatfs/Makefile
index 83ddb2d..07aaadc 100644
--- a/Libs/petit_fatfs/Makefile
+++ b/Libs/petit_fatfs/Makefile
@@ -11,12 +11,14 @@ LIBNAME=lib$(PROJECT).a
 
 OBJECTS=mmc.o petit_fatfs.o pff.o
 
-default: $(OBJECTS)
-	avr-ar rcs $(LIBNAME) $^
+default: $(LIBNAME) 
+	cp *.h $(INCLUDE_FOLDER)/$(PROJECT)
+	
+$(LIBNAME): $(OBJECTS)
+	avr-ar rcs $@ $^
 	mkdir -p $(INCLUDE_FOLDER)/$(PROJECT)
-	cp *.h $(INCLUDE_FOLDER)//$(PROJECT)
-	mv $(LIBNAME) $(LIBS_FOLDER)
-	avr-size $(LIBS_FOLDER)/$(LIBNAME)
+	mv $@ $(LIBS_FOLDER)
+	avr-size $(LIBS_FOLDER)/$@
 
 %.o: %.cpp
 	$(CXX) $< -o $@ $(DEFINE) $(INCLUDE) $(CC_FLAGS)
@@ -27,3 +29,5 @@ default: $(OBJECTS)
 clean:
 	rm -f $(OBJECTS)
 	rm -f $(LIBS_FOLDER)/$(LIBNAME)
+	
+.PHONY: default clean
diff --git a/Libs/tinyFAT/Makefile b/Libs/tinyFAT/Makefile
index 2640178..df0650b 100644
--- a/Libs/tinyFAT/Makefile
+++ b/Libs/tinyFAT/Makefile
@@ -10,12 +10,14 @@ LIBNAME=lib$(PROJECT).a
 
 OBJECTS=mmc.o tinyFAT.o
 
-default: $(OBJECTS)
-	avr-ar rcs $(LIBNAME) $^
-	mkdir -p $(INCLUDE_FOLDER)/$(PROJECT)
+default: $(LIBNAME)
 	cp *.h $(INCLUDE_FOLDER)/$(PROJECT)
-	mv $(LIBNAME) $(LIBS_FOLDER)
-	avr-size $(LIBS_FOLDER)/$(LIBNAME)
+	
+$(LIBNAME): $(OBJECTS)
+	avr-ar rcs $@ $^
+	mkdir -p $(INCLUDE_FOLDER)/$(PROJECT)
+	mv $@ $(LIBS_FOLDER)
+	avr-size $(LIBS_FOLDER)/$@
 
 %.o: %.cpp
 	$(CXX) $< -o $@ $(INCLUDE) $(DEFINE) $(CC_FLAGS)
@@ -26,3 +28,5 @@ default: $(OBJECTS)
 clean:
 	rm -f $(OBJECTS)
 	rm -f $(LIBS_FOLDER)/$(LIBNAME)
+
+.PHONY: default clean