summaryrefslogtreecommitdiff
path: root/Libs
diff options
context:
space:
mode:
authorXaviDCR92 <xavi.dcr@gmail.com>2017-11-05 04:16:32 +0100
committerXaviDCR92 <xavi.dcr@gmail.com>2017-11-05 04:16:32 +0100
commit2cf2d608af862e812e7fd3ac580f869141a96fa7 (patch)
tree29a356a46635e4bc14e9e7342eb5a41defcab899 /Libs
parentb764612a79100271270012053bdb1e4302cd93b7 (diff)
downloadpocketempires-2cf2d608af862e812e7fd3ac580f869141a96fa7.tar.gz
+ Added copy of BitmapEncoder
+ New sprite and unit "Town center" * Provisional collision checking. * Many other modifications.
Diffstat (limited to 'Libs')
-rw-r--r--Libs/libarduino/Makefile2
-rw-r--r--Libs/libgamebuino/Makefile2
-rw-r--r--Libs/petit_fatfs/Makefile6
-rw-r--r--Libs/tinyFAT/Makefile2
4 files changed, 6 insertions, 6 deletions
diff --git a/Libs/libarduino/Makefile b/Libs/libarduino/Makefile
index a3f5e1d..4f05c46 100644
--- a/Libs/libarduino/Makefile
+++ b/Libs/libarduino/Makefile
@@ -21,7 +21,7 @@ $(LIBNAME): $(OBJECTS)
%.o: %.cpp
$(CXX) $< -o $@ $(INCLUDE) $(DEFINE) $(CC_FLAGS)
-
+
%.o: %.c
$(CC) $< -o $@ $(INCLUDE) $(DEFINE) $(CC_FLAGS)
diff --git a/Libs/libgamebuino/Makefile b/Libs/libgamebuino/Makefile
index 28b1e4a..ae98d12 100644
--- a/Libs/libgamebuino/Makefile
+++ b/Libs/libgamebuino/Makefile
@@ -30,5 +30,5 @@ $(LIBNAME): $(OBJECTS)
clean:
rm -f $(OBJECTS)
rm -f $(LIBS_FOLDER)/$(LIBNAME)
-
+
.PHONY: default clean
diff --git a/Libs/petit_fatfs/Makefile b/Libs/petit_fatfs/Makefile
index 0d95ef8..6e96f51 100644
--- a/Libs/petit_fatfs/Makefile
+++ b/Libs/petit_fatfs/Makefile
@@ -12,7 +12,7 @@ LIBNAME=lib$(PROJECT).a
OBJECTS=mmc.o petit_fatfs.o pff.o
default: $(LIBNAME)
-
+
$(LIBNAME): $(OBJECTS)
avr-ar rcs $@ $^
mkdir -p $(INCLUDE_FOLDER)/$(PROJECT)
@@ -22,12 +22,12 @@ $(LIBNAME): $(OBJECTS)
%.o: %.cpp
$(CXX) $< -o $@ $(DEFINE) $(INCLUDE) $(CC_FLAGS)
-
+
%.o: %.c
$(CC) $< -o $@ $(DEFINE) $(INCLUDE) $(CC_FLAGS)
clean:
rm -f $(OBJECTS)
rm -f $(LIBS_FOLDER)/$(LIBNAME)
-
+
.PHONY: default clean
diff --git a/Libs/tinyFAT/Makefile b/Libs/tinyFAT/Makefile
index b99505f..734ff67 100644
--- a/Libs/tinyFAT/Makefile
+++ b/Libs/tinyFAT/Makefile
@@ -21,7 +21,7 @@ $(LIBNAME): $(OBJECTS)
%.o: %.cpp
$(CXX) $< -o $@ $(INCLUDE) $(DEFINE) $(CC_FLAGS)
-
+
%.o: %.c
$(CC) $< -o $@ $(INCLUDE) $(DEFINE) $(CC_FLAGS)