Simplification of #Include paths: relative names are used only for included files in the same directory as the including file; everything else uses the full path relative to source/.

This was SVN commit r3930.

source/graphics/Camera.cpp

@@ -13,10 +13,10 @@
 #include "precompiled.h"
 
 #include "Camera.h"
-#include "Renderer.h"
+#include "renderer/Renderer.h"
 #include "HFTracer.h"
-#include "Game.h"
-#include "ogl.h"
+#include "ps/Game.h"
+#include "lib/ogl.h"
 #include "ps/World.h"
 
 CCamera::CCamera ()

source/graphics/Camera.h

@@ -14,7 +14,7 @@
 #define CAMERA_H
 
 #include "Frustum.h"
-#include "Matrix3D.h"
+#include "maths/Matrix3D.h"
 
 extern int g_mouse_x, g_mouse_y;
 

source/graphics/CinemaTrack.cpp

@@ -2,15 +2,15 @@
 #include "precompiled.h"
 #include <string>
 #include <sstream>
-#include "ogl.h"
+#include "lib/ogl.h"
 #include "CinemaTrack.h"
-#include "Game.h"
+#include "ps/Game.h"
 #include "GameView.h"
-#include "MathUtil.h"
+#include "maths/MathUtil.h"
 #include "Camera.h"
-#include "CStr.h"
-#include "Vector3D.h"
-#include "Vector4D.h"
+#include "ps/CStr.h"
+#include "maths/Vector3D.h"
+#include "maths/Vector4D.h"
 #include "lib/res/file/vfs.h"
 #include "lib/res/mem.h"
 

source/graphics/CinemaTrack.h

@@ -16,8 +16,8 @@
 #include <list>
 #include <map>
 
