summaryrefslogtreecommitdiff
path: root/Libs
diff options
context:
space:
mode:
authorXaviDCR92 <xavi.dcr@gmail.com>2017-09-09 12:57:49 +0200
committerXaviDCR92 <xavi.dcr@gmail.com>2017-09-09 12:57:49 +0200
commitb764612a79100271270012053bdb1e4302cd93b7 (patch)
tree19f14b708bf2df97c42726ff95e71af573bbc4b3 /Libs
parent2232c21f364926254ea71c74ae0b2ab05bda00f5 (diff)
downloadpocketempires-b764612a79100271270012053bdb1e4302cd93b7.tar.gz
Renamed *Spr.c files to *Spr.inc. Adjusted dependencies for subMakes.
Diffstat (limited to 'Libs')
-rw-r--r--Libs/libarduino/Makefile6
-rw-r--r--Libs/libgamebuino/Makefile6
-rw-r--r--Libs/petit_fatfs/Makefile6
-rw-r--r--Libs/tinyFAT/Makefile6
4 files changed, 12 insertions, 12 deletions
diff --git a/Libs/libarduino/Makefile b/Libs/libarduino/Makefile
index eb324b6..a3f5e1d 100644
--- a/Libs/libarduino/Makefile
+++ b/Libs/libarduino/Makefile
@@ -11,12 +11,12 @@ OBJECTS= wiring.o wiring_analog.o wiring_digital.o \
Tone.o WMath.o WString.o WInterrupts.o forward.o SPI.o
default: $(LIBNAME)
- cp *.h $(INCLUDE_FOLDER)/$(PROJECT)
-
+
$(LIBNAME): $(OBJECTS)
avr-ar rcs $@ $^
mkdir -p $(INCLUDE_FOLDER)/$(PROJECT)
- mv $@ $(LIBS_FOLDER)
+ cp $@ $(LIBS_FOLDER)
+ cp *.h $(INCLUDE_FOLDER)/$(PROJECT)
avr-size $(LIBS_FOLDER)/$@
%.o: %.cpp
diff --git a/Libs/libgamebuino/Makefile b/Libs/libgamebuino/Makefile
index 75c49b8..28b1e4a 100644
--- a/Libs/libgamebuino/Makefile
+++ b/Libs/libgamebuino/Makefile
@@ -1,7 +1,7 @@
include ../../Makefile.cfg
PROJECT=gamebuino
-LIBNAME=lib$(PROJECT)
+LIBNAME=lib$(PROJECT).a
INCLUDE_FOLDERS=petit_fatfs tinyFAT arduino
INCLUDE_FOLDER=../../../include
LIBS_FOLDER = ../../../lib
@@ -17,13 +17,13 @@ default: $(LIBNAME)
$(LIBNAME): $(OBJECTS)
avr-ar rcs $@ $^
mkdir -p $(INCLUDE_FOLDER)/$(PROJECT)
- mv $@ $(LIBS_FOLDER)
+ cp $@ $(LIBS_FOLDER)
avr-size $(LIBS_FOLDER)/$@
cp *.h $(INCLUDE_FOLDER)/$(PROJECT)
%.o: %.cpp
$(CXX) $< -o $@ $(INCLUDE) $(DEFINE) $(CC_FLAGS)
-
+
%.o: %.c
$(CC) $< -o $@ $(INCLUDE) $(DEFINE) $(CC_FLAGS)
diff --git a/Libs/petit_fatfs/Makefile b/Libs/petit_fatfs/Makefile
index 07aaadc..0d95ef8 100644
--- a/Libs/petit_fatfs/Makefile
+++ b/Libs/petit_fatfs/Makefile
@@ -11,13 +11,13 @@ LIBNAME=lib$(PROJECT).a
OBJECTS=mmc.o petit_fatfs.o pff.o
-default: $(LIBNAME)
- cp *.h $(INCLUDE_FOLDER)/$(PROJECT)
+default: $(LIBNAME)
$(LIBNAME): $(OBJECTS)
avr-ar rcs $@ $^
mkdir -p $(INCLUDE_FOLDER)/$(PROJECT)
- mv $@ $(LIBS_FOLDER)
+ cp $@ $(LIBS_FOLDER)
+ cp *.h $(INCLUDE_FOLDER)/$(PROJECT)
avr-size $(LIBS_FOLDER)/$@
%.o: %.cpp
diff --git a/Libs/tinyFAT/Makefile b/Libs/tinyFAT/Makefile
index df0650b..b99505f 100644
--- a/Libs/tinyFAT/Makefile
+++ b/Libs/tinyFAT/Makefile
@@ -11,12 +11,12 @@ LIBNAME=lib$(PROJECT).a
OBJECTS=mmc.o tinyFAT.o
default: $(LIBNAME)
- cp *.h $(INCLUDE_FOLDER)/$(PROJECT)
-
+
$(LIBNAME): $(OBJECTS)
avr-ar rcs $@ $^
mkdir -p $(INCLUDE_FOLDER)/$(PROJECT)
- mv $@ $(LIBS_FOLDER)
+ cp $@ $(LIBS_FOLDER)
+ cp *.h $(INCLUDE_FOLDER)/$(PROJECT)
avr-size $(LIBS_FOLDER)/$@
%.o: %.cpp