Enabled precompiled headers for the build. This cuts the win compile time in debug by at least half on my laptop; on the psp compile, it shaves it down by ~ 45 seconds. I only did a cursory inspection of what to add to PrecompiledHeader.h, there's probably more that we can throw in there for more incremental speed improvements.

Also fixed the project includes so that we don't need to always use the indirect include path, ie:
#include "../include/foo.h" -> #include "foo.h"

I'm don't know much about make files - if I busted the linux build, mea culpa, but I think we're okay on that front too.  For future reference, here's the most straightforward link on the topic of adding pch support to make files:

http://www.mercs-eng.com/~hulud/index.php?2008/06/13/6-writing-a-good-makefile-for-a-c-project

projects/mtg/Makefile

@@ -1,4 +1,4 @@
-OBJS = objs/ActionElement.o objs/ActionLayer.o objs/ActionStack.o objs/AIMomirPlayer.o objs/AIPlayer.o objs/AIStats.o objs/CardGui.o objs/CardDescriptor.o objs/CardDisplay.o objs/CardEffect.o objs/CardPrimitive.o objs/CardSelector.o objs/Counters.o objs/Credits.o objs/Damage.o objs/DamagerDamaged.o objs/DeckDataWrapper.o objs/DeckMetaData.o objs/DeckStats.o objs/DuelLayers.o objs/Effects.o objs/ExtraCost.o objs/GameApp.o objs/GameLauncher.o objs/GameObserver.o objs/GameOptions.o objs/GameState.o objs/GameStateAwards.o objs/GameStateDeckViewer.o objs/GameStateDuel.o  objs/DeckManager.o objs/GameStateMenu.o objs/GameStateOptions.o objs/GameStateShop.o objs/GameStateStory.o objs/GameStateTransitions.o objs/GuiAvatars.o objs/GuiBackground.o objs/GuiCardsController.o objs/GuiCombat.o objs/GuiFrame.o objs/GuiHand.o objs/GuiLayers.o objs/GuiMana.o objs/GuiPhaseBar.o objs/GuiPlay.o objs/GuiStatic.o objs/Logger.o objs/ManaCost.o objs/ManaCostHybrid.o  objs/MenuItem.o objs/MTGAbility.o objs/MTGCardInstance.o objs/MTGCard.o objs/MTGDeck.o objs/MTGDefinitions.o objs/MTGGamePhase.o objs/MTGGameZones.o objs/MTGPack.o objs/MTGRules.o objs/OptionItem.o objs/PhaseRing.o objs/Player.o objs/PlayerData.o  objs/PlayGuiObjectController.o objs/PlayGuiObject.o objs/Pos.o objs/PriceList.o objs/ReplacementEffects.o objs/Rules.o objs/SimpleMenu.o objs/SimpleMenuItem.o objs/SimplePad.o objs/StoryFlow.o objs/StyleManager.o objs/Subtypes.o objs/TargetChooser.o objs/TargetsList.o objs/TextScroller.o objs/ThisDescriptor.o objs/Token.o objs/Translate.o objs/TranslateKeys.o objs/Trash.o objs/utils.o objs/WEvent.o objs/WResourceManager.o objs/WCachedResource.o objs/WDataSrc.o objs/WGui.o objs/WFilter.o objs/Tasks.o objs/WFont.o
+OBJS = objs/ActionElement.o objs/ActionLayer.o objs/ActionStack.o objs/AIMomirPlayer.o objs/AIPlayer.o objs/AIStats.o objs/CardGui.o objs/CardDescriptor.o objs/CardDisplay.o objs/CardEffect.o objs/CardPrimitive.o objs/CardSelector.o objs/Counters.o objs/Credits.o objs/Damage.o objs/DamagerDamaged.o objs/DeckDataWrapper.o objs/DeckMetaData.o objs/DeckStats.o objs/DuelLayers.o objs/Effects.o objs/ExtraCost.o objs/GameApp.o objs/GameLauncher.o objs/GameObserver.o objs/GameOptions.o objs/GameState.o objs/GameStateAwards.o objs/GameStateDeckViewer.o objs/GameStateDuel.o  objs/DeckManager.o objs/GameStateMenu.o objs/GameStateOptions.o objs/GameStateShop.o objs/GameStateStory.o objs/GameStateTransitions.o objs/GuiAvatars.o objs/GuiBackground.o objs/GuiCardsController.o objs/GuiCombat.o objs/GuiFrame.o objs/GuiHand.o objs/GuiLayers.o objs/GuiMana.o objs/GuiPhaseBar.o objs/GuiPlay.o objs/GuiStatic.o objs/Logger.o objs/ManaCost.o objs/ManaCostHybrid.o  objs/MenuItem.o objs/MTGAbility.o objs/MTGCardInstance.o objs/MTGCard.o objs/MTGDeck.o objs/MTGDefinitions.o objs/MTGGamePhase.o objs/MTGGameZones.o objs/MTGPack.o objs/MTGRules.o objs/OptionItem.o objs/PhaseRing.o objs/Player.o objs/PlayerData.o  objs/PlayGuiObjectController.o objs/PlayGuiObject.o objs/Pos.o objs/PrecompiledHeader.o objs/PriceList.o objs/ReplacementEffects.o objs/Rules.o objs/SimpleMenu.o objs/SimpleMenuItem.o objs/SimplePad.o objs/StoryFlow.o objs/StyleManager.o objs/Subtypes.o objs/TargetChooser.o objs/TargetsList.o objs/TextScroller.o objs/ThisDescriptor.o objs/Token.o objs/Translate.o objs/TranslateKeys.o objs/Trash.o objs/utils.o objs/WEvent.o objs/WResourceManager.o objs/WCachedResource.o objs/WDataSrc.o objs/WGui.o objs/WFilter.o objs/Tasks.o objs/WFont.o
 DEPS = $(patsubst objs/%.o, deps/%.d, $(OBJS))
 
 RESULT = $(shell psp-config --psp-prefix 2> Makefile.cache)
@@ -34,18 +34,17 @@ PSP_EBOOT_ICON = icon.png
 #PSP_EBOOT_ICON1 = icon1.pmf
 PSP_EBOOT_UNKPNG = pic0.png
 PSP_EBOOT_PIC1 = pic1.png
-CFLAGS = -O2 -G0 -DPSPFW3XX -DDEVHOOK
+INCDIR = ../../JGE/include ../../JGE/include/psp ../../JGE/include/psp/freetype2 ../../JGE/src ../../projects/mtg/include
-INCDIR = ../../JGE/include ../../JGE/include/psp ../../JGE/include/psp/freetype2 ../../JGE/src
 LIBDIR = ../../JGE/lib/psp
+CFLAGS = -O2 -G0 -DPSPFW3XX -DDEVHOOK -DUSE_PRECOMPILED_HEADERS=1
 else
 OBJS += objs/TestSuiteAI.o
-INCDIR = -I../../JGE/include -I../../JGE/src -I/usr/X11/include
+INCDIR = -I../../JGE/include -I../../JGE/src -I/usr/X11/include ../../projects/mtg/include
 LIBDIR = -L../../JGE/lib/linux -L../../JGE -L/usr/X11/lib
 LIBS = -ljge -lfreetype -ljpeg -lgif -lpng -lz -lm -lstdc++ -lhgetools -lGL -lGLU -lX11 $(FMOD)
-CFLAGS = $(INCDIR) -DLINUX
+CFLAGS = -O2 -DLINUX -DUSE_PRECOMPILED_HEADERS=1
 ASFLAGS = $(CXXFLAGS)
 
-all: CFLAGS += -O2
 all: $(DEFAULT_RULE)
 
 endif
@@ -90,8 +89,11 @@ clean:
 
 endif
 
-$(OBJS): objs/%.o: src/%.cpp
+PrecompiledHeader.h.gch: ../../projects/mtg/include/PrecompiledHeader.h
-	$(CXX) -c -o $@ $(CXXFLAGS) $<
+	$(CXX) -c $(CXXFLAGS) $<
+
+$(OBJS): objs/%.o: src/%.cpp PrecompiledHeader.h.gch
+	$(CXX) -c $(CXXFLAGS) $< -o $@  
 
 $(DEPS): deps/%.d: src/%.cpp
 	@$(CXX) -MM $(CXXFLAGS) -MQ $(patsubst deps/%.d, objs/%.o, $(@)) -MQ $@ $< > $@

