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

+ Added Makefiles for dependencies

This commit is contained in:
XaviDCR92 2017-08-26 17:54:03 +02:00
parent 845c7cba1d
commit 4ca8c2d15b
7 changed files with 139 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Building.c
View File

@ -40,7 +40,7 @@ void BuildingInit(void)
}
uint8_t BuildingGetHpFromID(uint8_t id)
uint8_t BuildingGetHpFromID(TYPE_BUILDING_ID id)
{
return BuildingHPTable[id];
}
@ -100,12 +100,12 @@ void BuildingDraw(TYPE_CAMERA * ptrCamera, TYPE_BUILDING * ptrBuilding, bool bSe
}
uint8_t BuildingGetWidthFromID(uint8_t id)
uint8_t BuildingGetWidthFromID(TYPE_BUILDING_ID id)
{
return GfxGetWidthFromSpriteData(BuildingSprTable[id]->Data);
}
uint8_t BuildingGetHeightFromID(uint8_t id)
uint8_t BuildingGetHeightFromID(TYPE_BUILDING_ID id)
{
return GfxGetHeightFromSpriteData(BuildingSprTable[id]->Data);
}

29
Libs/libarduino/Makefile Normal file
View File

@ -0,0 +1,29 @@
include ../../Makefile.cfg
PROJECT=arduino
LIBNAME=lib$(PROJECT).a
INCDIR=../../../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)
%.o: %.cpp
$(CXX) $< -o $@ $(DEFINE) $(INCLUDE) $(CC_FLAGS)
%.o: %.c
$(CC) $< -o $@ $(DEFINE) $(INCLUDE) $(CC_FLAGS)
clean:
rm -f *.o
.PHONY: default

31
Libs/libgamebuino/Makefile Normal file
View File

@ -0,0 +1,31 @@
include ../../Makefile.cfg
PROJECT=gamebuino
LIBNAME=lib$(PROJECT)
INCLUDE_FOLDERS=petit_fatfs tinyFAT arduino
INCLUDE_FOLDER=../../../include
LIBS_FOLDER = ../../../lib
LIBS=-L $(LIBS_FOLDER) $(foreach lib,$(INCLUDE_FOLDERS), -l$(lib))
INCLUDE= $(foreach dir,$(INCLUDE_FOLDERS),-I$/$(INCLUDE_FOLDER)/$(dir))
CFLAGS=-mmcu=$(MCU) $(CPU_SPEED) -Wall -Os -c -ffunction-sections -fdata-sections $(INCLUDE) $(LIBS)
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)
cp *.h $(INCLUDE_FOLDER)/$(PROJECT)
cp settings.c $(INCLUDE_FOLDER)/$(PROJECT)
mv $(LIBNAME).a $(LIBS_FOLDER)
%.o: %.cpp
$(CXX) $< -o $@ $(INCLUDE) $(DEFINE) $(CC_FLAGS)
%.o: %.c
$(CC) $< -o $@ $(INCLUDE) $(DEFINE) $(CC_FLAGS)
clean:
rm -f *.o
rm -f $(LIBS_FOLDER)/$(LIBNAME).a

29
Libs/petit_fatfs/Makefile Normal file
View File

@ -0,0 +1,29 @@
include ../../Makefile.cfg
INCLUDE_FOLDERS=arduino
INCLUDE_FOLDER=../../../include
LIBS_FOLDER = ../../../lib
LIBS=-L $(LIBS_FOLDER) $(foreach lib,$(INCLUDE_FOLDERS), -l$(lib))
INCLUDE= $(foreach dir,$(INCLUDE_FOLDERS),-I$/$(INCLUDE_FOLDER)/$(dir))
PROJECT=petit_fatfs
LIBNAME=lib$(PROJECT).a
OBJECTS=mmc.o petit_fatfs.o pff.o
default: $(OBJECTS)
avr-ar rcs $(LIBNAME) $^
mkdir -p $(INCLUDE_FOLDER)/$(PROJECT)
cp *.h $(INCLUDE_FOLDER)//$(PROJECT)
mv $(LIBNAME) $(LIBS_FOLDER)
avr-size $(LIBS_FOLDER)/$(LIBNAME)
%.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)

