Skip to content

Commit 5d81cdd

Browse files
author
Spacebrain
committed
Fixed headers inclusion in xrD3D9-Null (bad header names / non-use of the pch)
1 parent e699503 commit 5d81cdd

File tree

7 files changed

+12
-51
lines changed

7 files changed

+12
-51
lines changed

src/xrD3D9-Null/IDirect3D9.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,8 @@
22
#include "IDirect3D9.h"
33
#include "IDirect3DDevice9.h"
44
#include "xrD3D9-Null_OutProc.h"
5+
#include <stdio.h>
56

6-
#include <stdlib.h>
7-
#include <objbase.h>
8-
#include <windows.h>
9-
#include "stdio.h"
107

118
const GUID DECLSPEC_SELECTANY IID_IDirect3D9;
129

src/xrD3D9-Null/IDirect3D9.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
//---------------------------------
2-
#include <stdlib.h>
3-
#include <objbase.h>
4-
#include <windows.h>
5-
6-
#include "d3d9.h"
1+
#include "stdafx.h"
72

83
/*
94
//---------------------------------

src/xrD3D9-Null/IDirect3DDevice9.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
1-
//---------------------------------
2-
#include <stdlib.h>
3-
#include <objbase.h>
4-
#include <windows.h>
5-
//---------------------------------
1+
#include "stdafx.h"
62

7-
#include "d3d9.h"
83

94
#ifdef __cplusplus
105
extern "C" {

src/xrD3D9-Null/stdafx.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1 @@
1-
// stdafx.cpp : source file that includes just the standard includes
2-
// xrD3D9-Null.pch will be the pre-compiled header
3-
// stdafx.obj will contain the pre-compiled type information
4-
51
#include "stdafx.h"
6-
7-
// TODO: reference any additional headers you need in STDAFX.H
8-
// and not in this file

src/xrD3D9-Null/stdafx.h

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,16 @@
22
// or project specific include files that are used frequently, but
33
// are changed infrequently
44
//
5-
#if !defined(AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_)
6-
#define AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_
7-
8-
95
#pragma once
106

117
#ifdef _DEBUG
12-
#define D3D_DEBUG_INFO
8+
#define D3D_DEBUG_INFO
139
#endif
1410

1511
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
16-
// Windows Header Files:
1712
#include <windows.h>
1813
#include <stdlib.h>
1914
#include <objbase.h>
20-
21-
#include "d3d9.h"
15+
#include <d3d9.h>
2216

2317
#pragma warning(disable:4996)
24-
25-
#endif //!defined(AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_)
26-
// TODO: reference additional headers your program requires here

src/xrD3D9-Null/xrD3D9-Null.h

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,14 @@
1-
// The following ifdef block is the standard way of creating macros which make exporting
2-
// from a DLL simpler. All files within this DLL are compiled with the XRD3D9NULL_EXPORTS
3-
// symbol defined on the command line. this symbol should not be defined on any project
4-
// that uses this DLL. This way any other project whose source files include this file see
5-
// XRD3D9NULL_API functions as being imported from a DLL, whereas this DLL sees symbols
6-
// defined with this macro as being exported.
1+
#include "stdafx.h"
2+
#include <d3d9types.h>
3+
#include <d3d9caps.h>
4+
#include "IDirect3D9.h"
5+
6+
77
#ifdef XRD3D9NULL_EXPORTS
88
#define XRD3D9NULL_API __declspec(dllexport)
99
#else
1010
#define XRD3D9NULL_API __declspec(dllimport)
1111
#endif
12-
//---------------------------------
13-
#include <stdlib.h>
14-
#include <objbase.h>
15-
#include <windows.h>
16-
//---------------------------------
17-
#include "d3d9types.h"
18-
#include "d3d9caps.h"
19-
//---------------------------------
20-
21-
#include "IDirect3D9.h"
2212

2313

2414

src/xrD3D9-Null/xrD3D9-Null_OutProc.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "stdafx.h"
2+
#include <stdio.h>
23

34
HRESULT HRESULT_Proc(HRESULT ret)
45
{
@@ -36,7 +37,6 @@ DWORD DWORD_Proc(DWORD ret)
3637
}
3738

3839
//-----------------------------------------------------------------------
39-
#include "stdio.h"
4040
void LogOut( const char *format, ... )
4141
{
4242
va_list argptr;

0 commit comments

Comments
 (0)