xavi
/
PocketEmpires
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Renamed *Spr.c files to *Spr.inc. Adjusted dependencies for subMakes.

This commit is contained in:
XaviDCR92 2017-09-09 12:57:49 +02:00
parent 2232c21f36
commit b764612a79
7 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BarracksSpr.c → BarracksSpr.inc
View File

@ -27,7 +27,7 @@ const uint8_t BarracksSpr_Data[] PROGMEM =
0x81,0x24,0x81, 0x81,0x24,0x81,
0xFF,0xFF,0xFF, 0xFF,0xFF,0xFF,
}; };
//
const uint8_t BarracksShadowSpr_Data[] PROGMEM = const uint8_t BarracksShadowSpr_Data[] PROGMEM =
{ {
24 /* Width */, 24 /* Height */, 24 /* Width */, 24 /* Height */,

6
Libs/libarduino/Makefile
View File

@ -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 Tone.o WMath.o WString.o WInterrupts.o forward.o SPI.o
default: $(LIBNAME) default: $(LIBNAME)
cp *.h $(INCLUDE_FOLDER)/$(PROJECT)
$(LIBNAME): $(OBJECTS) $(LIBNAME): $(OBJECTS)
avr-ar rcs $@ $^ avr-ar rcs $@ $^
mkdir -p $(INCLUDE_FOLDER)/$(PROJECT) mkdir -p $(INCLUDE_FOLDER)/$(PROJECT)
mv $@ $(LIBS_FOLDER) cp $@ $(LIBS_FOLDER)
cp *.h $(INCLUDE_FOLDER)/$(PROJECT)
avr-size $(LIBS_FOLDER)/$@ avr-size $(LIBS_FOLDER)/$@
%.o: %.cpp %.o: %.cpp

6
Libs/libgamebuino/Makefile
View File

@ -1,7 +1,7 @@
include ../../Makefile.cfg include ../../Makefile.cfg
PROJECT=gamebuino PROJECT=gamebuino
LIBNAME=lib$(PROJECT) LIBNAME=lib$(PROJECT).a
INCLUDE_FOLDERS=petit_fatfs tinyFAT arduino INCLUDE_FOLDERS=petit_fatfs tinyFAT arduino
INCLUDE_FOLDER=../../../include INCLUDE_FOLDER=../../../include
LIBS_FOLDER = ../../../lib LIBS_FOLDER = ../../../lib
@ -17,13 +17,13 @@ default: $(LIBNAME)
$(LIBNAME): $(OBJECTS) $(LIBNAME): $(OBJECTS)
avr-ar rcs $@ $^ avr-ar rcs $@ $^
mkdir -p $(INCLUDE_FOLDER)/$(PROJECT) mkdir -p $(INCLUDE_FOLDER)/$(PROJECT)
mv $@ $(LIBS_FOLDER) cp $@ $(LIBS_FOLDER)
avr-size $(LIBS_FOLDER)/$@ avr-size $(LIBS_FOLDER)/$@
cp *.h $(INCLUDE_FOLDER)/$(PROJECT) cp *.h $(INCLUDE_FOLDER)/$(PROJECT)
%.o: %.cpp %.o: %.cpp
$(CXX) $< -o $@ $(INCLUDE) $(DEFINE) $(CC_FLAGS) $(CXX) $< -o $@ $(INCLUDE) $(DEFINE) $(CC_FLAGS)
%.o: %.c %.o: %.c
$(CC) $< -o $@ $(INCLUDE) $(DEFINE) $(CC_FLAGS) $(CC) $< -o $@ $(INCLUDE) $(DEFINE) $(CC_FLAGS)

6
Libs/petit_fatfs/Makefile
View File

@ -11,13 +11,13 @@ LIBNAME=lib$(PROJECT).a
OBJECTS=mmc.o petit_fatfs.o pff.o OBJECTS=mmc.o petit_fatfs.o pff.o
default: $(LIBNAME) default: $(LIBNAME)
cp *.h $(INCLUDE_FOLDER)/$(PROJECT)
$(LIBNAME): $(OBJECTS) $(LIBNAME): $(OBJECTS)
avr-ar rcs $@ $^ avr-ar rcs $@ $^
mkdir -p $(INCLUDE_FOLDER)/$(PROJECT) mkdir -p $(INCLUDE_FOLDER)/$(PROJECT)
mv $@ $(LIBS_FOLDER) cp $@ $(LIBS_FOLDER)
cp *.h $(INCLUDE_FOLDER)/$(PROJECT)
avr-size $(LIBS_FOLDER)/$@ avr-size $(LIBS_FOLDER)/$@
%.o: %.cpp %.o: %.cpp

6
Libs/tinyFAT/Makefile
View File

@ -11,12 +11,12 @@ LIBNAME=lib$(PROJECT).a
OBJECTS=mmc.o tinyFAT.o OBJECTS=mmc.o tinyFAT.o
default: $(LIBNAME) default: $(LIBNAME)
cp *.h $(INCLUDE_FOLDER)/$(PROJECT)
$(LIBNAME): $(OBJECTS) $(LIBNAME): $(OBJECTS)
avr-ar rcs $@ $^ avr-ar rcs $@ $^
mkdir -p $(INCLUDE_FOLDER)/$(PROJECT) mkdir -p $(INCLUDE_FOLDER)/$(PROJECT)
mv $@ $(LIBS_FOLDER) cp $@ $(LIBS_FOLDER)
cp *.h $(INCLUDE_FOLDER)/$(PROJECT)
avr-size $(LIBS_FOLDER)/$@ avr-size $(LIBS_FOLDER)/$@
%.o: %.cpp %.o: %.cpp

0
PeasantSpr.c → PeasantSpr.inc
View File

6
Unit.c
View File

@ -3,8 +3,8 @@
* **************************************/ * **************************************/
#include "Unit.h" #include "Unit.h"
#include "PeasantSpr.c" #include "PeasantSpr.inc"
#include "BarracksSpr.c" #include "BarracksSpr.inc"
/* ************************************** /* **************************************
* Defines * * Defines *
@ -242,7 +242,7 @@ void UnitHandler(TYPE_UNIT* unitArray, size_t sz)
{ {
continue; continue;
} }
bool bMoving = false; bool bMoving = false;