projects/mtg/include/ActionStack.h

@@ -22,10 +22,10 @@
 #define RESOLVED_OK 1
 #define RESOLVED_NOK -1
 
-#include "../include/PlayGuiObject.h"
+#include "PlayGuiObject.h"
 #include "GuiLayers.h"
-#include "../include/TargetsList.h"
+#include "TargetsList.h"
-#include "../include/Targetable.h"
+#include "Targetable.h"
 
 class GuiLayer;
 class PlayGuiObject;

projects/mtg/include/AllAbilities.h

@@ -1,7 +1,7 @@
 #ifndef _CARDS_H_
 #define _CARDS_H_
 
-#include "../include/DebugRoutines.h" 
+#include "DebugRoutines.h" 
 #include "MTGAbility.h"
 #include "ManaCost.h"
 #include "CardDescriptor.h"

projects/mtg/include/CardDisplay.h

@@ -1,7 +1,7 @@
 #ifndef _CARD_DISPLAY_H_
 #define _CARD_DISPLAY_H_
 
-#include "../include/PlayGuiObjectController.h"
+#include "PlayGuiObjectController.h"
 
 class TargetChooser;
 class MTGGameZone;

projects/mtg/include/Credits.h

@@ -5,9 +5,9 @@
 #include <vector>
 #include <string>
 #include <JGE.h>
-#include "../include/WFont.h"
+#include "WFont.h"
 #include <time.h>
-#include "../include/Player.h"
+#include "Player.h"
 
 class GameApp;
 

projects/mtg/include/DebugRoutines.h

@@ -4,7 +4,7 @@
 // dirty, but I get OS header includes this way
 #include "JGE.h"
 
-#include "../include/config.h"
+#include "config.h"
 
 #include <iostream>
 #include <stdio.h>

projects/mtg/include/DeckDataWrapper.h

@@ -1,10 +1,10 @@
 #ifndef _DECKDATAWRAPPER_H_
 #define _DECKDATAWRAPPER_H_
 
-#include "../include/MTGDefinitions.h"
+#include "MTGDefinitions.h"
-#include "../include/MTGCard.h"
+#include "MTGCard.h"
-#include "../include/CardPrimitive.h"
+#include "CardPrimitive.h"
-#include "../include/WDataSrc.h"
+#include "WDataSrc.h"
 #include <map>
 #include <string>
 using std::map;

projects/mtg/include/DeckMetaData.h

@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 #include <map>
-#include "../include/DeckStats.h"
+#include "DeckStats.h"
 
 
 using namespace std;

projects/mtg/include/GameApp.h

@@ -12,7 +12,7 @@
 #define _GAMEAPP_H_
 
 
-#include "../include/Logger.h"
+#include "Logger.h"
 
 
 #include <JApp.h>
@@ -20,16 +20,16 @@
 #include <JSprite.h>
 #include <JLBFont.h>
 #include <hge/hgeparticle.h>
-#include "../include/WResourceManager.h"
+#include "WResourceManager.h"
 
-#include "../include/GameState.h"
+#include "GameState.h"
-#include "../include/GameOptions.h"
+#include "GameOptions.h"
 
-#include "../include/MTGDeck.h"
+#include "MTGDeck.h"
-#include "../include/MTGCard.h"
+#include "MTGCard.h"
-#include "../include/MTGGameZones.h"
+#include "MTGGameZones.h"
 
-#include "../include/CardEffect.h"
+#include "CardEffect.h"
 
 #define PLAYER_TYPE_CPU 0
 #define PLAYER_TYPE_HUMAN 1

projects/mtg/include/GameOptions.h

@@ -7,8 +7,8 @@ using std::map;
 using std::string;
 #include <JGE.h>
 #include <time.h>
-#include "../include/SimplePad.h"
+#include "SimplePad.h"
-#include "../include/GameApp.h"
+#include "GameApp.h"
 
 #define GLOBAL_SETTINGS RESPATH"/settings/options.txt"
 #define PLAYER_SAVEFILE "data.dat"

projects/mtg/include/GameState.h

@@ -9,7 +9,7 @@ class JGE;
 #include <string>
 #include <vector>
 #include <iostream>
-#include "../include/DeckMetaData.h"
+#include "DeckMetaData.h"
 
 using namespace std;
 

projects/mtg/include/GameStateAwards.h

@@ -2,8 +2,8 @@
 #define _GAME_STATE_AWARDS_H_
 
 #include <JGE.h>
-#include "../include/GameState.h"
+#include "GameState.h"
-#include "../include/SimpleMenu.h"
+#include "SimpleMenu.h"
 
 class WGuiList;
 class WGuiMenu;

projects/mtg/include/GameStateDeckViewer.h

@@ -6,17 +6,17 @@
 
 #include <JGE.h>
 
-#include "../include/GameState.h"
+#include "GameState.h"
-#include "../include/SimpleMenu.h"
+#include "SimpleMenu.h"
-#include "../include/WResourceManager.h"
+#include "WResourceManager.h"
-#include "../include/CardGui.h"
+#include "CardGui.h"
-#include "../include/GameOptions.h"
+#include "GameOptions.h"
-#include "../include/PriceList.h"
+#include "PriceList.h"
-#include "../include/PlayerData.h"
+#include "PlayerData.h"
-#include "../include/DeckDataWrapper.h"
+#include "DeckDataWrapper.h"
-#include "../include/DeckStats.h"
+#include "DeckStats.h"
-#include "../include/WDataSrc.h"
+#include "WDataSrc.h"
-#include "../include/WGui.h"
+#include "WGui.h"
 
 #define NO_USER_ACTIVITY_HELP_DELAY 10
 #define NO_USER_ACTIVITY_SHOWCARD_DELAY 0.1

projects/mtg/include/GameStateDuel.h

@@ -2,10 +2,10 @@
 #define _GAME_STATE_DUEL_H_
 
 
-#include "../include/GameState.h"
+#include "GameState.h"
-#include "../include/SimpleMenu.h"
+#include "SimpleMenu.h"
-#include "../include/MTGDeck.h"
+#include "MTGDeck.h"
-#include "../include/GameObserver.h"
+#include "GameObserver.h"
 
 #define CHOOSE_OPPONENT 7
 

projects/mtg/include/GameStateMenu.h

@@ -3,9 +3,9 @@
 
 #include <JGui.h>
 #include <dirent.h>