-#include "CStr.h"
-#include "NUSpline.h"
+#include "ps/CStr.h"
+#include "maths/NUSpline.h"
 
 
 /*

source/graphics/Color.cpp

@@ -1,6 +1,6 @@
 #include "precompiled.h"
 
-#include "MathUtil.h"
+#include "maths/MathUtil.h"
 #include "graphics/Color.h"
 
 

source/graphics/Color.h

@@ -9,8 +9,8 @@
 #ifndef _COLOR_H
 #define _COLOR_H
 
-#include "Vector3D.h"
-#include "Vector4D.h"
+#include "maths/Vector3D.h"
+#include "maths/Vector4D.h"
 #include "lib/types.h"
 
 // simple defines for 3 and 4 component floating point colors - just map to

source/graphics/Frustum.cpp

@@ -16,7 +16,7 @@
 #include "precompiled.h"
 
 #include "Frustum.h"
-#include "Bound.h"
+#include "maths/Bound.h"
 
 CFrustum::CFrustum ()
 {

source/graphics/Frustum.h

@@ -16,7 +16,7 @@
 #ifndef FRUSTUM_H
 #define FRUSTUM_H
 
-#include "Plane.h"
+#include "maths/Plane.h"
 
 //10 planes should be enough
 #define MAX_NUM_FRUSTUM_PLANES		(10)

source/graphics/GameView.cpp

@@ -3,41 +3,41 @@
 #include "precompiled.h"
 
 #include "Terrain.h"
-#include "Renderer.h"
+#include "renderer/Renderer.h"
 #include "GameView.h"
-#include "Game.h"
+#include "ps/Game.h"
 #include "Camera.h"
-#include "Interact.h"
+#include "ps/Interact.h"
 
-#include "Matrix3D.h"
-#include "MathUtil.h"
-#include "Renderer.h"
+#include "maths/Matrix3D.h"
+#include "maths/MathUtil.h"
+#include "renderer/Renderer.h"
 #include "Terrain.h"
 #include "LightEnv.h"
 #include "HFTracer.h"
 #include "TextureManager.h"
 #include "ObjectManager.h"
-#include "LOSManager.h"
-#include "EntityOrders.h"
-#include "Bound.h"
-#include "Pyrogenesis.h"
-#include "Hotkey.h"
-#include "ConfigDB.h"
-#include "Loader.h"
-#include "Profile.h"
+#include "simulation/LOSManager.h"
+#include "simulation/EntityOrders.h"
+#include "maths/Bound.h"
+#include "ps/Pyrogenesis.h"
+#include "ps/Hotkey.h"
+#include "ps/ConfigDB.h"
+#include "ps/Loader.h"
+#include "ps/Profile.h"
 #include "ps/LoaderThunks.h"
 #include "ps/Globals.h"
 #include "renderer/WaterManager.h"
 #include "renderer/SkyManager.h"
 
-#include "Quaternion.h"
+#include "maths/Quaternion.h"
 #include "Unit.h"
 #include "Model.h"
-#include "Projectile.h"
+#include "simulation/Projectile.h"
 
-#include "input.h"
-#include "lib.h"
-#include "timer.h"
+#include "lib/input.h"
+#include "lib/lib.h"
+#include "lib/timer.h"
 
 float g_MaxZoomHeight=350.0f;	//note:  Max terrain height is this minus YMinOffset
 float g_YMinOffset=15.0f;

source/graphics/GameView.h

@@ -8,7 +8,7 @@ extern float g_YMinOffset;
 #include "Camera.h"
 #include "CinemaTrack.h"
 #include "ModelDef.h"
-#include "Vector3D.h"
+#include "maths/Vector3D.h"
 #include "LightEnv.h"
 #include "scripting/ScriptableObject.h"
 

source/graphics/HFTracer.cpp

@@ -10,8 +10,8 @@
 
 #include "HFTracer.h"
 #include "Terrain.h"
-#include "Bound.h"
-#include "Vector3D.h"
+#include "maths/Bound.h"
+#include "maths/Vector3D.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 // CHFTracer constructor

source/graphics/LightEnv.h

@@ -13,7 +13,7 @@
 #define __LIGHTENV_H
 
 #include "Color.h"
-#include "Vector3D.h"
+#include "maths/Vector3D.h"
 
 class CMapWriter;
 class CMapReader;

source/graphics/MapReader.cpp

@@ -4,13 +4,13 @@
 #include "lib/types.h"
 #include "UnitManager.h"
 #include "Unit.h"
-#include "Game.h"
+#include "ps/Game.h"
 #include "ObjectManager.h"
-#include "BaseEntity.h"
-#include "BaseEntityCollection.h"
-#include "EntityManager.h"
-#include "CLogger.h"
-#include "MathUtil.h"
+#include "simulation/BaseEntity.h"
+#include "simulation/BaseEntityCollection.h"
+#include "simulation/EntityManager.h"
+#include "ps/CLogger.h"
+#include "maths/MathUtil.h"
 #include "Camera.h"
 
 #include "Model.h"
@@ -18,9 +18,9 @@
 #include "TextureManager.h"
 #include "TextureEntry.h"
 
-#include "timer.h"
-#include "Loader.h"
-#include "LoaderThunks.h"
+#include "lib/timer.h"
+#include "ps/Loader.h"
+#include "ps/LoaderThunks.h"
 
 #define LOG_CATEGORY "graphics"
 

source/graphics/MapReader.h

@@ -3,9 +3,9 @@
 
 #include "MapIO.h"
 #include "lib/res/handle.h"
-#include "CStr.h"
+#include "ps/CStr.h"
 #include "LightEnv.h"
-#include "FileUnpacker.h"
+#include "ps/FileUnpacker.h"
 
 class CObjectEntry;
 class CTerrain;

source/graphics/MapWriter.cpp

@@ -14,9 +14,9 @@
 #include "LightEnv.h"
 #include "TextureManager.h"
 #include "TextureEntry.h"
-#include "VFSUtil.h"
-#include "Loader.h"
-#include "MathUtil.h"
+#include "ps/VFSUtil.h"
+#include "ps/Loader.h"
+#include "maths/MathUtil.h"
 #include "graphics/Camera.h"
 
 #include "ps/XML/XMLWriter.h"

source/graphics/MapWriter.h

@@ -3,8 +3,8 @@
 
 #include <vector>
 #include "MapIO.h"
-#include "CStr.h"
-#include "FilePacker.h"
+#include "ps/CStr.h"
+#include "ps/FilePacker.h"
 
 class CLightEnv;
 class CTerrain;

source/graphics/Material.cpp

@@ -1,11 +1,11 @@
 #include "precompiled.h"
 
-#include "ogl.h"
+#include "lib/ogl.h"
 #include "lib/res/res.h"
 #include "Material.h"
-#include "Player.h"
-#include "Game.h"
-#include "Overlay.h" // for CColor
+#include "ps/Player.h"
+#include "ps/Game.h"
+#include "ps/Overlay.h" // for CColor
 
 CMaterial NullMaterial;
 CMaterial IdentityMaterial;

source/graphics/Material.h

@@ -1,7 +1,7 @@
 #ifndef __H_MATERIAL_H__
 #define __H_MATERIAL_H__
 
-#include "CStr.h"
+#include "ps/CStr.h"
 
 struct CColor;
 

source/graphics/MaterialManager.cpp

@@ -1,6 +1,6 @@
 #include "precompiled.h"
-#include "ogl.h"
-#include "XML/Xeromyces.h"
+#include "lib/ogl.h"
+#include "ps/XML/Xeromyces.h"
 #include "MaterialManager.h"
 
 static float ClampFloat(float value, float min, float max)

source/graphics/MaterialManager.h

@@ -2,7 +2,7 @@
 #define __H_MATERIALREADER_H__
 
 #include <map>
-#include "Singleton.h"
+#include "ps/Singleton.h"
 #include "Material.h"
 
 #define g_MaterialManager CMaterialManager::GetSingleton()

source/graphics/MeshManager.cpp

@@ -1,7 +1,7 @@
 #include "precompiled.h"
 #include "graphics/MeshManager.h"
-#include "CLogger.h"
-#include "FileUnpacker.h" // to get access to its CError
+#include "ps/CLogger.h"
+#include "ps/FileUnpacker.h" // to get access to its CError
 #include "ModelDef.h"
 
 CMeshManager::CMeshManager()

source/graphics/MeshManager.h

@@ -1,8 +1,8 @@
 #ifndef __H_MESHMANAGER_H__
 #define __H_MESHMANAGER_H__
 
-#include "Singleton.h"
-#include "CStr.h"
+#include "ps/Singleton.h"
+#include "ps/CStr.h"
 
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>

source/graphics/MiniPatch.cpp

@@ -8,7 +8,7 @@
 
 #include "precompiled.h"
 
-#include "lib.h"
+#include "lib/lib.h"
 
 #include "Patch.h"
 #include "MiniPatch.h"

source/graphics/Model.cpp

@@ -10,15 +10,15 @@
 
 #include "Model.h"
 #include "ModelDef.h"
-#include "Quaternion.h"
-#include "Bound.h"
+#include "maths/Quaternion.h"
+#include "maths/Bound.h"
 #include "SkeletonAnim.h"
 #include "SkeletonAnimDef.h"
 #include "SkeletonAnimManager.h"
 #include "MeshManager.h"
 #include "lib/res/graphics/ogl_tex.h"
 #include "lib/res/h_mgr.h"
-#include "Profile.h"
+#include "ps/Profile.h"
 
 #include "ps/CLogger.h"
 #define LOG_CATEGORY "graphics"

source/graphics/Model.h

@@ -15,7 +15,7 @@
 #include "MeshManager.h"
 #include "RenderableObject.h"
 #include "Material.h"
-#include "Overlay.h"
+#include "ps/Overlay.h"
 struct SPropPoint;
 class CObjectEntry;
 class CSkeletonAnim;

source/graphics/ModelDef.cpp

@@ -9,8 +9,8 @@
 #include "precompiled.h"
 
 #include "ModelDef.h"
-#include "FilePacker.h"
-#include "FileUnpacker.h"
+#include "ps/FilePacker.h"
+#include "ps/FileUnpacker.h"
 
 
 ///////////////////////////////////////////////////////////////////////////////

source/graphics/ModelDef.h

@@ -9,8 +9,8 @@
 #ifndef _MODELDEF_H
 #define _MODELDEF_H
 
-#include "CStr.h"
-#include "Vector3D.h"
+#include "ps/CStr.h"
+#include "maths/Vector3D.h"
 #include "MeshManager.h"
 #include "SkeletonAnimDef.h"
 #include <map>

source/graphics/ObjectBase.cpp

@@ -5,8 +5,8 @@
 #include "ObjectBase.h"
 
 #include "ObjectManager.h"
-#include "XML/Xeromyces.h"
-#include "CLogger.h"
+#include "ps/XML/Xeromyces.h"
+#include "ps/CLogger.h"
 #include "lib/timer.h"
 
 #define LOG_CATEGORY "graphics"

source/graphics/ObjectBase.h

@@ -7,7 +7,7 @@ class CSkeletonAnim;
 #include <vector>
 #include <set>
 #include <map>
-#include "CStr.h"
+#include "ps/CStr.h"
 
 class CObjectBase
 {

source/graphics/ObjectEntry.cpp

@@ -5,7 +5,7 @@
 #include "ObjectBase.h"
 #include "Model.h"
 #include "ModelDef.h"
-#include "CLogger.h"
+#include "ps/CLogger.h"
 #include "MaterialManager.h"
 #include "MeshManager.h"
 #include "SkeletonAnim.h"

source/graphics/ObjectEntry.h

@@ -9,8 +9,8 @@ struct SPropPoint;
 #include <map>
 #include <vector>
 #include <set>
-#include "CStr.h"
-#include "Overlay.h"
+#include "ps/CStr.h"
+#include "ps/Overlay.h"
 
 class CObjectEntry
 {

source/graphics/ObjectManager.cpp

@@ -2,19 +2,19 @@
 
 #include "ObjectManager.h"
 #include <algorithm>
-#include "CLogger.h"
+#include "ps/CLogger.h"
 #include "lib/res/res.h"
-#include "timer.h"
-#include "VFSUtil.h"
+#include "lib/timer.h"
+#include "ps/VFSUtil.h"
 #include "ObjectBase.h"
 #include "ObjectEntry.h"
-#include "Entity.h"
-#include "EntityManager.h"
-#include "BaseEntity.h"
-#include "Game.h"
+#include "simulation/Entity.h"
+#include "simulation/EntityManager.h"
+#include "simulation/BaseEntity.h"
+#include "ps/Game.h"
 #include "Model.h"
 #include "Unit.h"
-#include "Matrix3D.h"
+#include "maths/Matrix3D.h"
 #include "ps/Profile.h"
 
 #define LOG_CATEGORY "graphics"

source/graphics/ObjectManager.h

@@ -3,8 +3,8 @@
 
 #include <vector>
 #include <map>
-#include "Singleton.h"
-#include "CStr.h"
+#include "ps/Singleton.h"
+#include "ps/CStr.h"
 #include "ObjectBase.h"
 
 class CObjectEntry;

source/graphics/ParticleEngine.h

@@ -18,8 +18,8 @@
 #include "ps/CLogger.h"
 #include "ps/Loader.h"
 
-#include "ogl.h"
-#include "Renderer.h"
+#include "lib/ogl.h"
+#include "renderer/Renderer.h"
 
 // Different textures
 enum PText { DEFAULTTEXT, MAX_TEXTURES };

source/graphics/RenderableObject.h

@@ -10,8 +10,8 @@
 #define _RENDERABLEOBJECT_H
 
 
-#include "Bound.h"
-#include "Matrix3D.h"
+#include "maths/Bound.h"
+#include "maths/Matrix3D.h"
 
 
 // dirty flags - used as notification to the renderer that some bit of data

source/graphics/SkeletonAnim.h

@@ -9,7 +9,7 @@
 #ifndef _SKELETONANIM_H
 #define _SKELETONANIM_H
 
-#include "Bound.h"
+#include "maths/Bound.h"
 
 class CSkeletonAnimDef;
 

source/graphics/SkeletonAnimDef.cpp

@@ -9,8 +9,8 @@
 #include "precompiled.h"
 
 #include "SkeletonAnimDef.h"
-#include "FilePacker.h"
-#include "FileUnpacker.h"
+#include "ps/FilePacker.h"
+#include "ps/FileUnpacker.h"
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////

source/graphics/SkeletonAnimDef.h

@@ -9,9 +9,9 @@
 #ifndef _SKELETONANIMDEF_H
 #define _SKELETONANIMDEF_H
 
-#include "CStr.h"
-#include "Vector3D.h"
-#include "Quaternion.h"
+#include "ps/CStr.h"
+#include "maths/Vector3D.h"
+#include "maths/Quaternion.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////
 // CBoneState: structure describing state of a bone at some point

source/graphics/SkeletonAnimManager.cpp

@@ -10,9 +10,9 @@
 
 #include "lib/res/res.h"
 #include "Model.h"
-#include "CLogger.h"
+#include "ps/CLogger.h"
 #include "SkeletonAnimManager.h"
-#include "FileUnpacker.h"
+#include "ps/FileUnpacker.h"
 #include <algorithm>
 
 #define LOG_CATEGORY "graphics"

source/graphics/SkeletonAnimManager.h

@@ -12,7 +12,7 @@
 #include <map>
 #include <set>
 #include "SkeletonAnimDef.h"
-#include "Singleton.h"
+#include "ps/Singleton.h"
 
 
 // access to sole CSkeletonAnimManager object

source/graphics/Sprite.cpp

@@ -27,8 +27,8 @@
 #include "precompiled.h"
 
 #include "Sprite.h"
-#include "Renderer.h"
-#include "ogl.h"
+#include "renderer/Renderer.h"
+#include "lib/ogl.h"
 #include "lib/res/graphics/ogl_tex.h"
 
 CSprite::CSprite() :

source/graphics/Sprite.h

@@ -31,7 +31,7 @@
 //  Includes / Compiler directives
 //--------------------------------------------------------
 
-#include "Vector3D.h"
+#include "maths/Vector3D.h"
 #include "Texture.h"
 
 //--------------------------------------------------------

source/graphics/Terrain.cpp

@@ -14,11 +14,11 @@
 #include "renderer/Renderer.h"
 #include "renderer/WaterManager.h"
 
-#include "EntityManager.h"
+#include "simulation/EntityManager.h"
 
 #include <string.h>
 #include "Terrain.h"
-#include "MathUtil.h"
+#include "maths/MathUtil.h"
 
 
 ///////////////////////////////////////////////////////////////////////////////

source/graphics/Terrain.h

@@ -11,9 +11,9 @@
 #define _TERRAIN_H
 
 #include "Patch.h"
-#include "Vector3D.h"
-#include "Vector2D.h"
-#include "Entity.h"
+#include "maths/Vector3D.h"
+#include "ps/Vector2D.h"
+#include "simulation/Entity.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 // CTerrain: main terrain class; contains the heightmap describing elevation

source/graphics/TerrainProperties.cpp

@@ -4,13 +4,13 @@
 
 #include "TerrainProperties.h"
 #include "TextureManager.h"
-#include "Overlay.h"
+#include "ps/Overlay.h"
 
-#include "Parser.h"
+#include "ps/Parser.h"
 #include "ps/XML/XeroXMB.h"
-#include "XML/Xeromyces.h"
+#include "ps/XML/Xeromyces.h"
 
-#include "CLogger.h"
+#include "ps/CLogger.h"
 #define LOG_CATEGORY "graphics"
 
 using namespace std;

source/graphics/TerrainProperties.h

@@ -10,7 +10,7 @@
 #ifndef graphics_TerrainProperties_H
 #define graphics_TerrainProperties_H
 
-#include "CStr.h"
+#include "ps/CStr.h"
 #include <boost/shared_ptr.hpp>
 
 class CTerrainGroup;

source/graphics/Texture.h

@@ -13,7 +13,7 @@
 #define _TEXTURE_H
 
 #include "lib/res/handle.h"
-#include "CStr.h"
+#include "ps/CStr.h"
 
 class CTexture
 {

source/graphics/TextureEntry.cpp

@@ -2,16 +2,16 @@
 
 #include <map>
 
-#include "ogl.h"
+#include "lib/ogl.h"
 #include "lib/res/graphics/ogl_tex.h"
 
-#include "CLogger.h"
+#include "ps/CLogger.h"
 
 #include "TextureEntry.h"
 #include "TextureManager.h"
 #include "TerrainProperties.h"
 #include "Texture.h"
-#include "Renderer.h"
+#include "renderer/Renderer.h"
 
 #define LOG_CATEGORY "graphics"
 

source/graphics/TextureEntry.h

@@ -4,7 +4,7 @@
 #include <map>
 
 #include "lib/res/handle.h"
-#include "CStr.h"
+#include "ps/CStr.h"
 
 #include "TextureManager.h"
 

source/graphics/TextureManager.h

@@ -7,8 +7,8 @@
 
 #include "lib/res/handle.h"
 
-#include "CStr.h"
-#include "Singleton.h"
+#include "ps/CStr.h"
+#include "ps/Singleton.h"
 
 // access to sole CTextureManager  object
 #define g_TexMan CTextureManager ::GetSingleton()

source/graphics/UnitManager.cpp

@@ -14,10 +14,10 @@
 #include "Model.h"
 #include "UnitManager.h"
 #include "Unit.h"
-#include "CConsole.h"
+#include "ps/CConsole.h"
 #include "ObjectManager.h"
 #include "ObjectEntry.h"
-#include "LOSManager.h"
+#include "simulation/LOSManager.h"
 
 extern CConsole* g_Console;
 

source/graphics/UnitManager.h

@@ -11,7 +11,7 @@
 
 #include <vector>
 #include <set>
-#include "Singleton.h"
+#include "ps/Singleton.h"
 
 class CUnit;
 class CModel;

source/graphics/scripting/JSInterface_Camera.cpp

@@ -1,13 +1,13 @@
 #include "precompiled.h"
 
 #include "JSInterface_Camera.h"
-#include "scripting/JSInterface_Vector3D.h"
-#include "Camera.h"
-#include "Vector3D.h"
-#include "Matrix3D.h"
-#include "MathUtil.h"
-#include "Terrain.h"
-#include "Game.h"
+#include "maths/scripting/JSInterface_Vector3D.h"
+#include "graphics/Camera.h"
+#include "maths/Vector3D.h"
+#include "maths/Matrix3D.h"
+#include "maths/MathUtil.h"
+#include "graphics/Terrain.h"
+#include "ps/Game.h"
 #include "graphics/GameView.h"
 
 

source/graphics/scripting/JSInterface_Camera.h

@@ -8,9 +8,9 @@
 
 #include "scripting/ScriptingHost.h"
 
-#include "Vector3D.h"
-#include "Camera.h"
-#include "HFTracer.h"
+#include "maths/Vector3D.h"
+#include "graphics/Camera.h"
+#include "graphics/HFTracer.h"
 
 #ifndef JSI_CAMERA_INCLUDED
 #define JSI_CAMERA_INCLUDED

source/gui/CButton.cpp

@@ -8,7 +8,7 @@ gee@pyro.nu
 #include "GUI.h"
 #include "CButton.h"
 
-#include "ogl.h"
+#include "lib/ogl.h"
 
 using namespace std;
 

source/gui/CDropDown.cpp

@@ -8,7 +8,7 @@ gee@pyro.nu
 #include "GUI.h"
 #include "CDropDown.h"
 
-#include "ogl.h"
+#include "lib/ogl.h"
 
 using namespace std;
 

source/gui/CGUI.cpp

@@ -30,13 +30,13 @@ gee@pyro.nu
 #include "ps/XML/Xeromyces.h"
 #include "ps/Font.h"
 
-#include "Pyrogenesis.h"
-#include "input.h"
+#include "ps/Pyrogenesis.h"
+#include "lib/input.h"
 // TODO Gee: Whatever include CRect/CPos/CSize
-#include "Overlay.h"
+#include "ps/Overlay.h"
 
 #include "scripting/ScriptingHost.h"
-#include "Hotkey.h"
+#include "ps/Hotkey.h"
 #include "ps/Globals.h"
 #include "lib/timer.h"
 

source/gui/CGUI.h

@@ -32,10 +32,10 @@ ERROR_TYPE(GUI, JSOpenFailed);
 
 #include "ps/Overlay.h" // CPos and CRect
 
-#include "Singleton.h"
+#include "ps/Singleton.h"
 #include "lib/input.h"
 
-#include "XML/Xeromyces.h"
+#include "ps/XML/Xeromyces.h"
 
 extern InReaction gui_handler(const SDL_Event* ev);
 

source/gui/CGUISprite.h

@@ -27,7 +27,7 @@ gee@pyro.nu
 //--------------------------------------------------------
 #include "GUIbase.h"
 
-#include "Overlay.h"
+#include "ps/Overlay.h"
 #include "lib/res/graphics/ogl_tex.h"
 
 //--------------------------------------------------------

source/gui/CImage.cpp

@@ -8,7 +8,7 @@ gee@pyro.nu
 #include "GUI.h"
 #include "CImage.h"
 
-#include "ogl.h"
+#include "lib/ogl.h"
 
 using namespace std;
 

source/gui/CInput.cpp

@@ -9,7 +9,7 @@ gee@pyro.nu
 #include "CInput.h"
 
 #include "ps/Font.h"
-#include "ogl.h"
+#include "lib/ogl.h"
 
 #include "lib/res/graphics/unifont.h"
 

source/gui/CProgressBar.cpp

@@ -8,7 +8,7 @@ gee@pyro.nu
 #include "GUI.h"
 #include "CProgressBar.h"
 
-#include "ogl.h"
+#include "lib/ogl.h"
 
 using namespace std;
 

source/gui/CText.cpp

@@ -8,7 +8,7 @@ gee@pyro.nu
 #include "GUI.h"
 #include "CText.h"
 
-#include "ogl.h"
+#include "lib/ogl.h"
 
 using namespace std;
 

source/gui/GUI.h

@@ -25,10 +25,10 @@ gee@pyro.nu
 #include <vector>
 #include <stddef.h>
 
-#include "Pyrogenesis.h"
-#include "CStr.h"
+#include "ps/Pyrogenesis.h"
+#include "ps/CStr.h"
 #include "lib/types.h"
-#include "ogl.h"
+#include "lib/ogl.h"
 
 #include "GUIbase.h"
 #include "GUIutil.h"

source/gui/GUITooltip.h

@@ -5,7 +5,7 @@ class IGUIObject;
 class CGUI;
 class CStr;
 
-#include "Overlay.h"
+#include "ps/Overlay.h"
 
 class GUITooltip
 {

source/gui/GUIbase.h

@@ -26,7 +26,7 @@ gee@pyro.nu
 
 // I would like to just forward declare CSize, but it doesn't
 //  seem to be defined anywhere in the predefined header.
-#include "Overlay.h"
+#include "ps/Overlay.h"
 
 //--------------------------------------------------------
 //  Forward declarations

source/gui/GUItext.cpp

@@ -7,8 +7,8 @@ gee@pyro.nu
 #include "precompiled.h"
 
 #include "GUI.h"
-#include "CLogger.h"
-#include "Parser.h"
+#include "ps/CLogger.h"
+#include "ps/Parser.h"
 #include <algorithm>
 
 #define LOG_CATEGORY "gui"

source/gui/GUIutil.cpp

@@ -6,8 +6,8 @@ gee@pyro.nu
 
 #include "precompiled.h"
 #include "GUI.h"
-#include "Parser.h"
-#include "i18n.h"
+#include "ps/Parser.h"
+#include "ps/i18n.h"
 
 extern int g_yres;
 

source/gui/GUIutil.h

@@ -22,9 +22,9 @@ gee@pyro.nu
 //  Includes / Compiler directives
 //--------------------------------------------------------
 #include "GUIbase.h"
-#include "Parser.h"
+#include "ps/Parser.h"
 // TODO Gee: New
-#include "Overlay.h"
+#include "ps/Overlay.h"
 #include "CGUI.h"
 #include "CGUISprite.h"
 #include "IGUIObject.h"

source/gui/IGUIObject.cpp

@@ -8,7 +8,7 @@ gee@pyro.nu
 #include "GUI.h"
 
 ///// janwas: again, including etiquette?
-#include "Parser.h"
+#include "ps/Parser.h"
 
 /////
 

source/gui/MiniMap.cpp

@@ -4,22 +4,22 @@
 #include "ps/Game.h"
 
 #include <math.h>
-#include "ogl.h"
+#include "lib/ogl.h"
 #include "renderer/Renderer.h"
 #include "graphics/TextureEntry.h"
 #include "graphics/TextureManager.h"
 #include "graphics/Unit.h"
-#include "UnitManager.h"
-#include "Entity.h"
-#include "Bound.h"
-#include "Model.h"
+#include "graphics/UnitManager.h"
+#include "simulation/Entity.h"
+#include "maths/Bound.h"
+#include "graphics/Model.h"
 #include "scripting/GameEvents.h"
-#include "Terrain.h"
-#include "Profile.h"
-#include "LOSManager.h"
+#include "graphics/Terrain.h"
+#include "ps/Profile.h"
+#include "simulation/LOSManager.h"
 #include "graphics/GameView.h"
 #include "renderer/WaterManager.h"
-#include "Interact.h"
+#include "ps/Interact.h"
 #include "ps/Network/NetMessage.h"
 
 

source/gui/scripting/JSInterface_GUITypes.cpp

@@ -1,7 +1,7 @@
 #include "precompiled.h"
 
 #include "JSInterface_GUITypes.h"
-#include "CStr.h"
+#include "ps/CStr.h"
 
 /**** GUISize ****/
 

