From 5814e101260e2654fffb451db15fe7b1fc5bbfc9 Mon Sep 17 00:00:00 2001 From: janwas Date: Fri, 2 Jun 2006 03:56:24 +0000 Subject: [PATCH] # complete revamp of build system in preparation for automated self tests. * now splits everything up into independent static libraries. * fixed a great deal of incorrect #include statements. all headers must now be specified with their full path relative to source. exception: if file being included and including file are in the same directory, no path needed. use <> when relying on the build system's include path (e.g. for system headers and external libraries, e.g. boost), otherwise "". * temporarily renamed maths/Vector2D to Vector2D_Maths to avoid conflict. these should be merged. * hacked around VC linker stupidness when building static libs; texture codecs must now be registered manually. This was SVN commit r3931. --- source/gui/GUIbase.h | 2 + source/lib/precompiled.h | 3 -- source/lib/res/file/compression.cpp | 2 +- source/lib/res/file/file_cache.cpp | 2 +- source/lib/res/file/file_io.cpp | 2 +- source/lib/res/file/vfs_redirector.cpp | 2 +- source/lib/res/file/vfs_tree.cpp | 2 +- source/lib/res/graphics/cursor.cpp | 2 +- source/lib/res/graphics/tex.h | 11 +++++ source/lib/res/graphics/tex_codec.cpp | 11 +++++ source/lib/res/graphics/tex_codec.h | 7 +++- source/lib/sysdep/cpu.cpp | 2 +- source/lib/sysdep/win/wdbg.cpp | 2 +- source/lib/sysdep/win/wsdl.cpp | 2 +- source/main.cpp | 4 +- source/maths/Noise.cpp | 14 +++---- source/maths/Noise.h | 4 +- source/maths/Vector2D.h | 42 +++++++++---------- source/ps/GameSetup/GameSetup.cpp | 4 +- source/ps/Network/Client.cpp | 4 +- source/ps/Network/Client.h | 4 +- source/ps/Network/JSEvents.h | 2 +- source/ps/Network/NetMessage.cpp | 2 +- source/ps/Network/NetMessage.h | 2 +- source/ps/Network/Network.cpp | 2 +- source/ps/Network/Server.cpp | 8 ++-- source/ps/Network/Server.h | 2 +- source/ps/Network/ServerSession.cpp | 4 +- source/ps/Network/ServerSession.h | 2 +- source/ps/Network/Session.cpp | 2 +- source/ps/Network/Session.h | 4 +- source/ps/Network/SessionManager.cpp | 6 +-- source/ps/scripting/JSInterface_Selection.cpp | 2 +- source/ps/scripting/JSInterface_VFS.cpp | 2 +- source/renderer/Renderer.cpp | 1 + source/renderer/TerrainRenderer.cpp | 1 + source/simulation/AStarEngine.h | 2 +- source/simulation/EntityFormation.h | 2 +- source/simulation/FormationManager.cpp | 2 +- source/simulation/PathfindEngine.h | 2 +- source/simulation/PathfindSparse.h | 2 +- .../scripting/JSInterface_Entity.cpp | 2 +- source/sound/CMusicPlayer.cpp | 2 +- .../tools/atlas/GameInterface/SharedMemory.h | 2 +- 44 files changed, 108 insertions(+), 78 deletions(-) diff --git a/source/gui/GUIbase.h b/source/gui/GUIbase.h index 818287bd03..c9bc33e48d 100644 --- a/source/gui/GUIbase.h +++ b/source/gui/GUIbase.h @@ -28,6 +28,8 @@ gee@pyro.nu // seem to be defined anywhere in the predefined header. #include "ps/Overlay.h" +#include "ps/Pyrogenesis.h" // deprecated DECLARE_ERROR + //-------------------------------------------------------- // Forward declarations //-------------------------------------------------------- diff --git a/source/lib/precompiled.h b/source/lib/precompiled.h index af5109cb73..b18952ec30 100644 --- a/source/lib/precompiled.h +++ b/source/lib/precompiled.h @@ -55,13 +55,10 @@ // headers made available everywhere for convenience // -// note: must not include #include "lib/types.h" #include "lib/string_s.h" // CRT secure string #include "lib/self_test.h" #include "lib/debug.h" -#include "ps/Pyrogenesis.h" // MICROLOG and old error system -#include // assert() // // memory headers diff --git a/source/lib/res/file/compression.cpp b/source/lib/res/file/compression.cpp index 63c58ddaaf..f92e8e77b4 100644 --- a/source/lib/res/file/compression.cpp +++ b/source/lib/res/file/compression.cpp @@ -436,7 +436,7 @@ uintptr_t comp_alloc(ContextType type, CompressionMethod method) #ifndef NO_ZLIB case CM_DEFLATE: cassert(sizeof(ZLibCompressor) <= MAX_COMPRESSOR_SIZE); -#include "nommgr.h" // protect placement new +#include "lib/nommgr.h" // protect placement new c = new(c_mem) ZLibCompressor(type); #include "lib/mmgr.h" break; diff --git a/source/lib/res/file/file_cache.cpp b/source/lib/res/file/file_cache.cpp index 1710479f04..462c75e98b 100644 --- a/source/lib/res/file/file_cache.cpp +++ b/source/lib/res/file/file_cache.cpp @@ -349,7 +349,7 @@ success: } // rationale: don't call this "free" because that would run afoul of the - // memory tracker's redirection macro and require #include "nommgr.h". + // memory tracker's redirection macro and require #include "lib/nommgr.h". void dealloc(u8* p, size_t size) { #ifndef NDEBUG diff --git a/source/lib/res/file/file_io.cpp b/source/lib/res/file/file_io.cpp index db85bd5366..91dc0d04ed 100644 --- a/source/lib/res/file/file_io.cpp +++ b/source/lib/res/file/file_io.cpp @@ -85,7 +85,7 @@ public: return (aiocb*)pool_alloc(&pool, 0); } // weird name to avoid trouble with mem tracker macros - // (renaming is less annoying than #include "nommgr.h") + // (renaming is less annoying than #include "lib/nommgr.h") void free_(void* cb) { pool_free(&pool, cb); diff --git a/source/lib/res/file/vfs_redirector.cpp b/source/lib/res/file/vfs_redirector.cpp index ed32d57a8a..4aa4f7054f 100644 --- a/source/lib/res/file/vfs_redirector.cpp +++ b/source/lib/res/file/vfs_redirector.cpp @@ -23,7 +23,7 @@ #include "precompiled.h" #include "file_internal.h" -#include "byte_order.h" // FOURCC +#include "lib/byte_order.h" // FOURCC static const u32 vtbl_magic = FOURCC('F','P','V','T'); diff --git a/source/lib/res/file/vfs_tree.cpp b/source/lib/res/file/vfs_tree.cpp index 51cc12ebda..8a6413fb4e 100644 --- a/source/lib/res/file/vfs_tree.cpp +++ b/source/lib/res/file/vfs_tree.cpp @@ -473,7 +473,7 @@ static void tree_root_init() // must not be called more than once without intervening tree_shutdown. debug_assert(!tree_root); -#include "nommgr.h" // placement new +#include "lib/nommgr.h" // placement new void* mem = node_alloc(); if(mem) tree_root = new(mem) TDir("", "", 0); diff --git a/source/lib/res/graphics/cursor.cpp b/source/lib/res/graphics/cursor.cpp index 2b5f2c46be..6d85c09065 100644 --- a/source/lib/res/graphics/cursor.cpp +++ b/source/lib/res/graphics/cursor.cpp @@ -35,7 +35,7 @@ #endif #include "lib/ogl.h" -#include "sysdep/sysdep.h" // sys_cursor_* +#include "lib/sysdep/sysdep.h" // sys_cursor_* #include "lib/res/res.h" #include "ogl_tex.h" #include "cursor.h" diff --git a/source/lib/res/graphics/tex.h b/source/lib/res/graphics/tex.h index 9fb1fd97d3..5d191273fc 100644 --- a/source/lib/res/graphics/tex.h +++ b/source/lib/res/graphics/tex.h @@ -220,6 +220,17 @@ extern void tex_set_global_orientation(int orientation); // open/close // +/** + * manually register codecs. must be called before first use of a + * codec (e.g. loading a texture). + * + * this would normally be taken care of by TEX_CODEC_REGISTER, but + * no longer works when building as a static library. + * workaround: hard-code a list of codecs in tex_codec.cpp and + * call their registration functions. + **/ +extern void tex_codec_register_all(); + /** * load the specified image from file into a Tex object. * diff --git a/source/lib/res/graphics/tex_codec.cpp b/source/lib/res/graphics/tex_codec.cpp index cdd5ed6ece..0b027cd89f 100644 --- a/source/lib/res/graphics/tex_codec.cpp +++ b/source/lib/res/graphics/tex_codec.cpp @@ -123,6 +123,17 @@ LibError tex_codec_transform(Tex* t, uint transforms) // helper functions used by codecs //----------------------------------------------------------------------------- +void tex_codec_register_all() +{ +#define REGISTER_CODEC(name) extern void name##_register(); name##_register() + REGISTER_CODEC(bmp); + REGISTER_CODEC(dds); + REGISTER_CODEC(jpg); + REGISTER_CODEC(png); + REGISTER_CODEC(tga); +#undef REGISTER_CODEC +} + // allocate an array of row pointers that point into the given texture data. // indicates whether the file format is top-down or // bottom-up; the row array is inverted if necessary to match global diff --git a/source/lib/res/graphics/tex_codec.h b/source/lib/res/graphics/tex_codec.h index 73db3f0bf6..5e3a12f401 100644 --- a/source/lib/res/graphics/tex_codec.h +++ b/source/lib/res/graphics/tex_codec.h @@ -140,7 +140,12 @@ struct TexCodecVTbl name##_is_hdr, name##_is_ext, name##_hdr_size,\ #name\ };\ - static int dummy = tex_codec_register(&vtbl); + /*static int dummy = tex_codec_register(&vtbl);*/\ + /* note: when building as a static library, pre-main initializers */\ + /* will not run! as a workaround, we build an externally visible */\ + /* registration function that must be called via */\ + /* tex_codec_register_all - see comments there. */\ + void name##_register() { tex_codec_register(&vtbl); } /** diff --git a/source/lib/sysdep/cpu.cpp b/source/lib/sysdep/cpu.cpp index 1e60153d44..611f623f5d 100644 --- a/source/lib/sysdep/cpu.cpp +++ b/source/lib/sysdep/cpu.cpp @@ -25,7 +25,7 @@ #include "lib/lib.h" #if CPU_IA32 -# include "sysdep/ia32.h" +# include "lib/sysdep/ia32.h" #endif char cpu_type[CPU_TYPE_LEN] = ""; diff --git a/source/lib/sysdep/win/wdbg.cpp b/source/lib/sysdep/win/wdbg.cpp index 1ea4be6894..941f7bddef 100644 --- a/source/lib/sysdep/win/wdbg.cpp +++ b/source/lib/sysdep/win/wdbg.cpp @@ -31,7 +31,7 @@ #include "lib/posix.h" #include "lib/sysdep/cpu.h" #include "wdbg.h" -#include "byte_order.h" // FOURCC +#include "lib/byte_order.h" // FOURCC #include "lib/app_hooks.h" diff --git a/source/lib/sysdep/win/wsdl.cpp b/source/lib/sysdep/win/wsdl.cpp index 2ec007c1b5..4353ad35ff 100644 --- a/source/lib/sysdep/win/wsdl.cpp +++ b/source/lib/sysdep/win/wsdl.cpp @@ -34,7 +34,7 @@ #include "lib/sdl.h" #include "lib/lib.h" #include "lib/posix.h" -#include "ogl.h" // needed to pull in the delay-loaded opengl32.dll +#include "lib/ogl.h" // needed to pull in the delay-loaded opengl32.dll #include "SDL_vkeys.h" diff --git a/source/main.cpp b/source/main.cpp index b13fd1cc48..511793a306 100644 --- a/source/main.cpp +++ b/source/main.cpp @@ -9,7 +9,9 @@ that of Atlas depending on commandline parameters. */ -#include "precompiled.h" +// not for any PCH effort, but instead for the (common) definitions +// included there. +#include "lib/precompiled.h" #include "lib/input.h" #include "lib/sdl.h" diff --git a/source/maths/Noise.cpp b/source/maths/Noise.cpp index 9045b8f3e3..b1675db998 100644 --- a/source/maths/Noise.cpp +++ b/source/maths/Noise.cpp @@ -25,14 +25,14 @@ namespace Noise2D::Noise2D(int f) { freq = f; - grads = new CVector2D*[freq]; + grads = new CVector2D_Maths*[freq]; for(int i=0; i /////////////////////////////////////////////////////////////////////////////// -// CVector2D: -class CVector2D +// CVector2D_Maths: +class CVector2D_Maths { public: - CVector2D() {} - CVector2D(float x,float y) { X=x; Y=y; } - CVector2D(const CVector2D& p) { X=p.X; Y=p.Y; } + CVector2D_Maths() {} + CVector2D_Maths(float x,float y) { X=x; Y=y; } + CVector2D_Maths(const CVector2D_Maths& p) { X=p.X; Y=p.Y; } operator float*() { return &X; @@ -31,49 +31,49 @@ public: return &X; } - CVector2D operator-() const { - return CVector2D(-X, -Y); + CVector2D_Maths operator-() const { + return CVector2D_Maths(-X, -Y); } - CVector2D operator+(const CVector2D& t) const { - return CVector2D(X+t.X, Y+t.Y); + CVector2D_Maths operator+(const CVector2D_Maths& t) const { + return CVector2D_Maths(X+t.X, Y+t.Y); } - CVector2D operator-(const CVector2D& t) const { - return CVector2D(X-t.X, Y-t.Y); + CVector2D_Maths operator-(const CVector2D_Maths& t) const { + return CVector2D_Maths(X-t.X, Y-t.Y); } - CVector2D operator*(float f) const { - return CVector2D(X*f, Y*f); + CVector2D_Maths operator*(float f) const { + return CVector2D_Maths(X*f, Y*f); } - CVector2D operator/(float f) const { + CVector2D_Maths operator/(float f) const { float inv=1.0f/f; - return CVector2D(X*inv, Y*inv); + return CVector2D_Maths(X*inv, Y*inv); } - CVector2D& operator+=(const CVector2D& t) { + CVector2D_Maths& operator+=(const CVector2D_Maths& t) { X+=t.X; Y+=t.Y; return *this; } - CVector2D& operator-=(const CVector2D& t) { + CVector2D_Maths& operator-=(const CVector2D_Maths& t) { X-=t.X; Y-=t.Y; return *this; } - CVector2D& operator*=(float f) { + CVector2D_Maths& operator*=(float f) { X*=f; Y*=f; return *this; } - CVector2D& operator/=(float f) { + CVector2D_Maths& operator/=(float f) { float invf=1.0f/f; X*=invf; Y*=invf; return *this; } - float Dot(const CVector2D& a) const { + float Dot(const CVector2D_Maths& a) const { return X*a.X + Y*a.Y; } diff --git a/source/ps/GameSetup/GameSetup.cpp b/source/ps/GameSetup/GameSetup.cpp index b7020040bc..fc7ee4ae63 100644 --- a/source/ps/GameSetup/GameSetup.cpp +++ b/source/ps/GameSetup/GameSetup.cpp @@ -81,8 +81,6 @@ #include "ps/Network/Server.h" #include "ps/Network/Client.h" -#include "GameSetup/Config.h" - #include "Atlas.h" #include "GameSetup.h" #include "Config.h" @@ -957,6 +955,8 @@ void Init(int argc, char* argv[], uint flags) SDL_WM_SetCaption("0 A.D.", "0 A.D."); } + tex_codec_register_all(); + uint quality = SANE_TEX_QUALITY_DEFAULT; // TODO: set value from config file SetTextureQuality(quality); diff --git a/source/ps/Network/Client.cpp b/source/ps/Network/Client.cpp index af91063a73..5048da1597 100644 --- a/source/ps/Network/Client.cpp +++ b/source/ps/Network/Client.cpp @@ -5,8 +5,8 @@ #include "scripting/DOMEvent.h" #include "scripting/JSConversions.h" #include "scripting/ScriptableObject.h" -#include "Network/Client.h" -#include "Network/JSEvents.h" +#include "Client.h" +#include "JSEvents.h" #include "ps/CStr.h" #include "ps/CLogger.h" #include "ps/CConsole.h" diff --git a/source/ps/Network/Client.h b/source/ps/Network/Client.h index 80a6b38163..771a76dc02 100644 --- a/source/ps/Network/Client.h +++ b/source/ps/Network/Client.h @@ -1,8 +1,8 @@ #ifndef _Network_NetClient_H #define _Network_NetClient_H -#include -#include +#include "ps/CStr.h" +#include "Session.h" #include "simulation/TurnManager.h" #include "simulation/ScriptObject.h" diff --git a/source/ps/Network/JSEvents.h b/source/ps/Network/JSEvents.h index 379c479d9a..b2a9211f57 100644 --- a/source/ps/Network/JSEvents.h +++ b/source/ps/Network/JSEvents.h @@ -1,7 +1,7 @@ #ifndef _Network_JSEvents_H #define _Network_JSEvents_H -#include "Network/ServerSession.h" +#include "ServerSession.h" enum ENetworkJSEvents { diff --git a/source/ps/Network/NetMessage.cpp b/source/ps/Network/NetMessage.cpp index 4fc565e9cd..b0f200f997 100644 --- a/source/ps/Network/NetMessage.cpp +++ b/source/ps/Network/NetMessage.cpp @@ -6,7 +6,7 @@ #include #include "simulation/Entity.h" -#include "Vector2D.h" +#include "ps/Vector2D.h" #define ALLNETMSGS_IMPLEMENT #include "NetMessage.h" diff --git a/source/ps/Network/NetMessage.h b/source/ps/Network/NetMessage.h index b92418c937..144cfe0d40 100644 --- a/source/ps/Network/NetMessage.h +++ b/source/ps/Network/NetMessage.h @@ -3,7 +3,7 @@ #include "lib/types.h" #include "Serialization.h" -#include "Network/SocketBase.h" +#include "SocketBase.h" // We need the enum from AllNetMessages.h, but we can't create any classes in // AllNetMessages, since they in turn require CNetMessage to be defined diff --git a/source/ps/Network/Network.cpp b/source/ps/Network/Network.cpp index dd3509075a..0712fb7e84 100644 --- a/source/ps/Network/Network.cpp +++ b/source/ps/Network/Network.cpp @@ -4,7 +4,7 @@ #include "Serialization.h" #include -#include +#include "ps/CLogger.h" #include "NetLog.h" DEFINE_ERROR(CONFLICTING_OP_IN_PROGRESS, "A conflicting operation is already in progress"); diff --git a/source/ps/Network/Server.cpp b/source/ps/Network/Server.cpp index 83fbef09ff..0f04cade8c 100644 --- a/source/ps/Network/Server.cpp +++ b/source/ps/Network/Server.cpp @@ -2,10 +2,10 @@ #include -#include "Network/Server.h" -#include "Network/ServerSession.h" -#include "Network/Network.h" -#include "Network/JSEvents.h" +#include "Server.h" +#include "ServerSession.h" +#include "Network.h" +#include "JSEvents.h" #include "scripting/ScriptableObject.h" diff --git a/source/ps/Network/Server.h b/source/ps/Network/Server.h index e3b5e037b4..24c5796957 100644 --- a/source/ps/Network/Server.h +++ b/source/ps/Network/Server.h @@ -1,7 +1,7 @@ #ifndef _Network_NetServer_H #define _Network_NetServer_H -#include "Network/Session.h" +#include "Session.h" #include "ps/GameAttributes.h" #include "simulation/TurnManager.h" #include "ps/scripting/JSMap.h" diff --git a/source/ps/Network/ServerSession.cpp b/source/ps/Network/ServerSession.cpp index ab56c495aa..728693360d 100644 --- a/source/ps/Network/ServerSession.cpp +++ b/source/ps/Network/ServerSession.cpp @@ -1,7 +1,7 @@ #include "precompiled.h" -#include "Network/ServerSession.h" -#include "Network/Server.h" +#include "ServerSession.h" +#include "Server.h" #include "ps/CLogger.h" #include "ps/CConsole.h" diff --git a/source/ps/Network/ServerSession.h b/source/ps/Network/ServerSession.h index eca764958e..7881d2e272 100644 --- a/source/ps/Network/ServerSession.h +++ b/source/ps/Network/ServerSession.h @@ -10,7 +10,7 @@ #ifndef _Network_ServerSession_H #define _Network_ServerSession_H -#include "Network/Session.h" +#include "Session.h" #include "scripting/ScriptableObject.h" class CNetServer; diff --git a/source/ps/Network/Session.cpp b/source/ps/Network/Session.cpp index 4362e5f260..50769fb724 100644 --- a/source/ps/Network/Session.cpp +++ b/source/ps/Network/Session.cpp @@ -1,6 +1,6 @@ #include "precompiled.h" -#include +#include "Session.h" CNetSession::~CNetSession() { diff --git a/source/ps/Network/Session.h b/source/ps/Network/Session.h index 4462ad1154..9eceb35ed3 100644 --- a/source/ps/Network/Session.h +++ b/source/ps/Network/Session.h @@ -1,8 +1,8 @@ #ifndef _Network_NetSession_H #define _Network_NetSession_H -#include -#include +#include "Network.h" +#include "SessionManager.h" /* CNetSession diff --git a/source/ps/Network/SessionManager.cpp b/source/ps/Network/SessionManager.cpp index d3825ac460..e94248180a 100644 --- a/source/ps/Network/SessionManager.cpp +++ b/source/ps/Network/SessionManager.cpp @@ -1,8 +1,8 @@ #include "precompiled.h" -#include -#include -#include +#include "Session.h" +#include "Network.h" +#include "ps/CLogger.h" using namespace std; diff --git a/source/ps/scripting/JSInterface_Selection.cpp b/source/ps/scripting/JSInterface_Selection.cpp index 8841e58ecb..22d2c8e939 100644 --- a/source/ps/scripting/JSInterface_Selection.cpp +++ b/source/ps/scripting/JSInterface_Selection.cpp @@ -4,7 +4,7 @@ #include "precompiled.h" #include "JSInterface_Selection.h" -#include "scripting/JSCollection.h" +#include "ps/scripting/JSCollection.h" #include "ps/Interact.h" JSBool JSI_Selection::getSelection( JSContext* UNUSED(cx), JSObject* UNUSED(obj), diff --git a/source/ps/scripting/JSInterface_VFS.cpp b/source/ps/scripting/JSInterface_VFS.cpp index 99734fb974..763c8859ab 100644 --- a/source/ps/scripting/JSInterface_VFS.cpp +++ b/source/ps/scripting/JSInterface_VFS.cpp @@ -8,7 +8,7 @@ #include "lib/res/file/vfs_optimizer.h" // ArchiveBuilderCancel #include "scripting/ScriptingHost.h" #include "scripting/JSConversions.h" -#include "scripting/JSInterface_VFS.h" +#include "ps/scripting/JSInterface_VFS.h" // shared error handling code #define JS_CHECK_FILE_ERR(err)\ diff --git a/source/renderer/Renderer.cpp b/source/renderer/Renderer.cpp index b3e7347045..7dc9cc705f 100644 --- a/source/renderer/Renderer.cpp +++ b/source/renderer/Renderer.cpp @@ -25,6 +25,7 @@ #include "graphics/Texture.h" #include "graphics/LightEnv.h" #include "graphics/Terrain.h" +#include "ps/Pyrogenesis.h" // MICROLOG #include "ps/CLogger.h" #include "ps/Game.h" #include "ps/Profile.h" diff --git a/source/renderer/TerrainRenderer.cpp b/source/renderer/TerrainRenderer.cpp index 7dbec7941a..df2bc14542 100644 --- a/source/renderer/TerrainRenderer.cpp +++ b/source/renderer/TerrainRenderer.cpp @@ -21,6 +21,7 @@ #include "ps/Game.h" #include "ps/Profile.h" +#include "ps/Pyrogenesis.h" // MICROLOG #include "simulation/LOSManager.h" diff --git a/source/simulation/AStarEngine.h b/source/simulation/AStarEngine.h index aeafb52b24..3df5d3be1a 100644 --- a/source/simulation/AStarEngine.h +++ b/source/simulation/AStarEngine.h @@ -1,7 +1,7 @@ #ifndef __ASTAR_ENGINE_H__ #define __ASTAR_ENGINE_H__ -#include "Vector2D.h" +#include "ps/Vector2D.h" #include "ps/Player.h" #include "lib/types.h" #include diff --git a/source/simulation/EntityFormation.h b/source/simulation/EntityFormation.h index 16aa549ec2..fa35c05a0f 100644 --- a/source/simulation/EntityFormation.h +++ b/source/simulation/EntityFormation.h @@ -9,7 +9,7 @@ #include "BaseFormation.h" #include "EntitySupport.h" -#include "Vector2D.h" +#include "ps/Vector2D.h" class CVector2D; class CEntity; diff --git a/source/simulation/FormationManager.cpp b/source/simulation/FormationManager.cpp index 54a416a383..7dd6ab4966 100644 --- a/source/simulation/FormationManager.cpp +++ b/source/simulation/FormationManager.cpp @@ -6,7 +6,7 @@ #include "BaseFormation.h" #include "EntityFormation.h" -#include "Vector2D.h" +#include "ps/Vector2D.h" CFormationManager::~CFormationManager() { diff --git a/source/simulation/PathfindEngine.h b/source/simulation/PathfindEngine.h index 15e235509e..3308841741 100644 --- a/source/simulation/PathfindEngine.h +++ b/source/simulation/PathfindEngine.h @@ -13,7 +13,7 @@ #include "ps/Singleton.h" #include "EntityHandles.h" -#include "Vector2D.h" +#include "ps/Vector2D.h" #include "AStarEngine.h" #define g_Pathfinder CPathfindEngine::GetSingleton() diff --git a/source/simulation/PathfindSparse.h b/source/simulation/PathfindSparse.h index fccb4c250d..4c2a724443 100644 --- a/source/simulation/PathfindSparse.h +++ b/source/simulation/PathfindSparse.h @@ -23,7 +23,7 @@ #define PATHFIND_SPARSE_INCLUDED #include "EntityHandles.h" -#include "Vector2D.h" +#include "ps/Vector2D.h" #include "Collision.h" struct sparsePathTree diff --git a/source/simulation/scripting/JSInterface_Entity.cpp b/source/simulation/scripting/JSInterface_Entity.cpp index f5d48e8de1..f6d78a2813 100644 --- a/source/simulation/scripting/JSInterface_Entity.cpp +++ b/source/simulation/scripting/JSInterface_Entity.cpp @@ -1,7 +1,7 @@ #include "precompiled.h" #include "JSInterface_Entity.h" -#include "scripting/JSInterface_BaseEntity.h" +#include "JSInterface_BaseEntity.h" #include "maths/scripting/JSInterface_Vector3D.h" #include "simulation/EntityHandles.h" #include "simulation/Entity.h" diff --git a/source/sound/CMusicPlayer.cpp b/source/sound/CMusicPlayer.cpp index 541b8c1ca5..6f459e3a94 100644 --- a/source/sound/CMusicPlayer.cpp +++ b/source/sound/CMusicPlayer.cpp @@ -1,7 +1,7 @@ #include "precompiled.h" #include "CMusicPlayer.h" -#include "CLogger.h" +#include "ps/CLogger.h" #include #include diff --git a/source/tools/atlas/GameInterface/SharedMemory.h b/source/tools/atlas/GameInterface/SharedMemory.h index d8dbe9ccee..d0ccab0559 100644 --- a/source/tools/atlas/GameInterface/SharedMemory.h +++ b/source/tools/atlas/GameInterface/SharedMemory.h @@ -9,7 +9,7 @@ # ifdef __WXWINDOWS__ # undef new # else -# include "nommgr.h" +# include "lib/nommgr.h" # endif #endif