28
Libs/tinyFAT/Makefile Normal file
View File

@ -0,0 +1,28 @@
include ../../Makefile.cfg
PROJECT=tinyFAT
INCLUDE_FOLDERS=tinyFAT arduino
INCLUDE_FOLDER=../../../include
LIBS_FOLDER = ../../../lib
LIBS=-L $(LIBS_FOLDER) $(foreach lib,$(INCLUDE_FOLDERS), -l$(lib))
INCLUDE= $(foreach dir,$(INCLUDE_FOLDERS),-I$/$(INCLUDE_FOLDER)/$(dir))
LIBNAME=lib$(PROJECT).a
OBJECTS=mmc.o tinyFAT.o
default: $(OBJECTS)
avr-ar rcs $(LIBNAME) $^
mkdir -p $(INCLUDE_FOLDER)/$(PROJECT)
cp *.h $(INCLUDE_FOLDER)/$(PROJECT)
mv $(LIBNAME) $(LIBS_FOLDER)
avr-size $(LIBS_FOLDER)/$(LIBNAME)
%.o: %.cpp
$(CXX) $< -o $@ $(INCLUDE) $(DEFINE) $(CC_FLAGS)
%.o: %.c
$(CC) $< -o $@ $(INCLUDE) $(DEFINE) $(CC_FLAGS)
clean:
rm -f $(OBJECTS)
rm -f $(LIBS_FOLDER)/$(LIBNAME)

2
Player.cpp
View File

@ -199,7 +199,7 @@ bool Player::checkNewBuildingPosition(TYPE_COLLISION_BLOCK * cb)
return true;
}
bool Player::createBuilding(uint8_t id, TYPE_COLLISION_BLOCK cb)
bool Player::createBuilding(TYPE_BUILDING_ID id, TYPE_COLLISION_BLOCK cb)
{
if(checkNewBuildingPosition(&cb) == false)
{

26
Unit.c
View File

@ -9,6 +9,8 @@
* Defines *
* **************************************/
#define MAX_ACTION_LEVELS 2
/* **************************************
* Local prototypes *
* **************************************/
@ -28,16 +30,27 @@ typedef struct
void (*pAction)(TYPE_UNIT*);
}TYPE_UNIT_ACTION;
typedef enum t_availableactions
{
ACTION_BUILD = 0,
ACTION_ATTACK,
MAX_ACTIONS
}UNIT_AVAILABLE_ACTIONS;
/* Sprites */
static TYPE_SPRITE PeasantSpr;
static TYPE_SPRITE PeasantWalkingSpr;
/* Tables */
static uint8_t const UnitHPTable[] = { 25 };
static uint8_t const UnitSpeedTable[] = { 1 };
static uint8_t const UnitHPTable[] = { [PEASANT] = 25 };
static uint8_t const UnitSpeedTable[] = { [PEASANT] = 1 };
static TYPE_UNIT_ACTION const UnitActionsTable_Level0[] = { {"Build", NULL} };
static TYPE_UNIT_ACTION const UnitActionsTable_Level1[] = { {"Barracks", &UnitBuildAccept} };
static TYPE_UNIT_ACTION const UnitActionsTable_Level0[MAX_ACTIONS] = { [ACTION_BUILD] = {"Build", NULL},
[ACTION_ATTACK] = {"Attack", NULL} };
static TYPE_UNIT_ACTION const UnitActionsTable_Level1[MAX_ACTIONS] = { {"Barracks", &UnitBuildAccept} };
static TYPE_UNIT_ACTION* const UnitActionsTable_LevelX[MAX_ACTION_LEVELS] = { &UnitActionsTable_Level0 ,
&UnitActionsTable_Level1 };
static TYPE_SPRITE * const UnitSprTable[] = {&PeasantSpr};
static TYPE_SPRITE * const UnitWalkingSprTable[] = {&PeasantWalkingSpr};
@ -210,10 +223,7 @@ void UnitHandler(TYPE_UNIT * ptrUnit)
ptrUnit->mirror = true;
}
if(bMoving == false)
{
ptrUnit->walking = false;
}
ptrUnit->walking = bMoving;
}
}