diff --git a/projects/mtg/Makefile.linux b/projects/mtg/Makefile.linux new file mode 100644 index 000000000..d1da47fd7 --- /dev/null +++ b/projects/mtg/Makefile.linux @@ -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) diff --git a/projects/mtg/include/AIStats.h b/projects/mtg/include/AIStats.h index 1abee1654..0b2283f0f 100644 --- a/projects/mtg/include/AIStats.h +++ b/projects/mtg/include/AIStats.h @@ -35,8 +35,8 @@ public: void load(char * filename); void save(); 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); }; -#endif \ No newline at end of file +#endif diff --git a/projects/mtg/src/AIStats.cpp b/projects/mtg/src/AIStats.cpp index d6ee62e6e..69c22c259 100644 --- a/projects/mtg/src/AIStats.cpp +++ b/projects/mtg/src/AIStats.cpp @@ -64,9 +64,9 @@ void AIStats::updateStats(){ save(); } -bool AIStats::isInTop(MTGCardInstance * card,int max, bool tooSmallCountsForTrue ){ +bool AIStats::isInTop(MTGCardInstance * card, unsigned int max, bool tooSmallCountsForTrue ){ if (stats.size()model; int id = source->getMTGId(); list::iterator it; @@ -126,4 +126,4 @@ void AIStats::save(){ file.close(); } -} \ No newline at end of file +}