source/i18n/CLocale.cpp

@@ -2,7 +2,7 @@
 
 #include "CLocale.h"
 #include "TSComponent.h"
-#include "StringConvert.h"
+#include "ps/StringConvert.h"
 
 
 #include <algorithm>

source/i18n/ScriptInterface.cpp

@@ -2,7 +2,7 @@
 
 #include "ScriptInterface.h"
 #include "CLocale.h"
-#include "StringConvert.h"
+#include "ps/StringConvert.h"
 #include "scripting/SpiderMonkey.h"
 
 #include "ps/CLogger.h"

source/i18n/StringBuffer.h

@@ -10,7 +10,7 @@ before converting into a string.
 
 #include "Common.h"
 #include "TranslatedString.h"
-#include "CStr.h"
+#include "ps/CStr.h"
 
 namespace I18n
 {

source/lib/app_hooks.cpp

@@ -25,7 +25,7 @@
 #include <string.h>
 #include <stdio.h>
 
-#include "sysdep/gfx.h"
+#include "lib/sysdep/gfx.h"
 #include "lib/res/graphics/ogl_tex.h"
 #include "lib/res/file/file.h"
 #include "lib/res/file/vfs.h"

source/lib/debug.h

@@ -25,9 +25,9 @@
 
 #include "lib.h" // STMT
 #if OS_WIN
-# include "sysdep/win/wdbg.h"
+# include "lib/sysdep/win/wdbg.h"
 #else
-# include "sysdep/unix/udbg.h"
+# include "lib/sysdep/unix/udbg.h"
 #endif
 
 /**

source/lib/lf_alloc.cpp

@@ -29,7 +29,7 @@
 
 #include "lib.h"
 #include "posix.h"
-#include "sysdep/cpu.h"
+#include "lib/sysdep/cpu.h"
 #include "lockfree.h"
 #include "timer.h"
 

source/lib/lib.cpp

@@ -31,7 +31,7 @@
 #include "lib.h"
 #include "lib/app_hooks.h"
 
-#include "sysdep/sysdep.h"
+#include "lib/sysdep/sysdep.h"
 
 //-----------------------------------------------------------------------------
 // bit bashing

source/lib/lib.h

@@ -62,7 +62,7 @@ scope
 
 #include "config.h"
 #include "lib/types.h"
-#include "sysdep/sysdep.h"
+#include "lib/sysdep/sysdep.h"
 #include "sysdep/cpu.h"	// CAS
 //#include "sysdep/sysdep.h"	// moved down; see below.
 

source/lib/lib_errors.cpp

@@ -28,7 +28,7 @@
 #include "precompiled.h"
 
 #include "lib_errors.h"
-#include "sysdep/sysdep.h"
+#include "lib/sysdep/sysdep.h"
 
 #include <string.h>
 #include <stdlib.h>	// abs

source/lib/lockfree.cpp

@@ -27,7 +27,7 @@
 
 #include "lib.h"
 #include "posix.h"
-#include "sysdep/cpu.h"
+#include "lib/sysdep/cpu.h"
 #include "lockfree.h"
 #include "timer.h"
 

source/lib/ogl.cpp

@@ -30,7 +30,7 @@
 #include "lib.h"
 #include "sdl.h"
 #include "ogl.h"
-#include "sysdep/gfx.h"
+#include "lib/sysdep/gfx.h"
 #include "debug.h"
 #include "lib/res/h_mgr.h"
 #include "lib/res/graphics/tex.h"

source/lib/ogl.h

@@ -28,7 +28,7 @@ extern "C" {
 #endif
 
 #if OS_WIN
-#include "sysdep/win/wgl.h"
+#include "lib/sysdep/win/wgl.h"
 #endif
 
 

source/lib/posix.h

@@ -55,8 +55,8 @@ need only be renamed (e.g. _open, _stat).
 
 #if OS_WIN
 
-#include "sysdep/win/wposix.h"
-#include "sysdep/win/win.h"
+#include "lib/sysdep/win/wposix.h"
+#include "lib/sysdep/win/win.h"
 
 #else
 

source/lib/posix_types.h

@@ -30,7 +30,7 @@
 #include <stddef.h>
 
 #if OS_WIN
-# include "sysdep/win/wposix_types.h"
+# include "lib/sysdep/win/wposix_types.h"
 #else
 // unix/linux/glibc/gcc says that this macro has to be defined when including
 // stdint.h from C++ for stdint.h to define SIZE_MAX and friends

source/lib/precompiled.h

@@ -164,14 +164,6 @@
 # include <hash_set>
 #endif
 
-// some other external libraries that are used in several places:
-// .. CStr is included very frequently, so a reasonable amount of time is
-//    saved by including it here. (~10% in a full rebuild, as of r2365)
-#include "ps/CStr.h"
-#include "scripting/SpiderMonkey.h"
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
-
 // (further headers to be precompiled go here)
 
 #endif // #if HAVE_PCH

source/lib/res/file/archive.h

@@ -24,7 +24,7 @@
 #ifndef ARCHIVE_H__
 #define ARCHIVE_H__
 
-#include "../handle.h"
+#include "lib/res/handle.h"
 #include "file.h"			// FileCB for afile_enum
 #include "compression.h"	// CompressionMethod
 

source/lib/res/file/archive_builder.cpp

@@ -22,7 +22,7 @@
 
 #include "precompiled.h"
 
-#include "lib.h"
+#include "lib/lib.h"
 #include "lib/timer.h"
 #include "file_internal.h"
 

source/lib/res/file/compression.cpp

@@ -438,7 +438,7 @@ uintptr_t comp_alloc(ContextType type, CompressionMethod method)
 		cassert(sizeof(ZLibCompressor) <= MAX_COMPRESSOR_SIZE);
 #include "nommgr.h"	// protect placement new
 		c = new(c_mem) ZLibCompressor(type);
-#include "mmgr.h"
+#include "lib/mmgr.h"
 		break;
 #endif
 	default:

source/lib/res/file/file.cpp

@@ -23,10 +23,10 @@
 
 #include "precompiled.h"
 
-#include "lib.h"
-#include "adts.h"
-#include "sysdep/sysdep.h"
-#include "byte_order.h"
+#include "lib/lib.h"
+#include "lib/adts.h"
+#include "lib/sysdep/sysdep.h"
+#include "lib/byte_order.h"
 #include "lib/allocators.h"
 #include "file_internal.h"
 

source/lib/res/file/file.h

@@ -24,7 +24,7 @@
 #ifndef FILE_H
 #define FILE_H
 
-#include "posix.h"		// struct stat
+#include "lib/posix.h"		// struct stat
 
 extern LibError file_init();
 

source/lib/res/file/file_io.cpp

@@ -24,7 +24,7 @@
 
 #include <deque>
 
-#include "lib.h"
+#include "lib/lib.h"
 #include "lib/posix.h"
 #include "lib/allocators.h"
 #include "lib/adts.h"

source/lib/res/file/path.cpp

@@ -24,10 +24,10 @@
 
 #include <string.h>
 
-#include "lib.h"
-#include "adts.h"
+#include "lib/lib.h"
+#include "lib/adts.h"
 #include "file_internal.h"
-#include "allocators.h"
+#include "lib/allocators.h"
 
 
 // path types:

source/lib/res/file/path.h

@@ -23,7 +23,7 @@
 #ifndef VFS_PATH_H__
 #define VFS_PATH_H__
 
-#include "lib.h"
+#include "lib/lib.h"
 
 #define VFS_PATH_IS_DIR(path) (*path == '\0' || path[strlen(path)-1] == '/')
 

source/lib/res/file/vfs.cpp

@@ -37,7 +37,7 @@
 #include "lib/adts.h"
 #include "lib/timer.h"
 #include "lib/res/res.h"
-#include "sysdep/dir_watch.h"
+#include "lib/sysdep/dir_watch.h"
 #include "file_internal.h"
 
 // not safe to call before main!

source/lib/res/file/vfs_mount.cpp

@@ -23,7 +23,7 @@
 
 #include "precompiled.h"
 
-#include "sysdep/dir_watch.h"
+#include "lib/sysdep/dir_watch.h"
 #include "lib/res/h_mgr.h"
 #include "file_internal.h"
 

source/lib/res/file/vfs_tree.cpp

@@ -255,12 +255,12 @@ RealDir rd;	// HACK; removeme
 		if(!mem)
 			WARN_RETURN(ERR_NO_MEM);
 		TNode* node;
-#include "nommgr.h"
+#include "lib/nommgr.h"
 		if(type == NT_FILE)
 			node = new(mem) TFile(V_new_path, name, m);
 		else
 			node = new(mem) TDir (V_new_path, name, m);
-#include "mmgr.h"
+#include "lib/mmgr.h"
 
 		children.insert(name, node);
 
@@ -477,7 +477,7 @@ static void tree_root_init()
 	void* mem = node_alloc();
 	if(mem)
 		tree_root = new(mem) TDir("", "", 0);
-#include "mmgr.h"
+#include "lib/mmgr.h"
 }
 
 // destroy the tree root node and free any extra memory held by it.

source/lib/res/file/zip.cpp

@@ -25,11 +25,11 @@
 #include <time.h>
 #include <limits>
 
-#include "lib.h"
-#include "byte_order.h"
-#include "allocators.h"
-#include "timer.h"
-#include "self_test.h"
+#include "lib/lib.h"
+#include "lib/byte_order.h"
+#include "lib/allocators.h"
+#include "lib/timer.h"
+#include "lib/self_test.h"
 #include "file_internal.h"
 
 

source/lib/res/graphics/cursor.cpp

@@ -36,7 +36,7 @@
 
 #include "lib/ogl.h"
 #include "sysdep/sysdep.h"	// sys_cursor_*
-#include "../res.h"
+#include "lib/res/res.h"
 #include "ogl_tex.h"
 #include "cursor.h"