From 6aa30b9103cbbfed54d0c78602a0cd940e11fae7 Mon Sep 17 00:00:00 2001 From: Xottab-DUTY Date: Fri, 22 Dec 2017 23:40:47 +0500 Subject: [PATCH] Move Platform.hpp inclusion into Common.hpp Except xrLC_LightStab.h Add XXX to CommonImportExport.inl --- Externals/OPCODE/pch.hpp | 1 - Externals/cximage/ximacfg.h | 1 - src/Common/Common.hpp | 1 + src/Common/CommonImportExport.inl | 4 ++++ src/Layers/xrAPI/stdafx.h | 1 - src/Layers/xrRenderPC_R1/stdafx.h | 1 - src/Layers/xrRenderPC_R2/stdafx.h | 1 - src/Layers/xrRenderPC_R3/stdafx.h | 1 - src/Layers/xrRenderPC_R4/stdafx.h | 1 - src/utils/ETools/StdAfx.h | 4 ---- src/utils/LWO/StdAfx.h | 4 ---- src/utils/mp_configs_verifyer/pch.h | 1 - src/utils/mp_screenshots_info/pch.h | 1 - src/utils/xrAI/StdAfx.h | 1 - src/utils/xrCompress/StdAfx.h | 1 - src/utils/xrDO_Light/StdAfx.h | 1 - src/utils/xrDXT/StdAfx.h | 2 -- src/utils/xrLC/Build.h | 1 - src/utils/xrLC/StdAfx.h | 1 - src/utils/xrLCUtil/pch.hpp | 1 - src/utils/xrLC_Light/stdafx.h | 1 - src/utils/xrLC_LightStab/xrLC_LightStab.cpp | 2 +- src/utils/xrMiscMath/pch.hpp | 1 - src/utils/xrQSlim/src/stdafx.h | 1 - src/utils/xrSE_Factory/stdafx.h | 1 - src/xrAICore/pch.hpp | 1 - src/xrCDB/StdAfx.h | 1 - src/xrCore/stdafx.h | 2 -- src/xrD3D9-Null/stdafx.h | 1 - src/xrEngine/stdafx.h | 1 - src/xrGame/StdAfx.h | 1 - src/xrGameSpy/stdafx.h | 1 - src/xrMisc/pch.hpp | 1 - src/xrNetServer/stdafx.h | 1 - src/xrParticles/stdafx.h | 1 - src/xrPhysics/stdafx.h | 1 - src/xrScriptEngine/pch.hpp | 1 - src/xrSound/stdafx.h | 1 - 38 files changed, 6 insertions(+), 44 deletions(-) diff --git a/Externals/OPCODE/pch.hpp b/Externals/OPCODE/pch.hpp index edd1d928f6c..a038bb7eeb6 100644 --- a/Externals/OPCODE/pch.hpp +++ b/Externals/OPCODE/pch.hpp @@ -2,7 +2,6 @@ #include -#include "Common/Platform.hpp" #include "Common/Common.hpp" #include "xrCore/xrCore.h" #include "xrCore/doug_lea_allocator.h" diff --git a/Externals/cximage/ximacfg.h b/Externals/cximage/ximacfg.h index 33cea700605..0bdb2af8692 100644 --- a/Externals/cximage/ximacfg.h +++ b/Externals/cximage/ximacfg.h @@ -7,7 +7,6 @@ extern "C" void* cxrealloc(void* ptr, size_t size); #ifdef CXIMAGE_AS_SHARED_LIBRARY //must be defined in Release_Shared configuration -#include "Common/Platform.hpp" #include "Common/Common.hpp" // XXX: dirty hack. #undef max diff --git a/src/Common/Common.hpp b/src/Common/Common.hpp index b180e7378bd..e889e49e3d3 100644 --- a/src/Common/Common.hpp +++ b/src/Common/Common.hpp @@ -1,5 +1,6 @@ #pragma once #include "Common/Config.hpp" +#include "Common/Platform.hpp" #include "Common/CommonImportExport.inl" #include "Include/xrAPI/xrAPI.h" diff --git a/src/Common/CommonImportExport.inl b/src/Common/CommonImportExport.inl index 6543fe9d8b3..7b472a50227 100644 --- a/src/Common/CommonImportExport.inl +++ b/src/Common/CommonImportExport.inl @@ -1,5 +1,9 @@ #pragma once +// XXX: Add remaining defines +// XXX: Get rid of NO_ENGINE_API +// XXX: Get rid of DLL_API (maybe) + #ifdef XRAPI_EXPORTS #define XRAPI_API XR_EXPORT #else diff --git a/src/Layers/xrAPI/stdafx.h b/src/Layers/xrAPI/stdafx.h index 4687b021629..7037c36f9f6 100644 --- a/src/Layers/xrAPI/stdafx.h +++ b/src/Layers/xrAPI/stdafx.h @@ -1,4 +1,3 @@ #pragma once -#include "Common/Platform.hpp" #include "Common/Common.hpp" diff --git a/src/Layers/xrRenderPC_R1/stdafx.h b/src/Layers/xrRenderPC_R1/stdafx.h index 695f8010dc4..12594eed02d 100644 --- a/src/Layers/xrRenderPC_R1/stdafx.h +++ b/src/Layers/xrRenderPC_R1/stdafx.h @@ -1,6 +1,5 @@ #pragma once -#include "Common/Platform.hpp" #include "Common/Common.hpp" #ifdef _DEBUG diff --git a/src/Layers/xrRenderPC_R2/stdafx.h b/src/Layers/xrRenderPC_R2/stdafx.h index 18ba2c5f171..b63ffbbacd8 100644 --- a/src/Layers/xrRenderPC_R2/stdafx.h +++ b/src/Layers/xrRenderPC_R2/stdafx.h @@ -1,6 +1,5 @@ #pragma once -#include "Common/Platform.hpp" #include "Common/Common.hpp" #ifdef _DEBUG diff --git a/src/Layers/xrRenderPC_R3/stdafx.h b/src/Layers/xrRenderPC_R3/stdafx.h index bd9a2322c5e..64fa6fd234f 100644 --- a/src/Layers/xrRenderPC_R3/stdafx.h +++ b/src/Layers/xrRenderPC_R3/stdafx.h @@ -1,6 +1,5 @@ #pragma once -#include "Common/Platform.hpp" #include "Common/Common.hpp" #ifdef _DEBUG diff --git a/src/Layers/xrRenderPC_R4/stdafx.h b/src/Layers/xrRenderPC_R4/stdafx.h index 4f48dbe0bc3..7874f906c24 100644 --- a/src/Layers/xrRenderPC_R4/stdafx.h +++ b/src/Layers/xrRenderPC_R4/stdafx.h @@ -1,6 +1,5 @@ #pragma once -#include "Common/Platform.hpp" #include "Common/Common.hpp" #ifdef _DEBUG diff --git a/src/utils/ETools/StdAfx.h b/src/utils/ETools/StdAfx.h index 07f0de01f79..576c930d491 100644 --- a/src/utils/ETools/StdAfx.h +++ b/src/utils/ETools/StdAfx.h @@ -2,7 +2,6 @@ #define ENGINE_API #define NO_XRC_STATS -#include "Common/Platform.hpp" #include "Common/Common.hpp" #include "xrCore/xrCore.h" @@ -17,6 +16,3 @@ #pragma warning(disable : 4786) // too long names #pragma warning(disable : 4503) // decorated name length exceeded #pragma warning(disable : 4251) // object needs DLL interface - -//{{AFX_INSERT_LOCATION}} -// Microsoft Visual C++ will insert additional declarations immediately before the previous line. diff --git a/src/utils/LWO/StdAfx.h b/src/utils/LWO/StdAfx.h index 6d9505f7d18..96fefa493b6 100644 --- a/src/utils/LWO/StdAfx.h +++ b/src/utils/LWO/StdAfx.h @@ -1,6 +1,5 @@ #pragma once -#include "Common/Platform.hpp" #include "Common/Common.hpp" #include @@ -8,6 +7,3 @@ #include #include #include - -//{{AFX_INSERT_LOCATION}} -// Microsoft Visual C++ will insert additional declarations immediately before the previous line. diff --git a/src/utils/mp_configs_verifyer/pch.h b/src/utils/mp_configs_verifyer/pch.h index 33df98c9033..c7ce339f04d 100644 --- a/src/utils/mp_configs_verifyer/pch.h +++ b/src/utils/mp_configs_verifyer/pch.h @@ -1,6 +1,5 @@ #pragma once -#include "Common/Platform.hpp" #include "Common/Common.hpp" #include "xrCore/xrCore.h" #include "xrCore/LocatorAPI.h" diff --git a/src/utils/mp_screenshots_info/pch.h b/src/utils/mp_screenshots_info/pch.h index 50bd4fcf332..008937e6545 100644 --- a/src/utils/mp_screenshots_info/pch.h +++ b/src/utils/mp_screenshots_info/pch.h @@ -1,6 +1,5 @@ #pragma once -#include "Common/Platform.hpp" #include "Common/Common.hpp" #include "xrCore/xrCore.h" #include "xrCore/LocatorAPI.h" diff --git a/src/utils/xrAI/StdAfx.h b/src/utils/xrAI/StdAfx.h index cff3309a50f..4aaf26296fd 100644 --- a/src/utils/xrAI/StdAfx.h +++ b/src/utils/xrAI/StdAfx.h @@ -1,6 +1,5 @@ #pragma once -#include "Common/Platform.hpp" #include "Common/Common.hpp" #include "xrCore/xrCore.h" diff --git a/src/utils/xrCompress/StdAfx.h b/src/utils/xrCompress/StdAfx.h index 7621cf56cf4..6f414780cbd 100644 --- a/src/utils/xrCompress/StdAfx.h +++ b/src/utils/xrCompress/StdAfx.h @@ -2,7 +2,6 @@ //. #define MOD_COMPRESS -#include "Common/Platform.hpp" #include "Common/Common.hpp" #include "xrCore/xrCore.h" diff --git a/src/utils/xrDO_Light/StdAfx.h b/src/utils/xrDO_Light/StdAfx.h index 75a6238f025..63d4139fcab 100644 --- a/src/utils/xrDO_Light/StdAfx.h +++ b/src/utils/xrDO_Light/StdAfx.h @@ -1,6 +1,5 @@ #pragma once -#include "Common/Platform.hpp" #include "Common/Common.hpp" #include "xrCore/xrCore.h" diff --git a/src/utils/xrDXT/StdAfx.h b/src/utils/xrDXT/StdAfx.h index da13a630a97..e3f809f822f 100644 --- a/src/utils/xrDXT/StdAfx.h +++ b/src/utils/xrDXT/StdAfx.h @@ -1,6 +1,5 @@ #pragma once -#include "Common/Platform.hpp" #include "Common/Common.hpp" #include "xrCore/xrCore.h" #include @@ -18,5 +17,4 @@ ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24)) #endif // defined(MAKEFOURCC) -#pragma comment(lib, "xrCore.lib") #pragma warning(disable : 4995) diff --git a/src/utils/xrLC/Build.h b/src/utils/xrLC/Build.h index fcad4cd5619..4eee06c1bb5 100644 --- a/src/utils/xrLC/Build.h +++ b/src/utils/xrLC/Build.h @@ -1,5 +1,4 @@ #pragma once -#include "Common/Platform.hpp" #include "xrCore/FS.h" #include "utils/Shader_xrLC.h" struct STextureParams; diff --git a/src/utils/xrLC/StdAfx.h b/src/utils/xrLC/StdAfx.h index 55cafb2e393..865e40f8da9 100644 --- a/src/utils/xrLC/StdAfx.h +++ b/src/utils/xrLC/StdAfx.h @@ -1,5 +1,4 @@ #pragma once -#include "Common/Platform.hpp" #include "Common/Common.hpp" #include "utils/xrLC_Light/xrLC_Light.h" diff --git a/src/utils/xrLCUtil/pch.hpp b/src/utils/xrLCUtil/pch.hpp index 77e47c294dd..9f0811efeaf 100644 --- a/src/utils/xrLCUtil/pch.hpp +++ b/src/utils/xrLCUtil/pch.hpp @@ -1,4 +1,3 @@ #pragma once -#include "Common/Platform.hpp" #include "Common/Common.hpp" #include "xrLCUtil.hpp" diff --git a/src/utils/xrLC_Light/stdafx.h b/src/utils/xrLC_Light/stdafx.h index e233771a1df..32a907cfec0 100644 --- a/src/utils/xrLC_Light/stdafx.h +++ b/src/utils/xrLC_Light/stdafx.h @@ -1,6 +1,5 @@ #pragma once -#include "Common/Platform.hpp" #include "Common/Common.hpp" //#define COLLECT_EXECUTION_STATS diff --git a/src/utils/xrLC_LightStab/xrLC_LightStab.cpp b/src/utils/xrLC_LightStab/xrLC_LightStab.cpp index e8361b82db6..f5496c526c1 100644 --- a/src/utils/xrLC_LightStab/xrLC_LightStab.cpp +++ b/src/utils/xrLC_LightStab/xrLC_LightStab.cpp @@ -1,4 +1,4 @@ -#include "xrlc_lightstab.h" +#include "xrLC_LightStab.h" #include "utils/xrLC_Light/net_light.h" #include "utils/xrLC_Light/lightstab_interface.h" diff --git a/src/utils/xrMiscMath/pch.hpp b/src/utils/xrMiscMath/pch.hpp index 4687b021629..7037c36f9f6 100644 --- a/src/utils/xrMiscMath/pch.hpp +++ b/src/utils/xrMiscMath/pch.hpp @@ -1,4 +1,3 @@ #pragma once -#include "Common/Platform.hpp" #include "Common/Common.hpp" diff --git a/src/utils/xrQSlim/src/stdafx.h b/src/utils/xrQSlim/src/stdafx.h index b298ca547a6..e35b40b0586 100644 --- a/src/utils/xrQSlim/src/stdafx.h +++ b/src/utils/xrQSlim/src/stdafx.h @@ -1,6 +1,5 @@ #pragma once -#include "Common/Platform.hpp" #include "Common/Common.hpp" #include "xrCore/xrCore.h" diff --git a/src/utils/xrSE_Factory/stdafx.h b/src/utils/xrSE_Factory/stdafx.h index a36b59627ff..d10ae36d93a 100644 --- a/src/utils/xrSE_Factory/stdafx.h +++ b/src/utils/xrSE_Factory/stdafx.h @@ -8,7 +8,6 @@ #pragma once -#include "Common/Platform.hpp" #include "Common/Common.hpp" #include "xrCore/xrCore.h" diff --git a/src/xrAICore/pch.hpp b/src/xrAICore/pch.hpp index 4687b021629..7037c36f9f6 100644 --- a/src/xrAICore/pch.hpp +++ b/src/xrAICore/pch.hpp @@ -1,4 +1,3 @@ #pragma once -#include "Common/Platform.hpp" #include "Common/Common.hpp" diff --git a/src/xrCDB/StdAfx.h b/src/xrCDB/StdAfx.h index 0e2f5664ddc..8a918ff0757 100644 --- a/src/xrCDB/StdAfx.h +++ b/src/xrCDB/StdAfx.h @@ -1,6 +1,5 @@ #pragma once -#include "Common/Platform.hpp" #include "Common/Common.hpp" #include "xrCore/xrCore.h" diff --git a/src/xrCore/stdafx.h b/src/xrCore/stdafx.h index 72bbcb63118..6772cb5f569 100644 --- a/src/xrCore/stdafx.h +++ b/src/xrCore/stdafx.h @@ -2,8 +2,6 @@ #pragma warning(disable : 4661) -#include "Common/Platform.hpp" #include "Common/Common.hpp" #include "xrCore.h" #include "Common/Util.hpp" -//#include "Include/xrAPI/xrAPI.h" diff --git a/src/xrD3D9-Null/stdafx.h b/src/xrD3D9-Null/stdafx.h index dea0b379bea..48960351aeb 100644 --- a/src/xrD3D9-Null/stdafx.h +++ b/src/xrD3D9-Null/stdafx.h @@ -4,7 +4,6 @@ #define D3D_DEBUG_INFO #endif -#include "Common/Platform.hpp" #include "Common/Common.hpp" #include #include diff --git a/src/xrEngine/stdafx.h b/src/xrEngine/stdafx.h index 98e26ef8131..c2ecdf08bfe 100644 --- a/src/xrEngine/stdafx.h +++ b/src/xrEngine/stdafx.h @@ -1,6 +1,5 @@ #pragma once -#include "Common/Platform.hpp" #include "Common/Common.hpp" #ifdef _EDITOR diff --git a/src/xrGame/StdAfx.h b/src/xrGame/StdAfx.h index bf0398b0713..d12ec291ea3 100644 --- a/src/xrGame/StdAfx.h +++ b/src/xrGame/StdAfx.h @@ -1,6 +1,5 @@ #pragma once -#include "Common/Platform.hpp" #include "Common/Common.hpp" #pragma warning(push) diff --git a/src/xrGameSpy/stdafx.h b/src/xrGameSpy/stdafx.h index 67baee004ef..c2f0f535b1c 100644 --- a/src/xrGameSpy/stdafx.h +++ b/src/xrGameSpy/stdafx.h @@ -1,6 +1,5 @@ #pragma once -#include "Common/Platform.hpp" #include "Common/Common.hpp" #include "xrCore/xrCore.h" diff --git a/src/xrMisc/pch.hpp b/src/xrMisc/pch.hpp index 4687b021629..7037c36f9f6 100644 --- a/src/xrMisc/pch.hpp +++ b/src/xrMisc/pch.hpp @@ -1,4 +1,3 @@ #pragma once -#include "Common/Platform.hpp" #include "Common/Common.hpp" diff --git a/src/xrNetServer/stdafx.h b/src/xrNetServer/stdafx.h index 86a58c8c68c..0d17f8d3797 100644 --- a/src/xrNetServer/stdafx.h +++ b/src/xrNetServer/stdafx.h @@ -1,6 +1,5 @@ #pragma once -#include "Common/Platform.hpp" #include "Common/Common.hpp" #include "xrCore/xrCore.h" diff --git a/src/xrParticles/stdafx.h b/src/xrParticles/stdafx.h index e76dd7d5f66..dfe9d83b064 100644 --- a/src/xrParticles/stdafx.h +++ b/src/xrParticles/stdafx.h @@ -1,6 +1,5 @@ #pragma once -#include "Common/Platform.hpp" #include "Common/Common.hpp" #include "xrCore/xrCore.h" #include "psystem.h" diff --git a/src/xrPhysics/stdafx.h b/src/xrPhysics/stdafx.h index 91ffea515ca..da4c920d64f 100644 --- a/src/xrPhysics/stdafx.h +++ b/src/xrPhysics/stdafx.h @@ -1,6 +1,5 @@ #pragma once -#include "Common/Platform.hpp" #include "Common/Common.hpp" #define MTL_EXPORT_API diff --git a/src/xrScriptEngine/pch.hpp b/src/xrScriptEngine/pch.hpp index 4da5c49b421..6f632d543f9 100644 --- a/src/xrScriptEngine/pch.hpp +++ b/src/xrScriptEngine/pch.hpp @@ -1,4 +1,3 @@ #pragma once -#include "Common/Platform.hpp" #include "Common/Common.hpp" #include "xrScriptEngine.hpp" diff --git a/src/xrSound/stdafx.h b/src/xrSound/stdafx.h index bd172fae93a..503fbba99f7 100644 --- a/src/xrSound/stdafx.h +++ b/src/xrSound/stdafx.h @@ -1,6 +1,5 @@ #pragma once -#include "Common/Platform.hpp" #include "Common/Common.hpp" #include "xrCore/xrCore.h"