xrEngine: Removed d3d9.h dependency.

Author: Jules Blok <[email protected]> Author: Alexandr Akulich <[email protected]> Based on commit 46c36e6 from Armada651/xray repository.
digitall · Nov 10, 2015 · e87cb0d · e87cb0d
1 parent 1c13715
commit e87cb0d
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 13 deletions.
diff --git a/src/Layers/xrRenderPC_R1/stdafx.h b/src/Layers/xrRenderPC_R1/stdafx.h
@@ -1,13 +1,21 @@
 #pragma once
+
+#ifdef _DEBUG
+#      define D3D_DEBUG_INFO
+#endif
+
 #pragma warning(disable:4995)
 #include "xrEngine/stdafx.h"
 #pragma warning(disable:4995)
+#include <d3d9.h>
 #include <d3dx9.h>
 #pragma warning(default:4995)
 #pragma warning(disable:4714)
 #pragma warning( 4 : 4018 )
 #pragma warning( 4 : 4244 )
 
+#pragma comment( lib, "d3d9.lib" )
+
 #include "Layers/xrRender/xrD3DDefs.h"
 #include "Layers/xrRender/HW.h"
 #include "Layers/xrRender/Shader.h"

diff --git a/src/Layers/xrRenderPC_R2/stdafx.h b/src/Layers/xrRenderPC_R2/stdafx.h
@@ -4,16 +4,23 @@
 
 #pragma once
 
+#ifdef _DEBUG
+#      define D3D_DEBUG_INFO
+#endif
+
 #pragma warning(disable:4995)
 #include "xrEngine/stdafx.h"
 #pragma warning(disable:4995)
+#include <d3d9.h>
 #include <d3dx9.h>
 #pragma warning(default:4995)
 #pragma warning(disable:4714)
 #pragma warning( 4 : 4018 )
 #pragma warning( 4 : 4244 )
 #pragma warning(disable:4237)
 
+#pragma comment( lib, "d3d9.lib" )
+
 #include "Layers/xrRender/xrD3DDefs.h"
 #include "Layers/xrRender/HW.h"
 #include "Layers/xrRender/Shader.h"

diff --git a/src/Layers/xrRenderPC_R3/stdafx.h b/src/Layers/xrRenderPC_R3/stdafx.h
@@ -4,16 +4,23 @@
 
 #pragma once
 
+#ifdef _DEBUG
+#      define D3D_DEBUG_INFO
+#endif
+
 #pragma warning(disable:4995)
 #include "xrEngine/stdafx.h"
 #pragma warning(disable:4995)
+#include <d3d9.h>
 #include <d3dx9.h>
 #pragma warning(default:4995)
 #pragma warning(disable:4714)
 #pragma warning( 4 : 4018 )
 #pragma warning( 4 : 4244 )
 #pragma warning(disable:4237)
 
+#pragma comment( lib, "d3d9.lib" )
+
 #include <d3d10_1.h>
 #include <d3d11.h>
 #include <D3Dx10core.h>

diff --git a/src/Layers/xrRenderPC_R4/stdafx.h b/src/Layers/xrRenderPC_R4/stdafx.h
@@ -4,6 +4,10 @@
 
 #pragma once
 
+#ifdef _DEBUG
+#      define D3D_DEBUG_INFO
+#endif
+
 #pragma warning(disable:4995)
 #include "xrEngine/stdafx.h"
 #pragma warning(disable:4995)
@@ -14,6 +18,8 @@
 #pragma warning( 4 : 4244 )
 #pragma warning(disable:4237)
 
+#pragma comment( lib, "d3d9.lib" )
+
 #include <D3D11.h>
 #include <D3Dx11core.h>
 #include <D3DCompiler.h>

diff --git a/src/xrEngine/stdafx.h b/src/xrEngine/stdafx.h
@@ -19,14 +19,6 @@
 #include "xrCore/xrCore.h"
 #include "Include/xrAPI/xrAPI.h"
 
-#ifdef _DEBUG
-# define D3D_DEBUG_INFO
-#endif
-
-#pragma warning(disable:4995)
-#include <d3d9.h>
-#pragma warning(default:4995)
-
 #define ECORE_API
 
 // Our headers
@@ -50,7 +42,6 @@ extern ENGINE_API CInifile* pGameIni;
 #pragma comment(lib, "xrScriptEngine.lib")
 #pragma comment( lib, "xrAPI.lib" )
 #pragma comment( lib, "winmm.lib" )
-#pragma comment( lib, "d3d9.lib" )
 #pragma comment( lib, "dinput8.lib" )
 #pragma comment( lib, "dxguid.lib" )
 
@@ -72,4 +63,4 @@ extern ENGINE_API CInifile* pGameIni;
  (((ltx)->line_exist(section, name)) ? ((ltx)->method(section, name)) : (default_value))
 
 #endif // !M_BORLAND
-#endif // !defined STDAFX_3DA
+#endif // !defined STDAFX_3DA
diff --git a/src/xrGame/CharacterPhysicsSupport.cpp b/src/xrGame/CharacterPhysicsSupport.cpp
@@ -1449,4 +1449,4 @@ CPHSynchronize*	CCharacterPhysicsSupport::PHGetSyncItem	(u16 item)
 		return movement()->GetSyncItem();
 	else	
 		return m_EntityAlife.CPhysicsShellHolder::PHGetSyncItem(item);
-}
+}
diff --git a/src/xrGame/ik/IKLimb.cpp b/src/xrGame/ik/IKLimb.cpp
@@ -1312,4 +1312,4 @@ void 	CIKLimb::BonesCallback2				( CBoneInstance* B )
 	}
 #endif
 	VERIFY2(  _valid( B->mTransform ), "CIKLimb::BonesCallback2" );
-}
+}
diff --git a/src/xrGame/imotion_position.cpp b/src/xrGame/imotion_position.cpp
@@ -735,4 +735,4 @@ void	imotion_position::rootbone_callback	( CBoneInstance *BI )
 	KA->LL_BoneMatrixBuild( *BI, &Fidentity, keys );
 
 	R_ASSERT2( _valid(BI->mTransform), "imotion_position::rootbone_callback" );
-}
+}
-Original file line number
+Diff line change
@@ Expand Up @@
     		return movement()->GetSyncItem();
     	else
     		return m_EntityAlife.CPhysicsShellHolder::PHGetSyncItem(item);
-    }
+    }