Moved GameOptions.h into the precompiled header. Shaves almost 20 seconds off my build times.

2011-04-20 07:50:00 +00:00
parent a44bd2ffd5
commit fc0a59a14e
23 changed files with 5 additions and 20 deletions
--- a/projects/mtg/include/AllAbilities.h
+++ b/projects/mtg/include/AllAbilities.h
@@ -9,7 +9,6 @@
 #include "CardDisplay.h"
 #include "Subtypes.h"
 #include "CardGui.h"
-#include "GameOptions.h"
 #include "Token.h"
 #include "Counters.h"
 #include "WEvent.h"
--- a/projects/mtg/include/Credits.h
+++ b/projects/mtg/include/Credits.h
@@ -9,6 +9,7 @@
 #include "Player.h"

 class GameApp;
+class DeckStats;

 using namespace std;

--- a/projects/mtg/include/GameApp.h
+++ b/projects/mtg/include/GameApp.h
@@ -15,7 +15,6 @@
 #include "WResourceManager.h"

 #include "GameState.h"
-#include "GameOptions.h"

 #include "MTGDeck.h"
 #include "MTGCard.h"
--- a/projects/mtg/include/GameStateDeckViewer.h
+++ b/projects/mtg/include/GameStateDeckViewer.h
@@ -11,7 +11,6 @@
 #include "SimpleMenu.h"
 #include "WResourceManager.h"
 #include "CardGui.h"
-#include "GameOptions.h"
 #include "PriceList.h"
 #include "PlayerData.h"
 #include "DeckDataWrapper.h"
--- a/projects/mtg/include/OptionItem.h
+++ b/projects/mtg/include/OptionItem.h
@@ -9,7 +9,6 @@
 #include <string>
 #include "GameApp.h"
 #include "GameStateOptions.h"
-#include "GameOptions.h"
 #include "WFilter.h"
 #include "WDataSrc.h"
 #include "WGui.h"
--- a/projects/mtg/include/PrecompiledHeader.h
+++ b/projects/mtg/include/PrecompiledHeader.h
@@ -19,6 +19,8 @@
 #include "JFileSystem.h"
 #include "JLogger.h"

+#include "GameOptions.h"
+
 #include <boost/shared_ptr.hpp>

 #endif //PRECOMPILEDHEADER_H
--- a/projects/mtg/src/ActionStack.cpp
+++ b/projects/mtg/src/ActionStack.cpp
@@ -8,7 +8,6 @@ The Action Stack contains all information for Game Events that can be interrupte
 #include "CardSelectorSingleton.h"
 #include "Damage.h"
 #include "GameObserver.h"
-#include "GameOptions.h"
 #include "ManaCost.h"
 #include "MTGAbility.h"
 #include "Subtypes.h"
--- a/projects/mtg/src/Credits.cpp
+++ b/projects/mtg/src/Credits.cpp
@@ -2,7 +2,6 @@

 #include "Credits.h"
 #include "GameApp.h"
-#include "GameOptions.h"
 #include "PlayerData.h"
 #include "DeckStats.h"
 #include "Translate.h"
--- a/projects/mtg/src/GameObserver.cpp
+++ b/projects/mtg/src/GameObserver.cpp
@@ -1,7 +1,6 @@
 #include "PrecompiledHeader.h"

 #include "GameObserver.h"
-#include "GameOptions.h"
 #include "CardGui.h"
 #include "Damage.h"
 #include "Rules.h"
--- a/projects/mtg/src/GameStateAwards.cpp
+++ b/projects/mtg/src/GameStateAwards.cpp
@@ -9,7 +9,6 @@
 #include "MTGDeck.h"
 #include "Translate.h"
 #include "OptionItem.h"
-#include "GameOptions.h"
 #include "DeckDataWrapper.h"

 enum ENUM_AWARDS_STATE
--- a/projects/mtg/src/GameStateDuel.cpp
+++ b/projects/mtg/src/GameStateDuel.cpp
@@ -2,7 +2,6 @@

 #include "DeckMenu.h"
 #include "GameStateDuel.h"
-#include "GameOptions.h"
 #include "utils.h"
 #include "AIPlayer.h"
 #include "AIMomirPlayer.h"
