Fixed headers inclusion in xrD3D9-Null (bad header names / non-use of…

… the pch)
OpenXRay · Apr 23, 2015 · 5d81cdd · 5d81cdd
1 parent e699503
commit 5d81cdd
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 51 deletions.
diff --git a/src/xrD3D9-Null/IDirect3D9.cpp b/src/xrD3D9-Null/IDirect3D9.cpp
@@ -2,11 +2,8 @@
 #include "IDirect3D9.h"
 #include "IDirect3DDevice9.h"
 #include "xrD3D9-Null_OutProc.h"
+#include <stdio.h>
 
-#include <stdlib.h>
-#include <objbase.h>
-#include <windows.h>
-#include "stdio.h"
 
 const GUID DECLSPEC_SELECTANY IID_IDirect3D9;
 

diff --git a/src/xrD3D9-Null/IDirect3D9.h b/src/xrD3D9-Null/IDirect3D9.h
@@ -1,9 +1,4 @@
-//---------------------------------
-#include <stdlib.h>
-#include <objbase.h>
-#include <windows.h>
-
-#include "d3d9.h"
+#include "stdafx.h"
 
 /*
 //---------------------------------

diff --git a/src/xrD3D9-Null/IDirect3DDevice9.h b/src/xrD3D9-Null/IDirect3DDevice9.h
@@ -1,10 +1,5 @@
-//---------------------------------
-#include <stdlib.h>
-#include <objbase.h>
-#include <windows.h>
-//---------------------------------
+#include "stdafx.h"
 
-#include "d3d9.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/src/xrD3D9-Null/stdafx.cpp b/src/xrD3D9-Null/stdafx.cpp
@@ -1,8 +1 @@
-// stdafx.cpp : source file that includes just the standard includes
-// xrD3D9-Null.pch will be the pre-compiled header
-// stdafx.obj will contain the pre-compiled type information
-
 #include "stdafx.h"
-
-// TODO: reference any additional headers you need in STDAFX.H
-// and not in this file
diff --git a/src/xrD3D9-Null/stdafx.h b/src/xrD3D9-Null/stdafx.h
@@ -2,25 +2,16 @@
 // or project specific include files that are used frequently, but
 // are changed infrequently
 //
-#if !defined(AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_)
-#define AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_
-
-
 #pragma once
 
 #ifdef _DEBUG
-	#define D3D_DEBUG_INFO
+#define D3D_DEBUG_INFO
 #endif
 
 #define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
-// Windows Header Files:
 #include <windows.h>
 #include <stdlib.h>
 #include <objbase.h>
-
-#include "d3d9.h"
+#include <d3d9.h>
 
 #pragma warning(disable:4996)
-
-#endif //!defined(AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_)
-// TODO: reference additional headers your program requires here
diff --git a/src/xrD3D9-Null/xrD3D9-Null.h b/src/xrD3D9-Null/xrD3D9-Null.h
@@ -1,24 +1,14 @@
-// The following ifdef block is the standard way of creating macros which make exporting 
-// from a DLL simpler. All files within this DLL are compiled with the XRD3D9NULL_EXPORTS
-// symbol defined on the command line. this symbol should not be defined on any project
-// that uses this DLL. This way any other project whose source files include this file see 
-// XRD3D9NULL_API functions as being imported from a DLL, whereas this DLL sees symbols
-// defined with this macro as being exported.
+#include "stdafx.h"
+#include <d3d9types.h>
+#include <d3d9caps.h>
+#include "IDirect3D9.h"
+
+
 #ifdef XRD3D9NULL_EXPORTS
 #define XRD3D9NULL_API __declspec(dllexport)
 #else
 #define XRD3D9NULL_API __declspec(dllimport)
 #endif
-//---------------------------------
-#include <stdlib.h>
-#include <objbase.h>
-#include <windows.h>
-//---------------------------------
-#include "d3d9types.h"
-#include "d3d9caps.h"
-//---------------------------------
-
-#include "IDirect3D9.h"
 
 
 

diff --git a/src/xrD3D9-Null/xrD3D9-Null_OutProc.cpp b/src/xrD3D9-Null/xrD3D9-Null_OutProc.cpp
@@ -1,4 +1,5 @@
 #include "stdafx.h"
+#include <stdio.h>
 
 HRESULT		HRESULT_Proc(HRESULT ret)
 {
@@ -36,7 +37,6 @@ DWORD		DWORD_Proc(DWORD ret)
 }
 
 //-----------------------------------------------------------------------
-#include "stdio.h"
 void LogOut( const char *format, ... ) 
 {
 	va_list argptr;