-#include "../include/GameState.h"
+#include "GameState.h"
-#include "../include/SimpleMenu.h"
+#include "SimpleMenu.h"
-#include "../include/TextScroller.h"
+#include "TextScroller.h"
 
 class GameStateMenu: public GameState, public JGuiListener
 {

projects/mtg/include/GameStateOptions.h

@@ -3,7 +3,7 @@
 
 #include <JGE.h>
 #include <JGui.h>
-#include "../include/GameState.h"
+#include "GameState.h"
 
 class GameApp;
 class WGuiTabMenu;

projects/mtg/include/GameStateShop.h

@@ -2,14 +2,14 @@
 #define _GAME_STATE_SHOP_H_
 
 #include <JGE.h>
-#include "../include/GameState.h"
+#include "GameState.h"
-#include "../include/SimpleMenu.h"
+#include "SimpleMenu.h"
-#include "../include/OptionItem.h"
+#include "OptionItem.h"
-#include "../include/PriceList.h"
+#include "PriceList.h"
-#include "../include/PlayerData.h"
+#include "PlayerData.h"
-#include "../include/CardDisplay.h"
+#include "CardDisplay.h"
-#include "../include/DeckDataWrapper.h"
+#include "DeckDataWrapper.h"
-#include "../include/Tasks.h"
+#include "Tasks.h"
 
 
 #define STATE_BUY 1

projects/mtg/include/GameStateStory.h

@@ -2,7 +2,7 @@
 #define _GAME_STATE_STORY_H_
 
 
-#include "../include/GameState.h"
+#include "GameState.h"
 #include <JGui.h>
 
 class StoryFlow;

projects/mtg/include/GameStateTransitions.h

@@ -3,7 +3,7 @@
 
 #include <JGE.h>
 #include <JGui.h>
-#include "../include/GameState.h"
+#include "GameState.h"
 
 class TransitionBase: public GameState, public JGuiListener{
 public:

projects/mtg/include/GuiLayers.h

@@ -7,7 +7,7 @@
 #define DIR_RIGHT 4
 
 #include <JGui.h>
-#include "../include/WEvent.h"
+#include "WEvent.h"
 
 class GameObserver;
 class Player;

projects/mtg/include/GuiMana.h

@@ -1,7 +1,6 @@
 #include "string.h"
 #include <vector>
 #include <hge/hgeparticle.h>
-#include "config.h"
 #include "JGE.h"
 #include "MTGDefinitions.h"
 #include "GameApp.h"

projects/mtg/include/MTGAbility.h

@@ -14,13 +14,13 @@ class AManaProducer;
 class WEvent;
 class Counter;
 
-#include "../include/GameObserver.h"
+#include "GameObserver.h"
 #include "ActionElement.h"
 #include <string>
 #include <map>
 #include <hge/hgeparticle.h>
-#include "../include/Damage.h"
+#include "Damage.h"
-#include "../include/TargetChooser.h"
+#include "TargetChooser.h"
 using std::string;
 using std::map;
 

projects/mtg/include/MTGDeck.h

@@ -3,9 +3,9 @@
 
 #define MTG_ERROR -1
 
-#include "../include/MTGDefinitions.h"
+#include "MTGDefinitions.h"
-#include "../include/GameApp.h"
+#include "GameApp.h"
-#include "../include/WResourceManager.h"
+#include "WResourceManager.h"
 
 
 #include <string>

projects/mtg/include/MTGGamePhase.h

@@ -5,7 +5,7 @@
 #include "GameObserver.h"
 
 #include <JGui.h>
-#include "../include/WFont.h"
+#include "WFont.h"
 
 
 class MTGGamePhase: public ActionElement {

projects/mtg/include/MTGRules.h

@@ -4,10 +4,10 @@
 #ifndef _MTGRULES_H_
 #define _MTGRULES_H_
 
-#include "../include/MTGAbility.h"
+#include "MTGAbility.h"
-#include "../include/Counters.h"
+#include "Counters.h"
-#include "../include/WEvent.h"
+#include "WEvent.h"
-#include "../include/CardSelector.h"
+#include "CardSelector.h"
 
 class OtherAbilitiesEventReceiver:public MTGAbility{
 public:

projects/mtg/include/ManaCost.h

@@ -1,8 +1,8 @@
 #ifndef _MANACOST_H_
 #define _MANACOST_H_
 
-#include "../include/utils.h"
+#include "utils.h"
-#include "../include/MTGDefinitions.h"
+#include "MTGDefinitions.h"
 
 
 class ManaCostHybrid;

projects/mtg/include/MenuItem.h

@@ -1,7 +1,7 @@
 #ifndef _MENU_ITEM_H
 #define _MENU_ITEM_H
 
-#include "../include/WFont.h"
+#include "WFont.h"
 #include <JGui.h>
 #include <hge/hgeparticle.h>
 #include <string>

projects/mtg/include/OptionItem.h

@@ -4,12 +4,12 @@
 #include <JGui.h>
 #include <vector>
 #include <string>
-#include "../include/GameApp.h"
+#include "GameApp.h"
-#include "../include/GameStateOptions.h"
+#include "GameStateOptions.h"
-#include "../include/GameOptions.h"
+#include "GameOptions.h"
-#include "../include/WFilter.h"
+#include "WFilter.h"
-#include "../include/WDataSrc.h"
+#include "WDataSrc.h"
-#include "../include/WGui.h"
+#include "WGui.h"
 
 using std::string;
 

projects/mtg/include/PlayerData.h

@@ -1,8 +1,8 @@
 #ifndef _PLAYER_DATA_H_
 #define _PLAYER_DATA_H_
 
-#include "../include/MTGDeck.h"
+#include "MTGDeck.h"
-#include "../include/Tasks.h"
+#include "Tasks.h"
 
 class PlayerData{
  protected:

projects/mtg/include/PrecompiledHeader.h

@@ -0,0 +1,16 @@
+#ifndef PRECOMPILEDHEADER_H
+#define PRECOMPILEDHEADER_H
+
+#include <iostream>
+#include <list>
+#include <map>
+#include <sstream>
+#include <string>
+#include <vector>
+
+#include "config.h"
+#include "DebugRoutines.h"
+
+#include <assert.h>
+
+#endif //PRECOMPILEDHEADER_H

projects/mtg/include/PriceList.h

@@ -2,8 +2,8 @@
 #define _PRICELIST_H_
 
 #include<string>
-#include "../include/MTGDefinitions.h"
+#include "MTGDefinitions.h"
-#include "../include/MTGDeck.h"
+#include "MTGDeck.h"
 #include <stdio.h>
 
 class MTGAllCards;

projects/mtg/include/ReplacementEffects.h

@@ -3,7 +3,7 @@
 
 #include <list>
 using namespace std;
-#include "../include/Damage.h"
+#include "Damage.h"
 #include "WEvent.h"
 
 class TargetChooser;

projects/mtg/include/SimpleMenu.h

@@ -6,7 +6,7 @@
 
 #include <string>
 #include <JGui.h>
-#include "../include/WFont.h"
+#include "WFont.h"
 #include "hge/hgeparticle.h"
 
 class SimpleMenu:public JGuiController{

projects/mtg/include/SimpleMenuItem.h

@@ -4,7 +4,6 @@
 #include <string>
 #include <JLBFont.h>
 #include <JGui.h>
-#include <string>
 #include "SimpleMenu.h"
 
 using std::string;

projects/mtg/include/TargetChooser.h

@@ -7,8 +7,8 @@
 #define TARGET_OK_NOT_READY 3
 
 #include <JGE.h>
-#include "../include/TargetsList.h"
+#include "TargetsList.h"
-#include "../include/ActionStack.h"
+#include "ActionStack.h"
 
 #include <string>
 using std::string;

projects/mtg/include/TestSuiteAI.h

@@ -4,7 +4,7 @@
 #define MAX_TESTSUITE_ACTIONS 100
 #define MAX_TESTUITE_CARDS 100
 
-#include "../include/AIPlayer.h"
+#include "AIPlayer.h"
 
 class TestSuiteActions{
  public:

projects/mtg/src/AIMomirPlayer.cpp

@@ -1,9 +1,10 @@
-#include "../include/config.h"
+#include "PrecompiledHeader.h"
-#include "../include/AIMomirPlayer.h"
+
-#include "../include/CardDescriptor.h"
+#include "AIMomirPlayer.h"
-#include "../include/DamagerDamaged.h"
+#include "CardDescriptor.h"
-#include "../include/AIStats.h"
+#include "DamagerDamaged.h"
-#include "../include/AllAbilities.h"
+#include "AIStats.h"
+#include "AllAbilities.h"
 
 
 MTGAbility * AIMomirPlayer::momirAbility = NULL;

projects/mtg/src/AIPlayer.cpp

@@ -1,12 +1,12 @@
-#include "../include/config.h"
+#include "PrecompiledHeader.h"
-#include "../include/DebugRoutines.h"
+
-#include "../include/AIPlayer.h"
+#include "AIPlayer.h"
-#include "../include/CardDescriptor.h"
+#include "CardDescriptor.h"
-#include "../include/AIStats.h"
+#include "AIStats.h"
-#include "../include/AllAbilities.h"
+#include "AllAbilities.h"
-#include "../include/ExtraCost.h"
+#include "ExtraCost.h"
-#include "../include/GuiCombat.h"
+#include "GuiCombat.h"
-#include "../include/GameStateDuel.h"
+#include "GameStateDuel.h"
 
 const char * const MTG_LAND_TEXTS[] = {"artifact","forest","island","mountain","swamp","plains","other lands"};
 

projects/mtg/src/AIStats.cpp

@@ -1,10 +1,11 @@
-#include "../include/config.h"
+#include "PrecompiledHeader.h"
-#include "../include/AIStats.h"
+
-#include "../include/GameObserver.h"
+#include "AIStats.h"
-#include "../include/Player.h"
+#include "GameObserver.h"
-#include "../include/MTGCardInstance.h"
+#include "Player.h"
-#include "../include/WEvent.h"
+#include "MTGCardInstance.h"
-#include "../include/AllAbilities.h"
+#include "WEvent.h"
+#include "AllAbilities.h"
 //TODO:better comments this is too cryptic to work on by anyone but original coder.
 bool compare_aistats(AIStat * first, AIStat * second){
   float damage1 = first->value / first->occurences;

projects/mtg/src/ActionElement.cpp

@@ -1,7 +1,9 @@
-#include "../include/ActionElement.h"
+#include "PrecompiledHeader.h"
-#include "../include/MTGCardInstance.h"
+
-#include "../include/Targetable.h"
+#include "ActionElement.h"
-#include "../include/TargetChooser.h"
+#include "MTGCardInstance.h"
+#include "Targetable.h"
+#include "TargetChooser.h"
 
 ActionElement::ActionElement(int id):JGuiObject(id){
   activeState = INACTIVE;

projects/mtg/src/ActionLayer.cpp

@@ -1,10 +1,9 @@
-#include "../include/config.h"
+#include "PrecompiledHeader.h"
-#include "../include/DebugRoutines.h"
+
-#include "../include/ActionLayer.h"
+#include "ActionLayer.h"
-#include "../include/GameObserver.h"
+#include "GameObserver.h"
-#include "../include/Targetable.h"
+#include "Targetable.h"
-#include "../include/WEvent.h"
+#include "WEvent.h"
-#include <assert.h>
 
 MTGAbility* ActionLayer::getAbility(int type){
   for (int i = 1; i < mCount; i++){

projects/mtg/src/ActionStack.cpp

@@ -1,18 +1,18 @@
 /*
   The Action Stack contains all information for Game Events that can be interrupted (Interruptible)
 */
-#include "../include/config.h"
+#include "PrecompiledHeader.h"
-#include "../include/DebugRoutines.h"
+
-#include "../include/ActionStack.h"
+#include "ActionStack.h"
-#include "../include/MTGAbility.h"
+#include "MTGAbility.h"
-#include "../include/GameObserver.h"
+#include "GameObserver.h"
-#include "../include/Damage.h"
+#include "Damage.h"
-#include "../include/ManaCost.h"
+#include "ManaCost.h"
-#include "../include/GameOptions.h"
+#include "GameOptions.h"
-#include "../include/WResourceManager.h"
+#include "WResourceManager.h"
-#include "../include/TargetChooser.h"
+#include "TargetChooser.h"
-#include "../include/CardGui.h"
+#include "CardGui.h"
-#include "../include/Translate.h"
+#include "Translate.h"
 
 #include <typeinfo>
 

projects/mtg/src/CardDescriptor.cpp

@@ -1,7 +1,8 @@
-#include "../include/config.h"
+#include "PrecompiledHeader.h"
-#include "../include/CardDescriptor.h"
+
-#include "../include/Subtypes.h"
+#include "CardDescriptor.h"
-#include "../include/Counters.h"
+#include "Subtypes.h"
+#include "Counters.h"
 
 
 CardDescriptor::CardDescriptor(): MTGCardInstance(){

projects/mtg/src/CardDisplay.cpp

@@ -1,9 +1,10 @@
-#include "../include/config.h"
+#include "PrecompiledHeader.h"
-#include "../include/CardDisplay.h"
+
-#include "../include/CardGui.h"
+#include "CardDisplay.h"
-#include "../include/TargetChooser.h"
+#include "CardGui.h"
-#include "../include/MTGGameZones.h"
+#include "TargetChooser.h"
-#include "../include/GameObserver.h"
+#include "MTGGameZones.h"
+#include "GameObserver.h"
 
 CardDisplay::CardDisplay() : mId(0), game(GameObserver::GetInstance()) {
   tc = NULL;

projects/mtg/src/CardGui.cpp

@@ -3,18 +3,17 @@
  * This class is in charge of rendering Cards on the screen
  */
 
+#include "PrecompiledHeader.h"
+
 #include "JGE.h"
-#include "../include/config.h"
+#include "CardGui.h"
-#include "../include/DebugRoutines.h"
+#include "ManaCostHybrid.h"
-#include "../include/CardGui.h"
+#include "Subtypes.h"
-#include "../include/ManaCostHybrid.h"
+#include "Translate.h"
-#include "../include/Subtypes.h"
+#include "MTGDefinitions.h"
-#include "../include/Translate.h"
+#include "GameObserver.h"
-#include "../include/MTGDefinitions.h"
-#include "../include/GameObserver.h"
 #include <Vector2D.h>
-#include <assert.h>
+#include "Counters.h"
-#include "../include/Counters.h"
 
 const float CardGui::Width = 28.0;
 const float CardGui::Height = 40.0;

projects/mtg/src/CardPrimitive.cpp

@@ -1,13 +1,12 @@
-#include "../include/CardPrimitive.h"
+#include "PrecompiledHeader.h"
 
+#include "CardPrimitive.h"
 
-#include <string>
 #include <stdlib.h>
 
-#include "../include/MTGDeck.h"
+#include "MTGDeck.h"
-#include "../include/config.h"
+#include "Subtypes.h"
-#include "../include/Subtypes.h"
+#include "Translate.h"
-#include "../include/Translate.h"
 
 using std::string;
 

projects/mtg/src/CardSelector.cpp

@@ -1,12 +1,11 @@
-#include <iostream>
+#include "PrecompiledHeader.h"
-#include <assert.h>
 
-#include "../include/PlayGuiObject.h"
+#include "PlayGuiObject.h"
-#include "../include/CardGui.h"
+#include "CardGui.h"
-#include "../include/CardSelector.h"
+#include "CardSelector.h"
-#include "../include/GuiHand.h"
+#include "GuiHand.h"
 #include "Closest.cpp"
-#include "../include/GameObserver.h"
+#include "GameObserver.h"
 
 using std::cout;
 

projects/mtg/src/Counters.cpp

@@ -1,6 +1,7 @@
-#include "../include/Counters.h"
+#include "PrecompiledHeader.h"
-#include "../include/config.h"
+
-#include "../include/MTGCardInstance.h"
+#include "Counters.h"
+#include "MTGCardInstance.h"
 
 Counter::Counter(MTGCardInstance * _target, int _power, int _toughness){
   init(_target,"",_power, _toughness);

projects/mtg/src/Credits.cpp

@@ -1,14 +1,15 @@
-#include "../include/Credits.h"
+#include "PrecompiledHeader.h"
-#include "../include/GameApp.h"
+
-#include "../include/GameOptions.h"
+#include "Credits.h"
-#include "../include/config.h"
+#include "GameApp.h"
-#include "../include/PlayerData.h"
+#include "GameOptions.h"
-#include "../include/DeckStats.h"
+#include "PlayerData.h"
-#include "../include/Translate.h"
+#include "DeckStats.h"
-#include "../include/MTGDeck.h"
+#include "Translate.h"
-#include "../include/GameObserver.h"
+#include "MTGDeck.h"
-#include "../include/GameStateShop.h"
+#include "GameObserver.h"
-#include "../include/PlayerData.h"
+#include "GameStateShop.h"
+#include "PlayerData.h"
 
   CreditBonus::CreditBonus(int _value, string _text){
     value = _value;

projects/mtg/src/Damage.cpp

@@ -1,11 +1,12 @@
-#include "../include/config.h"
+#include "PrecompiledHeader.h"
-#include "../include/Damage.h"
+
-#include "../include/MTGCardInstance.h"
+#include "Damage.h"
-#include "../include/Counters.h"
+#include "MTGCardInstance.h"
-#include "../include/WEvent.h"
+#include "Counters.h"
-#include "../include/Translate.h"
+#include "WEvent.h"
-#include "../include/WResourceManager.h"
+#include "Translate.h"
-#include "../include/GameObserver.h"
+#include "WResourceManager.h"
+#include "GameObserver.h"
 
 Damage::Damage(MTGCardInstance * source, Damageable * target) {
   init(source, target, source->getPower(), DAMAGE_OTHER);

projects/mtg/src/DamagerDamaged.cpp

@@ -1,5 +1,6 @@
-#include "../include/config.h"
+#include "PrecompiledHeader.h"
-#include "../include/DamagerDamaged.h"
+
+#include "DamagerDamaged.h"
 
 /*
 Temporary objects that store the damages dealt to/from creatures during the combat phase

projects/mtg/src/DeckDataWrapper.cpp

@@ -1,8 +1,9 @@
-#include "../include/config.h"
+#include "PrecompiledHeader.h"
-#include "../include/DeckDataWrapper.h"
+
-#include "../include/MTGDeck.h"
+#include "DeckDataWrapper.h"
-#include "../include/PriceList.h"
+#include "MTGDeck.h"
-#include "../include/WDataSrc.h"
+#include "PriceList.h"
+#include "WDataSrc.h"
 
 DeckDataWrapper::DeckDataWrapper(MTGDeck * deck){
   parent = deck;  

projects/mtg/src/DeckManager.cpp

@@ -1,4 +1,6 @@
-#include "../include/DeckManager.h"
+#include "PrecompiledHeader.h"
+
+#include "DeckManager.h"
 #include <JRenderer.h>
 
 void DeckManager::updateMetaDataList( vector<DeckMetaData *> * refList, bool isAI )

projects/mtg/src/DeckMetaData.cpp

@@ -1,8 +1,9 @@
-#include "../include/DeckMetaData.h"
+#include "PrecompiledHeader.h"
-#include "../include/DeckStats.h"
+
-#include "../include/MTGDeck.h"
+#include "DeckMetaData.h"
-#include "../include/config.h"
+#include "DeckStats.h"
-#include "../include/utils.h"
+#include "MTGDeck.h"
+#include "utils.h"
 
 //Possible improvements:
 //Merge this with DeckStats

projects/mtg/src/DeckStats.cpp

@@ -1,7 +1,8 @@
-#include "../include/config.h"
+#include "PrecompiledHeader.h"
-#include "../include/DeckStats.h"
+
-#include "../include/Player.h"
+#include "DeckStats.h"
-#include "../include/GameObserver.h"
+#include "Player.h"
+#include "GameObserver.h"
 
 DeckStats * DeckStats::mInstance = NULL;
 

projects/mtg/src/DuelLayers.cpp

@@ -1,15 +1,16 @@
-#include "../include/config.h"
+#include "PrecompiledHeader.h"
-#include "../include/MTGRules.h"
+
-#include "../include/GuiCombat.h"
+#include "MTGRules.h"
-#include "../include/GuiBackground.h"
+#include "GuiCombat.h"
-#include "../include/GuiFrame.h"
+#include "GuiBackground.h"
-#include "../include/GuiPhaseBar.h"
+#include "GuiFrame.h"
-#include "../include/GuiAvatars.h"
+#include "GuiPhaseBar.h"
-#include "../include/GuiHand.h"
+#include "GuiAvatars.h"
-#include "../include/GuiPlay.h"
+#include "GuiHand.h"
-#include "../include/GuiMana.h"
+#include "GuiPlay.h"
-#include "../include/Trash.h"
+#include "GuiMana.h"
-#include "../include/DuelLayers.h"
+#include "Trash.h"
+#include "DuelLayers.h"
 
 void DuelLayers::init(){
 

projects/mtg/src/ExtraCost.cpp

@@ -1,11 +1,11 @@
-#include "../include/DebugRoutines.h"
+#include "PrecompiledHeader.h"
-#include "../include/ExtraCost.h"
+
-#include "../include/TargetChooser.h"
+#include "ExtraCost.h"
-#include "../include/MTGCardInstance.h"
+#include "TargetChooser.h"
-#include "../include/Translate.h"
+#include "MTGCardInstance.h"
-#include "../include/config.h"
+#include "Translate.h"
-#include "../include/Player.h"
+#include "Player.h"
-#include "../include/Counters.h"
+#include "Counters.h"
 #include <JGE.h>
 
 ExtraCost::ExtraCost(const std::string& inCostRenderString, TargetChooser *_tc)

projects/mtg/src/GameApp.cpp

@@ -1,5 +1,5 @@
-#include "../include/config.h"
+#include "PrecompiledHeader.h"
-#include "../include/DebugRoutines.h"
+
 #include <JGE.h>
 #include <JRenderer.h>
 #if defined (WIN32) || defined (LINUX)
@@ -8,21 +8,21 @@
 #include <pspfpu.h>
 #endif
 
-#include "../include/WResourceManager.h"
+#include "WResourceManager.h"
-#include "../include/GameApp.h"
+#include "GameApp.h"
-#include "../include/Subtypes.h"
+#include "Subtypes.h"
-#include "../include/GameStateTransitions.h"
+#include "GameStateTransitions.h"
-#include "../include/GameStateDeckViewer.h"
+#include "GameStateDeckViewer.h"
-#include "../include/GameStateMenu.h"
+#include "GameStateMenu.h"
-#include "../include/GameStateDuel.h"
+#include "GameStateDuel.h"
-#include "../include/GameStateOptions.h"
+#include "GameStateOptions.h"
-#include "../include/GameStateShop.h"
+#include "GameStateShop.h"
-#include "../include/GameStateAwards.h"
+#include "GameStateAwards.h"
-#include "../include/GameStateStory.h"
+#include "GameStateStory.h"
-#include "../include/DeckStats.h"
+#include "DeckStats.h"
-#include "../include/DeckMetaData.h"
+#include "DeckMetaData.h"
-#include "../include/Translate.h"
+#include "Translate.h"
-#include "../include/WFilter.h"
+#include "WFilter.h"
 
 #define DEFAULT_DURATION .25
 

projects/mtg/src/GameLauncher.cpp

@@ -7,11 +7,11 @@
 // Copyright (c) 2007 James Hui (a.k.a. Dr.Watson) <jhkhui@gmail.com>
 //
 //-------------------------------------------------------------------------------------
-#include "../include/config.h"
+#include "PrecompiledHeader.h"
-#include <string.h>
+
 #include <JGameLauncher.h>
 
-#include "../include/GameApp.h"
+#include "GameApp.h"
 
 static char GameName[] = "Wagic";
 

projects/mtg/src/GameObserver.cpp

@@ -1,11 +1,11 @@
-#include "../include/config.h"
+#include "PrecompiledHeader.h"
-#include "../include/DebugRoutines.h"
+
-#include "../include/GameObserver.h"
+#include "GameObserver.h"
-#include "../include/GameOptions.h"
+#include "GameOptions.h"
-#include "../include/CardGui.h"
+#include "CardGui.h"
-#include "../include/Damage.h"
+#include "Damage.h"
-#include "../include/Rules.h"
+#include "Rules.h"
-#include "../include/ExtraCost.h"
+#include "ExtraCost.h"
 
 #include <JRenderer.h>
 

projects/mtg/src/GameOptions.cpp

@@ -1,14 +1,14 @@
-#include "../include/config.h"
+#include "PrecompiledHeader.h"
-#include "../include/utils.h"
+
-#include "../include/MTGDeck.h"
+#include "utils.h"
-#include "../include/GameOptions.h"
+#include "MTGDeck.h"
-#include "../include/Translate.h"
+#include "GameOptions.h"
-#include "../include/OptionItem.h"
+#include "Translate.h"
-#include "../include/StyleManager.h"
+#include "OptionItem.h"
-#include <iostream>
+#include "StyleManager.h"
-#include <sstream>
+
 #include <fstream>
-#include <string>
+
 #include <stdlib.h>
 #include <JGE.h>
 

projects/mtg/src/GameState.cpp

@@ -1,12 +1,12 @@
-#include "../include/config.h"
+#include "PrecompiledHeader.h"
-#include "../include/Translate.h"
+
-#include "../include/GameState.h"
+#include "Translate.h"
-#include "../include/Player.h"
+#include "GameState.h"
-#include "../include/SimpleMenu.h"
+#include "Player.h"
-#include "../include/DeckStats.h"
+#include "SimpleMenu.h"
-#include "../include/DeckMetaData.h"
+#include "DeckStats.h"
-#include "../include/Player.h"
+#include "DeckMetaData.h"
-#include <vector>
+#include "Player.h"
 
 // The purpose of this method is to create a listing of decks to be used for the input menu
 // by default, the list will be sorted by name

projects/mtg/src/GameStateAwards.cpp

@@ -1,15 +1,16 @@
 /*
   This is where the player views their awards, etc.
 */
-#include "../include/config.h"
+#include "PrecompiledHeader.h"
+
 #include <JRenderer.h>
-#include "../include/GameStateAwards.h"
+#include "GameStateAwards.h"
-#include "../include/GameApp.h"
+#include "GameApp.h"
-#include "../include/MTGDeck.h"
+#include "MTGDeck.h"
-#include "../include/Translate.h"
+#include "Translate.h"
-#include "../include/OptionItem.h"
+#include "OptionItem.h"
-#include "../include/GameOptions.h"
+#include "GameOptions.h"
-#include "../include/DeckDataWrapper.h"
+#include "DeckDataWrapper.h"
 
 enum ENUM_AWARDS_STATE{
     STATE_LISTVIEW,

projects/mtg/src/GameStateDeckViewer.cpp

@@ -3,20 +3,19 @@
  * Class handling the Deck Editor
  */
 
+#include "PrecompiledHeader.h"
+
 #include <math.h>
-#include <iostream>
-#include <sstream>
 #include <JGE.h>
-#include "../include/config.h"
+
-#include "../include/DeckManager.h"
+#include "DeckManager.h"
-#include "../include/DebugRoutines.h"
+#include "GameStateDuel.h"
-#include "../include/GameStateDuel.h"
+#include "GameStateDeckViewer.h"
-#include "../include/GameStateDeckViewer.h"
+#include "Translate.h"
-#include "../include/Translate.h"
+#include "ManaCostHybrid.h"
-#include "../include/ManaCostHybrid.h"
+#include "MTGCardInstance.h"
-#include "../include/MTGCardInstance.h"
+#include "WFilter.h"
-#include "../include/WFilter.h"
+
-#include <vector>
 
 
 //!! helper function; this is probably handled somewhere in the code already.

projects/mtg/src/GameStateDuel.cpp

@@ -1,22 +1,22 @@
-#include "../include/config.h"
+#include "PrecompiledHeader.h"
-#include "../include/DebugRoutines.h"
-#include "../include/GameStateDuel.h"
-#include "../include/GameOptions.h"
-#include "../include/utils.h"
-#include "../include/AIPlayer.h"
-#include "../include/AIMomirPlayer.h"
-#include "../include/PlayerData.h"
-#include "../include/DeckStats.h"
-#include "../include/DeckManager.h"
 
-#include "../include/DeckMetaData.h"
+#include "GameStateDuel.h"
-#include "../include/MTGRules.h"
+#include "GameOptions.h"
-#include "../include/Credits.h"
+#include "utils.h"
-#include "../include/Translate.h"
+#include "AIPlayer.h"
-#include "../include/Rules.h"
+#include "AIMomirPlayer.h"
+#include "PlayerData.h"
+#include "DeckStats.h"
+#include "DeckManager.h"
+
+#include "DeckMetaData.h"
+#include "MTGRules.h"
+#include "Credits.h"
+#include "Translate.h"
+#include "Rules.h"
 
 #ifdef TESTSUITE
-#include "../include/TestSuiteAI.h"
+#include "TestSuiteAI.h"
 #endif
 
 #if defined (WIN32) || defined (LINUX)

projects/mtg/src/GameStateMenu.cpp

@@ -3,19 +3,20 @@
  * Main Menu and Loading screen
  */
 
+#include "PrecompiledHeader.h"
+
 #include <math.h>
-#include "../include/config.h"
+
-#include "../include/DebugRoutines.h"
+#include "GameStateMenu.h"
-#include "../include/GameStateMenu.h"
+#include "MenuItem.h"
-#include "../include/MenuItem.h"
+#include "GameOptions.h"
-#include "../include/GameOptions.h"
+#include "GameApp.h"
-#include "../include/GameApp.h"
+#include "MTGCard.h"
-#include "../include/MTGCard.h"
+#include "Translate.h"
-#include "../include/Translate.h"
+#include "DeckStats.h"
-#include "../include/DeckStats.h"
+#include "PlayerData.h"
-#include "../include/PlayerData.h"
+#include "utils.h"
-#include "../include/utils.h"
+#include "WFont.h"
-#include "../include/WFont.h"
 
 static const char* GAME_VERSION = "WTH?! 0.13.1 - by wololo";
 

projects/mtg/src/GameStateOptions.cpp

@@ -1,11 +1,12 @@
-#include "../include/config.h"
+#include "PrecompiledHeader.h"
-#include "../include/GameStateOptions.h"
+
-#include "../include/GameApp.h"
+#include "GameStateOptions.h"
-#include "../include/OptionItem.h"
+#include "GameApp.h"
-#include "../include/SimpleMenu.h"
+#include "OptionItem.h"
-#include "../include/SimplePad.h"
+#include "SimpleMenu.h"
-#include "../include/GameOptions.h"
+#include "SimplePad.h"
-#include "../include/Translate.h"
+#include "GameOptions.h"
+#include "Translate.h"
 
 GameStateOptions::GameStateOptions(GameApp* parent): GameState(parent), mReload(false), grabber(NULL), optionsMenu(NULL), optionsTabs(NULL) {}
 GameStateOptions::~GameStateOptions() {}

projects/mtg/src/GameStateShop.cpp

@@ -1,15 +1,16 @@
 /*
   The shop is where the player can buy cards, decks...
 */
-#include "../include/config.h"
+#include "PrecompiledHeader.h"
+
 #include <JRenderer.h>
-#include "../include/GameStateShop.h"
+#include "GameStateShop.h"
-#include "../include/GameApp.h"
+#include "GameApp.h"
-#include "../include/MTGDeck.h"
+#include "MTGDeck.h"
-#include "../include/MTGPack.h"
+#include "MTGPack.h"
-#include "../include/Translate.h"
+#include "Translate.h"
-#include "../include/GameOptions.h"
+#include "GameOptions.h"
-#include "../include/TestSuiteAI.h"
+#include "TestSuiteAI.h"
 
 #include <hge/hgedistort.h>
 

projects/mtg/src/GameStateStory.cpp

@@ -1,8 +1,9 @@
-#include "../include/GameStateStory.h"
+#include "PrecompiledHeader.h"
-#include "../include/config.h"
+
-#include "../include/StoryFlow.h"
+#include "GameStateStory.h"
-#include "../include/SimpleMenu.h"
+#include "StoryFlow.h"
-#include "../include/GameApp.h"
+#include "SimpleMenu.h"
+#include "GameApp.h"
 #include <dirent.h>
 #include <fstream>
 

projects/mtg/src/GameStateTransitions.cpp

@@ -1,12 +1,13 @@
-#include "../include/config.h"
+#include "PrecompiledHeader.h"
+
 #include <JRenderer.h>
 #include <JGui.h>
-#include "../include/GameApp.h"
+#include "GameApp.h"
-#include "../include/GameStateTransitions.h"
+#include "GameStateTransitions.h"
-#include "../include/MTGDeck.h"
+#include "MTGDeck.h"
-#include "../include/Translate.h"
+#include "Translate.h"
-#include "../include/OptionItem.h"
+#include "OptionItem.h"
-#include "../include/GameOptions.h"
+#include "GameOptions.h"
 
 TransitionBase::TransitionBase(GameApp* parent, GameState* _from, GameState* _to, float duration): GameState(parent){
   from = _from;

projects/mtg/src/GuiAvatars.cpp

@@ -1,7 +1,8 @@
-#include "../include/config.h"
+#include "PrecompiledHeader.h"
-#include "../include/GameApp.h"
+
-#include "../include/GuiAvatars.h"
+#include "GameApp.h"
-#include "../include/GameObserver.h"
+#include "GuiAvatars.h"
+#include "GameObserver.h"
 
 #define LIB_GRAVE_OFFSET 230
 

projects/mtg/src/GuiBackground.cpp

@@ -1,8 +1,9 @@
-#include "../include/config.h"
+#include "PrecompiledHeader.h"
-#include "../include/GameApp.h"
+
-#include "../include/GuiBackground.h"
+#include "GameApp.h"
-#include "../include/GameObserver.h"
+#include "GuiBackground.h"
-#include "../include/Rules.h"
+#include "GameObserver.h"
+#include "Rules.h"
 
 GuiBackground::GuiBackground()
 {

projects/mtg/src/GuiCardsController.cpp

@@ -1,4 +1,5 @@
-#include "../include/config.h"
+#include "PrecompiledHeader.h"
-#include "../include/GuiCardsController.h"
+
+#include "GuiCardsController.h"
 
 

projects/mtg/src/GuiCombat.cpp

@@ -1,10 +1,10 @@
-#include <assert.h>
+#include "PrecompiledHeader.h"
-#include "../include/config.h"
+
-#include "../include/GameApp.h"
+#include "GameApp.h"
-#include "../include/GuiCombat.h"
+#include "GuiCombat.h"
-#include "../include/AIPlayer.h"
+#include "AIPlayer.h"
-#include "../include/GameObserver.h"
+#include "GameObserver.h"
-#include "../include/Trash.h"
+#include "Trash.h"
 #include "Closest.cpp"
 
 static const float MARGIN = 70;

projects/mtg/src/GuiFrame.cpp

@@ -1,6 +1,7 @@
-#include "../include/config.h"
+#include "PrecompiledHeader.h"
-#include "../include/GameApp.h"
+
-#include "../include/GuiFrame.h"
+#include "GameApp.h"
+#include "GuiFrame.h"
 
 GuiFrame::GuiFrame()
 {

projects/mtg/src/GuiHand.cpp

@@ -1,8 +1,9 @@
-#include "../include/config.h"
+#include "PrecompiledHeader.h"
-#include "../include/GameApp.h"
+
-#include "../include/Trash.h"
+#include "GameApp.h"
-#include "../include/GuiHand.h"
+#include "Trash.h"
-#include "../include/OptionItem.h"
+#include "GuiHand.h"
+#include "OptionItem.h"
 
 const float GuiHand::ClosedRowX = 459;
 const float GuiHand::LeftRowX = 420;

projects/mtg/src/GuiLayers.cpp

@@ -1,6 +1,7 @@
-#include "../include/config.h"
+#include "PrecompiledHeader.h"
-#include "../include/GuiLayers.h"
+
-#include "../include/Player.h"
+#include "GuiLayers.h"
+#include "Player.h"
 
 GuiLayer::GuiLayer(){
   modal = 0;

projects/mtg/src/GuiMana.cpp

@@ -1,8 +1,8 @@
-#include <iostream>
+#include "PrecompiledHeader.h"
-#include "../include/GuiMana.h"
-#include "../include/OptionItem.h"
-#include "../include/Player.h"
 
+#include "GuiMana.h"
+#include "OptionItem.h"
+#include "Player.h"
 
 using std::cout;
 using std::endl;

projects/mtg/src/GuiPhaseBar.cpp

@@ -1,8 +1,9 @@
-#include "../include/config.h"
+#include "PrecompiledHeader.h"
-#include "../include/GameApp.h"
+
-#include "../include/GuiPhaseBar.h"
+#include "GameApp.h"
-#include "../include/GameObserver.h"
+#include "GuiPhaseBar.h"
-#include "../include/Translate.h"
+#include "GameObserver.h"
+#include "Translate.h"
 
 /*
 static int colors[] =

projects/mtg/src/GuiPlay.cpp

@@ -1,7 +1,8 @@
-#include "../include/config.h"
+#include "PrecompiledHeader.h"
-#include "../include/GameApp.h"
+
-#include "../include/GuiPlay.h"
+#include "GameApp.h"
-#include "../include/Trash.h"
+#include "GuiPlay.h"
+#include "Trash.h"
 
 #define CARD_WIDTH (31)
 

projects/mtg/src/GuiStatic.cpp

@@ -1,6 +1,7 @@
-#include "../include/config.h"
+#include "PrecompiledHeader.h"
-#include "../include/Trash.h"
+
-#include "../include/GuiStatic.h"
+#include "Trash.h"
+#include "GuiStatic.h"
 
 GuiStatic::GuiStatic(float desiredHeight, float x, float y, bool hasFocus, GuiAvatars* parent) : PlayGuiObject(desiredHeight, x, y, hasFocus), parent(parent) {}
 void GuiStatic::Entering()

projects/mtg/src/Logger.cpp

@@ -1,9 +1,8 @@
-#include "../include/config.h"
+#include "PrecompiledHeader.h"
-#include "../include/DebugRoutines.h"
+
-#include "../include/Logger.h"
+#include "Logger.h"
 #ifdef DOLOG
 
-#include <iostream>
 #include <fstream>
 using namespace std;
 

projects/mtg/src/MTGAbility.cpp

@@ -1,15 +1,15 @@
-#include "../include/config.h"
+#include "PrecompiledHeader.h"
-#include "../include/DebugRoutines.h"
+
-#include "../include/MTGAbility.h"
+#include "MTGAbility.h"
-#include "../include/ManaCost.h"
+#include "ManaCost.h"
-#include "../include/MTGGameZones.h"
+#include "MTGGameZones.h"
-#include "../include/AllAbilities.h"
+#include "AllAbilities.h"
-#include "../include/Damage.h"
+#include "Damage.h"
-#include "../include/TargetChooser.h"
+#include "TargetChooser.h"
-#include "../include/CardGui.h"
+#include "CardGui.h"
-#include "../include/MTGDeck.h"
+#include "MTGDeck.h"
-#include "../include/Translate.h"
+#include "Translate.h"
-#include "../include/ThisDescriptor.h"
+#include "ThisDescriptor.h"
 
 
 int AbilityFactory::countCards(TargetChooser * tc, Player * player, int option)

projects/mtg/src/MTGCard.cpp

@@ -3,15 +3,16 @@
 //-------------------------------------------------
 //TODO Fill BasicAbilities
 
+#include "PrecompiledHeader.h"
+
 #include <string>
 #include <stdlib.h>
 
-#include "../include/MTGDeck.h"
+#include "MTGDeck.h"
-#include "../include/config.h"
+#include "MTGCard.h"
-#include "../include/MTGCard.h"
+#include "CardPrimitive.h"
-#include "../include/CardPrimitive.h"
+#include "Subtypes.h"
-#include "../include/Subtypes.h"
+#include "Translate.h"
-#include "../include/Translate.h"
 
 using std::string;
 

projects/mtg/src/MTGCardInstance.cpp

@@ -4,11 +4,13 @@
   Although there is only one MTGCard of each type, there can be as much Instances of it as needed in the game
   --------------------------------------------
 */
-#include "../include/config.h"
+
-#include "../include/MTGCardInstance.h"
+#include "PrecompiledHeader.h"
-#include "../include/CardDescriptor.h"
+
-#include "../include/Counters.h"
+#include "MTGCardInstance.h"
-#include "../include/Subtypes.h"
+#include "CardDescriptor.h"
+#include "Counters.h"
+#include "Subtypes.h"
 #include <algorithm>
 using namespace std;
 

projects/mtg/src/MTGDeck.cpp

@@ -1,18 +1,17 @@
-#include <string.h>
+#include "PrecompiledHeader.h"
+
 #include <algorithm>
-#include <string>
 #include <sstream>
-#include "../include/config.h"
+
-#include "../include/DebugRoutines.h"
+#include "MTGDeck.h"
-#include "../include/MTGDeck.h"
+#include "utils.h"
-#include "../include/utils.h"
+#include "Subtypes.h"
-#include "../include/Subtypes.h"
+#include "Translate.h"
-#include "../include/Translate.h"
+#include "DeckMetaData.h"
-#include "../include/DeckMetaData.h"
+#include "PriceList.h"
-#include "../include/PriceList.h"
+#include "WDataSrc.h"
-#include "../include/WDataSrc.h"
+#include "MTGPack.h"
-#include "../include/MTGPack.h"
+#include "utils.h"
-#include "../include/utils.h"
 
 #include <JGE.h>
 

projects/mtg/src/MTGDefinitions.cpp

@@ -1,4 +1,6 @@
-#include "../include/MTGDefinitions.h"
+#include "PrecompiledHeader.h"
+
+#include "MTGDefinitions.h"
 
 char Constants::MTGColorChars[] = {'x','g','u','r','b','w','l'};
 const char* Constants::MTGColorStrings[] = {"artifact", "green", "blue", "red", "black", "white", "land"};

projects/mtg/src/MTGGamePhase.cpp

@@ -1,5 +1,6 @@
-#include "../include/config.h"
+#include "PrecompiledHeader.h"
-#include "../include/MTGGamePhase.h"
+
+#include "MTGGamePhase.h"
 
 
 MTGGamePhase::MTGGamePhase(int id):ActionElement(id){

projects/mtg/src/MTGGameZones.cpp

@@ -1,10 +1,10 @@
-#include "../include/config.h"
+#include "PrecompiledHeader.h"
-#include "../include/MTGGameZones.h"
+
-#include "../include/Player.h"
+#include "MTGGameZones.h"
-#include "../include/GameOptions.h"
+#include "Player.h"
-#include "../include/WEvent.h"
+#include "GameOptions.h"
-#include "../include/MTGDeck.h"
+#include "WEvent.h"
-#include <assert.h>
+#include "MTGDeck.h"
 
 #if defined (WIN32) || defined (LINUX)
 #include <time.h>

projects/mtg/src/MTGPack.cpp

@@ -1,14 +1,14 @@
+#include "PrecompiledHeader.h"
+
 #include <JGui.h>
-#include <vector>
-#include <string>
 #include <dirent.h>
-#include "../include/config.h"
+
-#include "../include/GameApp.h"
+#include "GameApp.h"
-#include "../include/Translate.h"
+#include "Translate.h"
-#include "../include/WDataSrc.h"
+#include "WDataSrc.h"
-#include "../include/WFilter.h"
+#include "WFilter.h"
-#include "../include/DeckDataWrapper.h"
+#include "DeckDataWrapper.h"
-#include "../include/MTGPack.h"
+#include "MTGPack.h"
 #include "../../../JGE/src/tinyxml/tinyxml.h"
 
 MTGPack MTGPacks::defaultBooster;

projects/mtg/src/MTGRules.cpp

@@ -1,9 +1,9 @@
-#include "../include/config.h"
+#include "PrecompiledHeader.h"
-#include "../include/DebugRoutines.h"
+
-#include "../include/MTGRules.h"
+#include "MTGRules.h"
-#include "../include/Translate.h"
+#include "Translate.h"
-#include "../include/Subtypes.h"
+#include "Subtypes.h"
-#include "../include/GameOptions.h"
+#include "GameOptions.h"
 
 
 

projects/mtg/src/ManaCost.cpp

@@ -1,13 +1,13 @@
-#include "../include/config.h"
+#include "PrecompiledHeader.h"
-#include "../include/DebugRoutines.h"
+
-#include "../include/ManaCost.h"
+#include "ManaCost.h"
-#include "../include/ManaCostHybrid.h"
+#include "ManaCostHybrid.h"
-#include "../include/ExtraCost.h"
+#include "ExtraCost.h"
-#include "../include/TargetChooser.h"
+#include "TargetChooser.h"
-#include "../include/Targetable.h"
+#include "Targetable.h"
-#include "../include/Player.h"
+#include "Player.h"
-#include "../include/WEvent.h"
+#include "WEvent.h"
-#include "../include/MTGAbility.h"
+#include "MTGAbility.h"
 
 #if defined (WIN32)
 

projects/mtg/src/ManaCostHybrid.cpp

@@ -1,4 +1,6 @@
-#include "../include/ManaCostHybrid.h"
+#include "PrecompiledHeader.h"
+
+#include "ManaCostHybrid.h"
 
 ManaCostHybrid::ManaCostHybrid(){
   init(0,0,0,0);

projects/mtg/src/MenuItem.cpp

@@ -1,7 +1,8 @@
-#include "../include/config.h"
+#include "PrecompiledHeader.h"
-#include "../include/MenuItem.h"
+
-#include "../include/GameOptions.h"
+#include "MenuItem.h"
-#include "../include/Translate.h"
+#include "GameOptions.h"
+#include "Translate.h"
 
 MenuItem::MenuItem(int id, WFont *font, string text, int x, int y, JQuad * _off, JQuad * _on, const char * particle, JQuad * particleTex, bool hasFocus): JGuiObject(id), mFont(font), mX(x), mY(y)
 {

projects/mtg/src/OptionItem.cpp

@@ -1,11 +1,12 @@
-#include "../include/config.h"
+#include "PrecompiledHeader.h"
-#include "../include/OptionItem.h"
+
+#include "OptionItem.h"
 #include <JGE.h>
-#include "../include/PlayerData.h"
+#include "PlayerData.h"
-#include "../include/Translate.h"
+#include "Translate.h"
-#include "../include/Subtypes.h"
+#include "Subtypes.h"
-#include "../include/TranslateKeys.h"
+#include "TranslateKeys.h"
-#include "../include/StyleManager.h"
+#include "StyleManager.h"
 #include <dirent.h>
 #include <stdlib.h>
 #include <algorithm>

projects/mtg/src/PhaseRing.cpp

@@ -1,9 +1,9 @@
-#include "../include/DebugRoutines.h"
+#include "PrecompiledHeader.h"
-#include "../include/PhaseRing.h"
+
-#include "../include/MTGDefinitions.h"
+#include "PhaseRing.h"
-#include "../include/Player.h"
+#include "MTGDefinitions.h"
-#include "../include/config.h"
+#include "Player.h"
-#include "../include/WEvent.h"
+#include "WEvent.h"
 
 
 //Parses a string and gives phase numer

projects/mtg/src/PlayGuiObject.cpp

@@ -1,6 +1,6 @@
-#include <iostream>
+#include "PrecompiledHeader.h"
-#include "../include/config.h"
+
-#include "../include/PlayGuiObject.h"
+#include "PlayGuiObject.h"
 
 using namespace std;
 

projects/mtg/src/PlayGuiObjectController.cpp

@@ -1,8 +1,9 @@
-#include "../include/config.h"
+#include "PrecompiledHeader.h"
-#include "../include/PlayGuiObjectController.h"
 
-#include "../include/PlayGuiObject.h"
+#include "PlayGuiObjectController.h"
-#include "../include/GameObserver.h"
+
+#include "PlayGuiObject.h"
+#include "GameObserver.h"
 
 int PlayGuiObjectController::showBigCards = 1;
 

projects/mtg/src/Player.cpp

@@ -1,8 +1,9 @@
-#include "../include/config.h"
+#include "PrecompiledHeader.h"
-#include "../include/Player.h"
+
-#include "../include/GameObserver.h"
+#include "Player.h"
-#include "../include/DeckStats.h"
+#include "GameObserver.h"
-#include "../include/ManaCost.h"
+#include "DeckStats.h"
+#include "ManaCost.h"
 
 
 

projects/mtg/src/PlayerData.cpp

@@ -1,8 +1,8 @@
-#include "../include/config.h"
+#include "PrecompiledHeader.h"
-#include "../include/GameOptions.h"
+
-#include "../include/PlayerData.h"
+#include "GameOptions.h"
+#include "PlayerData.h"
 
-#include <string.h>
 #include <stdio.h>
 
 PlayerData::PlayerData(){