--- a/projects/mtg/src/GameStateMenu.cpp
+++ b/projects/mtg/src/GameStateMenu.cpp
@@ -10,7 +10,6 @@
 #include "GameStateMenu.h"
 #include "DeckManager.h"
 #include "MenuItem.h"
-#include "GameOptions.h"
 #include "GameApp.h"
 #include "MTGCard.h"
 #include "Translate.h"
--- a/projects/mtg/src/GameStateOptions.cpp
+++ b/projects/mtg/src/GameStateOptions.cpp
@@ -5,7 +5,6 @@
 #include "OptionItem.h"
 #include "SimpleMenu.h"
 #include "SimplePad.h"
-#include "GameOptions.h"
 #include "Translate.h"

 namespace
--- a/projects/mtg/src/GameStateShop.cpp
+++ b/projects/mtg/src/GameStateShop.cpp
@@ -9,7 +9,6 @@
 #include "MTGDeck.h"
 #include "MTGPack.h"
 #include "Translate.h"
-#include "GameOptions.h"
 #include "TestSuiteAI.h"

 #include <hge/hgedistort.h>
--- a/projects/mtg/src/GameStateTransitions.cpp
+++ b/projects/mtg/src/GameStateTransitions.cpp
@@ -7,7 +7,6 @@
 #include "MTGDeck.h"
 #include "Translate.h"
 #include "OptionItem.h"
-#include "GameOptions.h"

 TransitionBase::TransitionBase(GameApp* parent, GameState* _from, GameState* _to, float duration) :
    GameState(parent)
--- a/projects/mtg/src/MTGGameZones.cpp
+++ b/projects/mtg/src/MTGGameZones.cpp
@@ -2,7 +2,6 @@

 #include "MTGGameZones.h"
 #include "Player.h"
-#include "GameOptions.h"
 #include "WEvent.h"
 #include "MTGDeck.h"
 #include "Subtypes.h"
--- a/projects/mtg/src/MTGRules.cpp
+++ b/projects/mtg/src/MTGRules.cpp
@@ -4,7 +4,6 @@
 #include "MTGRules.h"
 #include "Translate.h"
 #include "Subtypes.h"
-#include "GameOptions.h"
 #include "Credits.h"

 MTGEventBonus::MTGEventBonus(int _id) :
--- a/projects/mtg/src/MenuItem.cpp
+++ b/projects/mtg/src/MenuItem.cpp
@@ -1,7 +1,6 @@
 #include "PrecompiledHeader.h"

 #include "MenuItem.h"
-#include "GameOptions.h"
 #include "Translate.h"

 MenuItem::MenuItem(int id, WFont *font, string text, float x, float y, JQuad * _off, JQuad * _on, const char * particle,
--- a/projects/mtg/src/PlayerData.cpp
+++ b/projects/mtg/src/PlayerData.cpp
@@ -1,6 +1,5 @@
 #include "PrecompiledHeader.h"

-#include "GameOptions.h"
 #include "PlayerData.h"

 #include <stdio.h>
--- a/projects/mtg/src/PriceList.cpp
+++ b/projects/mtg/src/PriceList.cpp
@@ -1,6 +1,8 @@
 #include "PrecompiledHeader.h"

 #include "PriceList.h"
+#include "utils.h"
+#include "MTGCard.h"

 int PriceList::randomKey = 0;

--- a/projects/mtg/src/Translate.cpp
+++ b/projects/mtg/src/Translate.cpp
@@ -1,7 +1,6 @@
 #include "PrecompiledHeader.h"

 #include "Translate.h"
-#include "GameOptions.h"

 Translator * Translator::mInstance = NULL;

--- a/projects/mtg/src/WCachedResource.cpp
+++ b/projects/mtg/src/WCachedResource.cpp
@@ -2,7 +2,6 @@

 #include "utils.h"
 #include <JFileSystem.h>
-#include "GameOptions.h"
 #include "WResourceManager.h"
 #include "WCachedResource.h"
 #include <hge/hgeparticle.h>
--- a/projects/mtg/src/WResourceManager.cpp
+++ b/projects/mtg/src/WResourceManager.cpp
@@ -1,6 +1,5 @@
 #include "PrecompiledHeader.h"

-#include "GameOptions.h"
 #include "WResourceManagerImpl.h"
 #include "StyleManager.h"