* Add Linux Makfile (preliminary version)
* Fix a signed/unsigned bug
This commit is contained in:
jean.chalard
2008-11-03 10:30:57 +00:00
parent 440d6d7629
commit 4b762565ce
3 changed files with 23 additions and 5 deletions

View File

@@ -0,0 +1,18 @@
TARGET = template
OBJS = src/ActionElement.o src/ActionLayer.o src/ActionStack.o src/AIPlayer.o src/AIStats.o src/Blocker.o src/CardGui.o src/CardDescriptor.o src/CardDisplay.o src/ConstraintResolver.o src/Counters.o src/Damage.o src/DamagerDamaged.o src/DamageResolverLayer.o src/DeckDataWrapper.o src/DuelLayers.o src/GameApp.o src/GameLauncher.o src/GameObserver.o src/GameOptions.o src/GameStateDuel.o src/GameStateOptions.o src/GameStateShop.o src/GroupOfCards.o src/GuiCardsController.o src/GuiLayers.o src/Logger.o src/ManaCost.o src/ManaCostHybrid.o src/MenuItem.o src/MTGAbility.o src/MTGCardInstance.o src/MTGCard.o src/MTGDeck.o src/MTGGamePhase.o src/MTGGameZones.o src/MTGGuiHand.o src/MTGGuiPlay.o src/MTGRules.o src/OptionItem.o src/Player.o src/PlayerData.o src/PlayGuiObjectController.o src/PlayGuiObject.o src/PriceList.o src/ShopItem.o src/SimpleMenu.o src/SimpleMenuItem.o src/Subtypes.o src/TargetChooser.o src/TargetsList.o src/TexturesCache.o src/utils.o
INCDIR = -I ../../JGE/include -I ../../JGE/src
LIBDIR = -L ../../JGE/lib/linux -L ../../JGE
CFLAGS = $(INCDIR) -O2 -Wall -W -Werror -Wno-unused -DDEVHOOK -DLINUX
CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti -ggdb3
ASFLAGS = $(CXXFLAGS)
LIBS = -ljge -lfreetype -ljpeg -lgif -lpng -lz -lm -lstdc++ -lglut -lhgetools -lfmod-3.75
# -lmikmod -lpsppower -lpspmpeg -lpspaudiocodec -lpspaudiolib -lpspaudio -lpspgum -lpspgu -lpsprtc -lpspfpu
LDFLAGS = $(LIBDIR) $(LIBS)
all: $(OBJS)
$(CXX) -o bin/mtg $(OBJS) $(LDFLAGS)

View File

@@ -35,8 +35,8 @@ public:
void load(char * filename); void load(char * filename);
void save(); void save();
AIStat * find(MTGCard * card); AIStat * find(MTGCard * card);
bool isInTop(MTGCardInstance * card,int max, bool tooSmallCountsForTrue = true ); bool isInTop(MTGCardInstance * card, unsigned int max, bool tooSmallCountsForTrue = true );
void updateStatsCard(MTGCardInstance * cardInstance, Damage * damage, float multiplier = 1.0); void updateStatsCard(MTGCardInstance * cardInstance, Damage * damage, float multiplier = 1.0);
}; };
#endif #endif

View File

@@ -64,9 +64,9 @@ void AIStats::updateStats(){
save(); save();
} }
bool AIStats::isInTop(MTGCardInstance * card,int max, bool tooSmallCountsForTrue ){ bool AIStats::isInTop(MTGCardInstance * card, unsigned int max, bool tooSmallCountsForTrue ){
if (stats.size()<max) return tooSmallCountsForTrue; if (stats.size()<max) return tooSmallCountsForTrue;
int n = 0; unsigned int n = 0;
MTGCard * source = card->model; MTGCard * source = card->model;
int id = source->getMTGId(); int id = source->getMTGId();
list<AIStat *>::iterator it; list<AIStat *>::iterator it;
@@ -126,4 +126,4 @@ void AIStats::save(){
file.close(); file.close();
} }
} }