Updated dxsdk patch.

This commit is contained in:
bkaradzic
2013-04-07 23:57:12 -07:00
parent d6fef5bbe1
commit 865bfa6880

View File

@@ -60,3 +60,76 @@ diff -p Include.orig/d3d9types.h Include/d3d9types.h
#endif /* (DIRECT3D_VERSION >= 0x0900) */
#endif /* _d3d9TYPES(P)_H_ */
diff -p Include.orig/D3Dcommon.h Include/D3Dcommon.h
*** Include.orig/D3Dcommon.h 2010-05-19 15:36:57.664271400 -0700
--- Include/D3Dcommon.h 2013-04-07 23:35:07.133638400 -0700
***************
*** 6,12 ****
--- 6,14 ----
/* File created by MIDL compiler version 7.00.0555 */
/* @@MIDL_FILE_HEADING( ) */
+ #ifdef _MSC_VER
#pragma warning( disable: 4049 ) /* more than 64k source lines */
+ #endif // _MSC_VER
/* verify that the <rpcndr.h> version is high enough to compile this file*/
diff -p Include.orig/d3dx9core.h Include/d3dx9core.h
*** Include.orig/d3dx9core.h 2010-05-19 15:36:57.820274400 -0700
--- Include/d3dx9core.h 2013-04-07 23:34:00.976237500 -0700
*************** HRESULT WINAPI
*** 665,681 ****
// TRUE = OpenGL line emulation on.
// FALSE = OpenGL line emulation off.
//
- // OpenGL line: Regular line:
- // *\ *\
- // | \ / \
- // | \ *\ \
- // *\ \ \ \
- // \ \ \ \
- // \ * \ *
- // \ | \ /
- // \| *
- // *
- //
// OnLostDevice, OnResetDevice -
// Call OnLostDevice() on this object before calling Reset() on the
// device, so that this object can release any stateblocks and video
--- 665,670 ----
diff -p Include.orig/d3dx9math.h Include/d3dx9math.h
*** Include.orig/d3dx9math.h 2010-05-19 15:36:57.835874700 -0700
--- Include/d3dx9math.h 2013-04-07 23:31:38.685168800 -0700
***************
*** 12,22 ****
--- 12,24 ----
#ifndef __D3DX9MATH_H__
#define __D3DX9MATH_H__
+ #ifdef _MSC_VER
#include <math.h>
#if _MSC_VER >= 1200
#pragma warning(push)
#endif
#pragma warning(disable:4201) // anonymous unions warning
+ #endif // _MSC_VER
*************** HRESULT WINAPI D3DXSHProjectCubeMap
*** 1786,1796 ****
--- 1788,1800 ----
#include "d3dx9math.inl"
+ #ifdef _MSC_VER
#if _MSC_VER >= 1200
#pragma warning(pop)
#else
#pragma warning(default:4201)
#endif
+ #endif // _MSC_VER
#endif // __D3DX9MATH_H__