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

View File

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

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
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

View File

@ -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)

View File

@ -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

View File

@ -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

6
Unit.c
View File

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