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
This commit is contained in:
@@ -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 "../include/Targetable.h"
|
||||
#include "TargetsList.h"
|
||||
#include "Targetable.h"
|
||||
|
||||
class GuiLayer;
|
||||
class PlayGuiObject;
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#ifndef _CARD_DISPLAY_H_
|
||||
#define _CARD_DISPLAY_H_
|
||||
|
||||
#include "../include/PlayGuiObjectController.h"
|
||||
#include "PlayGuiObjectController.h"
|
||||
|
||||
class TargetChooser;
|
||||
class MTGGameZone;
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
#ifndef _DECKDATAWRAPPER_H_
|
||||
#define _DECKDATAWRAPPER_H_
|
||||
|
||||
#include "../include/MTGDefinitions.h"
|
||||
#include "../include/MTGCard.h"
|
||||
#include "../include/CardPrimitive.h"
|
||||
#include "../include/WDataSrc.h"
|
||||
#include "MTGDefinitions.h"
|
||||
#include "MTGCard.h"
|
||||
#include "CardPrimitive.h"
|
||||
#include "WDataSrc.h"
|
||||
#include <map>
|
||||
#include <string>
|
||||
using std::map;
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <map>
|
||||
#include "../include/DeckStats.h"
|
||||
#include "DeckStats.h"
|
||||
|
||||
|
||||
using namespace std;
|
||||
|
||||
@@ -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 "../include/GameOptions.h"
|
||||
#include "GameState.h"
|
||||
#include "GameOptions.h"
|
||||
|
||||
#include "../include/MTGDeck.h"
|
||||
#include "../include/MTGCard.h"
|
||||
#include "../include/MTGGameZones.h"
|
||||
#include "MTGDeck.h"
|
||||
#include "MTGCard.h"
|
||||
#include "MTGGameZones.h"
|
||||
|
||||
#include "../include/CardEffect.h"
|
||||
#include "CardEffect.h"
|
||||
|
||||
#define PLAYER_TYPE_CPU 0
|
||||
#define PLAYER_TYPE_HUMAN 1
|
||||
|
||||
@@ -7,8 +7,8 @@ using std::map;
|
||||
using std::string;
|
||||
#include <JGE.h>
|
||||
#include <time.h>
|
||||
#include "../include/SimplePad.h"
|
||||
#include "../include/GameApp.h"
|
||||
#include "SimplePad.h"
|
||||
#include "GameApp.h"
|
||||
|
||||
#define GLOBAL_SETTINGS RESPATH"/settings/options.txt"
|
||||
#define PLAYER_SAVEFILE "data.dat"
|
||||
|
||||
@@ -9,7 +9,7 @@ class JGE;
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <iostream>
|
||||
#include "../include/DeckMetaData.h"
|
||||
#include "DeckMetaData.h"
|
||||
|
||||
using namespace std;
|
||||
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
#define _GAME_STATE_AWARDS_H_
|
||||
|
||||
#include <JGE.h>
|
||||
#include "../include/GameState.h"
|
||||
#include "../include/SimpleMenu.h"
|
||||
#include "GameState.h"
|
||||
#include "SimpleMenu.h"
|
||||
|
||||
class WGuiList;
|
||||
class WGuiMenu;
|
||||
|
||||
@@ -6,17 +6,17 @@
|
||||
|
||||
#include <JGE.h>
|
||||
|
||||
#include "../include/GameState.h"
|
||||
#include "../include/SimpleMenu.h"
|
||||
#include "../include/WResourceManager.h"
|
||||
#include "../include/CardGui.h"
|
||||
#include "../include/GameOptions.h"
|
||||
#include "../include/PriceList.h"
|
||||
#include "../include/PlayerData.h"
|
||||
#include "../include/DeckDataWrapper.h"
|
||||
#include "../include/DeckStats.h"
|
||||
#include "../include/WDataSrc.h"
|
||||
#include "../include/WGui.h"
|
||||
#include "GameState.h"
|
||||
#include "SimpleMenu.h"
|
||||
#include "WResourceManager.h"
|
||||
#include "CardGui.h"
|
||||
#include "GameOptions.h"
|
||||
#include "PriceList.h"
|
||||
#include "PlayerData.h"
|
||||
#include "DeckDataWrapper.h"
|
||||
#include "DeckStats.h"
|
||||
#include "WDataSrc.h"
|
||||
#include "WGui.h"
|
||||
|
||||
#define NO_USER_ACTIVITY_HELP_DELAY 10
|
||||
#define NO_USER_ACTIVITY_SHOWCARD_DELAY 0.1
|
||||
|
||||
@@ -2,10 +2,10 @@
|
||||
#define _GAME_STATE_DUEL_H_
|
||||
|
||||
|
||||
#include "../include/GameState.h"
|
||||
#include "../include/SimpleMenu.h"
|
||||
#include "../include/MTGDeck.h"
|
||||
#include "../include/GameObserver.h"
|
||||
#include "GameState.h"
|
||||
#include "SimpleMenu.h"
|
||||
#include "MTGDeck.h"
|
||||
#include "GameObserver.h"
|
||||
|
||||
#define CHOOSE_OPPONENT 7
|
||||
|
||||
|
||||
@@ -3,9 +3,9 @@
|
||||
|
||||
#include <JGui.h>
|
||||
#include <dirent.h>
|
||||
#include "../include/GameState.h"
|
||||
#include "../include/SimpleMenu.h"
|
||||
#include "../include/TextScroller.h"
|
||||
#include "GameState.h"
|
||||
#include "SimpleMenu.h"
|
||||
#include "TextScroller.h"
|
||||
|
||||
class GameStateMenu: public GameState, public JGuiListener
|
||||
{
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
#include <JGE.h>
|
||||
#include <JGui.h>
|
||||
#include "../include/GameState.h"
|
||||
#include "GameState.h"
|
||||
|
||||
class GameApp;
|
||||
class WGuiTabMenu;
|
||||
|
||||
@@ -2,14 +2,14 @@
|
||||
#define _GAME_STATE_SHOP_H_
|
||||
|
||||
#include <JGE.h>
|
||||
#include "../include/GameState.h"
|
||||
#include "../include/SimpleMenu.h"
|
||||
#include "../include/OptionItem.h"
|
||||
#include "../include/PriceList.h"
|
||||
#include "../include/PlayerData.h"
|
||||
#include "../include/CardDisplay.h"
|
||||
#include "../include/DeckDataWrapper.h"
|
||||
#include "../include/Tasks.h"
|
||||
#include "GameState.h"
|
||||
#include "SimpleMenu.h"
|
||||
#include "OptionItem.h"
|
||||
#include "PriceList.h"
|
||||
#include "PlayerData.h"
|
||||
#include "CardDisplay.h"
|
||||
#include "DeckDataWrapper.h"
|
||||
#include "Tasks.h"
|
||||
|
||||
|
||||
#define STATE_BUY 1
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
#define _GAME_STATE_STORY_H_
|
||||
|
||||
|
||||
#include "../include/GameState.h"
|
||||
#include "GameState.h"
|
||||
#include <JGui.h>
|
||||
|
||||
class StoryFlow;
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
#include <JGE.h>
|
||||
#include <JGui.h>
|
||||
#include "../include/GameState.h"
|
||||
#include "GameState.h"
|
||||
|
||||
class TransitionBase: public GameState, public JGuiListener{
|
||||
public:
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#define DIR_RIGHT 4
|
||||
|
||||
#include <JGui.h>
|
||||
#include "../include/WEvent.h"
|
||||
#include "WEvent.h"
|
||||
|
||||
class GameObserver;
|
||||
class Player;
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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 "../include/TargetChooser.h"
|
||||
#include "Damage.h"
|
||||
#include "TargetChooser.h"
|
||||
using std::string;
|
||||
using std::map;
|
||||
|
||||
|
||||
@@ -3,9 +3,9 @@
|
||||
|
||||
#define MTG_ERROR -1
|
||||
|
||||
#include "../include/MTGDefinitions.h"
|
||||
#include "../include/GameApp.h"
|
||||
#include "../include/WResourceManager.h"
|
||||
#include "MTGDefinitions.h"
|
||||
#include "GameApp.h"
|
||||
#include "WResourceManager.h"
|
||||
|
||||
|
||||
#include <string>
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
#include "GameObserver.h"
|
||||
|
||||
#include <JGui.h>
|
||||
#include "../include/WFont.h"
|
||||
#include "WFont.h"
|
||||
|
||||
|
||||
class MTGGamePhase: public ActionElement {
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
#ifndef _MTGRULES_H_
|
||||
#define _MTGRULES_H_
|
||||
|
||||
#include "../include/MTGAbility.h"
|
||||
#include "../include/Counters.h"
|
||||
#include "../include/WEvent.h"
|
||||
#include "../include/CardSelector.h"
|
||||
#include "MTGAbility.h"
|
||||
#include "Counters.h"
|
||||
#include "WEvent.h"
|
||||
#include "CardSelector.h"
|
||||
|
||||
class OtherAbilitiesEventReceiver:public MTGAbility{
|
||||
public:
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#ifndef _MANACOST_H_
|
||||
#define _MANACOST_H_
|
||||
|
||||
#include "../include/utils.h"
|
||||
#include "../include/MTGDefinitions.h"
|
||||
#include "utils.h"
|
||||
#include "MTGDefinitions.h"
|
||||
|
||||
|
||||
class ManaCostHybrid;
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -4,12 +4,12 @@
|
||||
#include <JGui.h>
|
||||
#include <vector>
|
||||
#include <string>
|
||||
#include "../include/GameApp.h"
|
||||
#include "../include/GameStateOptions.h"
|
||||
#include "../include/GameOptions.h"
|
||||
#include "../include/WFilter.h"
|
||||
#include "../include/WDataSrc.h"
|
||||
#include "../include/WGui.h"
|
||||
#include "GameApp.h"
|
||||
#include "GameStateOptions.h"
|
||||
#include "GameOptions.h"
|
||||
#include "WFilter.h"
|
||||
#include "WDataSrc.h"
|
||||
#include "WGui.h"
|
||||
|
||||
using std::string;
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#ifndef _PLAYER_DATA_H_
|
||||
#define _PLAYER_DATA_H_
|
||||
|
||||
#include "../include/MTGDeck.h"
|
||||
#include "../include/Tasks.h"
|
||||
#include "MTGDeck.h"
|
||||
#include "Tasks.h"
|
||||
|
||||
class PlayerData{
|
||||
protected:
|
||||
|
||||
@@ -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
|
||||
@@ -2,8 +2,8 @@
|
||||
#define _PRICELIST_H_
|
||||
|
||||
#include<string>
|
||||
#include "../include/MTGDefinitions.h"
|
||||
#include "../include/MTGDeck.h"
|
||||
#include "MTGDefinitions.h"
|
||||
#include "MTGDeck.h"
|
||||
#include <stdio.h>
|
||||
|
||||
class MTGAllCards;
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
#include <list>
|
||||
using namespace std;
|
||||
#include "../include/Damage.h"
|
||||
#include "Damage.h"
|
||||
#include "WEvent.h"
|
||||
|
||||
class TargetChooser;
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
#include <string>
|
||||
#include <JGui.h>
|
||||
#include "../include/WFont.h"
|
||||
#include "WFont.h"
|
||||
#include "hge/hgeparticle.h"
|
||||
|
||||
class SimpleMenu:public JGuiController{
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
#include <string>
|
||||
#include <JLBFont.h>
|
||||
#include <JGui.h>
|
||||
#include <string>
|
||||
#include "SimpleMenu.h"
|
||||
|
||||
using std::string;
|
||||
|
||||
@@ -7,8 +7,8 @@
|
||||
#define TARGET_OK_NOT_READY 3
|
||||
|
||||
#include <JGE.h>
|
||||
#include "../include/TargetsList.h"
|
||||
#include "../include/ActionStack.h"
|
||||
#include "TargetsList.h"
|
||||
#include "ActionStack.h"
|
||||
|
||||
#include <string>
|
||||
using std::string;
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#define MAX_TESTSUITE_ACTIONS 100
|
||||
#define MAX_TESTUITE_CARDS 100
|
||||
|
||||
#include "../include/AIPlayer.h"
|
||||
#include "AIPlayer.h"
|
||||
|
||||
class TestSuiteActions{
|
||||
public:
|
||||
|
||||
Reference in New Issue
Block a user