From 39870c91f65c89e51a7b66014eb8b7d5dcb8e51e Mon Sep 17 00:00:00 2001 From: "wrenczes@gmail.com" Date: Thu, 21 Apr 2011 02:35:51 +0000 Subject: [PATCH] Removed GameApp.h from GameOptions.h - this should help prevent the precompiled header from rebuilding constantly when any header is touched, as GameApp.h ends up pulling virtually every other header by some level of indirection. We really need though to sit down at some point & refactor the inclusion tree. It's a big yarn ball at the moment. --- projects/mtg/include/GameOptions.h | 1 - projects/mtg/src/GameOptions.cpp | 1 - projects/mtg/src/MenuItem.cpp | 1 + projects/mtg/src/Translate.cpp | 1 + 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/mtg/include/GameOptions.h b/projects/mtg/include/GameOptions.h index 69fc35969..cddbf3c33 100644 --- a/projects/mtg/include/GameOptions.h +++ b/projects/mtg/include/GameOptions.h @@ -8,7 +8,6 @@ using std::string; #include #include #include "SimplePad.h" -#include "GameApp.h" #define GLOBAL_SETTINGS "settings/options.txt" #define PLAYER_SAVEFILE "data.dat" diff --git a/projects/mtg/src/GameOptions.cpp b/projects/mtg/src/GameOptions.cpp index 49e8c9ebe..b7d751b19 100644 --- a/projects/mtg/src/GameOptions.cpp +++ b/projects/mtg/src/GameOptions.cpp @@ -2,7 +2,6 @@ #include "utils.h" #include "MTGDeck.h" -#include "GameOptions.h" #include "Translate.h" #include "OptionItem.h" #include "StyleManager.h" diff --git a/projects/mtg/src/MenuItem.cpp b/projects/mtg/src/MenuItem.cpp index b1f9a6539..1aaf70ab0 100644 --- a/projects/mtg/src/MenuItem.cpp +++ b/projects/mtg/src/MenuItem.cpp @@ -2,6 +2,7 @@ #include "MenuItem.h" #include "Translate.h" +#include "WResourceManager.h" MenuItem::MenuItem(int id, WFont *font, string text, float x, float y, JQuad * _off, JQuad * _on, const char * particle, JQuad * particleTex, bool hasFocus) : diff --git a/projects/mtg/src/Translate.cpp b/projects/mtg/src/Translate.cpp index 643cf6f40..1fc634a9d 100644 --- a/projects/mtg/src/Translate.cpp +++ b/projects/mtg/src/Translate.cpp @@ -1,6 +1,7 @@ #include "PrecompiledHeader.h" #include "Translate.h" +#include "utils.h" Translator * Translator::mInstance = NULL;