Move Platform.hpp inclusion into Common.hpp

Except xrLC_LightStab.h Add XXX to CommonImportExport.inl
digitall · Dec 22, 2017 · 6aa30b9 · 6aa30b9
1 parent 246fba2
commit 6aa30b9
Show file tree

Hide file tree

Showing 38 changed files with 6 additions and 44 deletions.
diff --git a/Externals/OPCODE/pch.hpp b/Externals/OPCODE/pch.hpp
@@ -2,7 +2,6 @@
 
 #include <algorithm>
 
-#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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,13 +1,9 @@
 #pragma once
 
-#include "Common/Platform.hpp"
 #include "Common/Common.hpp"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
 #include <string.h>
 #include <limits.h>
-
-//{{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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "Common/Platform.hpp"
 #include "Common/Common.hpp"
 #include "xrCore/xrCore.h"
 #include <io.h>
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -4,7 +4,6 @@
 #define D3D_DEBUG_INFO
 #endif
 
-#include "Common/Platform.hpp"
 #include "Common/Common.hpp"
 #include <stdlib.h>
 #include <objbase.h>

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "Common/Platform.hpp"
 #include "Common/Common.hpp"
 #include "xrCore/xrCore.h"