dxsdk.patch 3.6 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135
  1. diff -p Include.orig/d3d9.h Include/d3d9.h
  2. *** Include.orig/d3d9.h 2010-05-19 15:36:57.570669600 -0700
  3. --- Include/d3d9.h 2013-04-07 13:52:57.504138700 -0700
  4. *************** typedef struct IDirect3DQuery9 *LPDIRECT
  5. *** 2022,2029 ****
  6. /*********************
  7. ! /* D3D9Ex interfaces
  8. ! /*********************/
  9. HRESULT WINAPI Direct3DCreate9Ex(UINT SDKVersion, IDirect3D9Ex**);
  10. --- 2022,2029 ----
  11. /*********************
  12. ! * D3D9Ex interfaces
  13. ! *********************/
  14. HRESULT WINAPI Direct3DCreate9Ex(UINT SDKVersion, IDirect3D9Ex**);
  15. diff -p Include.orig/d3d9types.h Include/d3d9types.h
  16. *** Include.orig/d3d9types.h 2010-05-19 15:36:57.601870200 -0700
  17. --- Include/d3d9types.h 2013-04-07 13:52:17.746590200 -0700
  18. ***************
  19. *** 19,24 ****
  20. --- 19,25 ----
  21. #include <float.h>
  22. + #ifdef _MSC_VER
  23. #if _MSC_VER >= 1200
  24. #pragma warning(push)
  25. #endif
  26. ***************
  27. *** 26,31 ****
  28. --- 27,33 ----
  29. #if defined(_X86_) || defined(_IA64_)
  30. #pragma pack(4)
  31. #endif
  32. + #endif // _MSC_VER
  33. // D3DCOLOR is equivalent to D3DFMT_A8R8G8B8
  34. #ifndef D3DCOLOR_DEFINED
  35. *************** typedef struct _D3DAES_CTR_IV
  36. *** 2404,2415 ****
  37. --- 2406,2419 ----
  38. #endif // !D3D_DISABLE_9EX
  39. /* -- D3D9Ex only */
  40. + #ifdef _MSC_VER
  41. #pragma pack()
  42. #if _MSC_VER >= 1200
  43. #pragma warning(pop)
  44. #else
  45. #pragma warning(default:4201)
  46. #endif
  47. + #endif // _MSC_VER
  48. #endif /* (DIRECT3D_VERSION >= 0x0900) */
  49. #endif /* _d3d9TYPES(P)_H_ */
  50. diff -p Include.orig/D3Dcommon.h Include/D3Dcommon.h
  51. *** Include.orig/D3Dcommon.h 2010-05-19 15:36:57.664271400 -0700
  52. --- Include/D3Dcommon.h 2013-04-07 23:35:07.133638400 -0700
  53. ***************
  54. *** 6,12 ****
  55. --- 6,14 ----
  56. /* File created by MIDL compiler version 7.00.0555 */
  57. /* @@MIDL_FILE_HEADING( ) */
  58. + #ifdef _MSC_VER
  59. #pragma warning( disable: 4049 ) /* more than 64k source lines */
  60. + #endif // _MSC_VER
  61. /* verify that the <rpcndr.h> version is high enough to compile this file*/
  62. diff -p Include.orig/d3dx9core.h Include/d3dx9core.h
  63. *** Include.orig/d3dx9core.h 2010-05-19 15:36:57.820274400 -0700
  64. --- Include/d3dx9core.h 2013-04-07 23:34:00.976237500 -0700
  65. *************** HRESULT WINAPI
  66. *** 665,681 ****
  67. // TRUE = OpenGL line emulation on.
  68. // FALSE = OpenGL line emulation off.
  69. //
  70. - // OpenGL line: Regular line:
  71. - // *\ *\
  72. - // | \ / \
  73. - // | \ *\ \
  74. - // *\ \ \ \
  75. - // \ \ \ \
  76. - // \ * \ *
  77. - // \ | \ /
  78. - // \| *
  79. - // *
  80. - //
  81. // OnLostDevice, OnResetDevice -
  82. // Call OnLostDevice() on this object before calling Reset() on the
  83. // device, so that this object can release any stateblocks and video
  84. --- 665,670 ----
  85. diff -p Include.orig/d3dx9math.h Include/d3dx9math.h
  86. *** Include.orig/d3dx9math.h 2010-05-19 15:36:57.835874700 -0700
  87. --- Include/d3dx9math.h 2013-04-07 23:31:38.685168800 -0700
  88. ***************
  89. *** 12,22 ****
  90. --- 12,24 ----
  91. #ifndef __D3DX9MATH_H__
  92. #define __D3DX9MATH_H__
  93. + #ifdef _MSC_VER
  94. #include <math.h>
  95. #if _MSC_VER >= 1200
  96. #pragma warning(push)
  97. #endif
  98. #pragma warning(disable:4201) // anonymous unions warning
  99. + #endif // _MSC_VER
  100. *************** HRESULT WINAPI D3DXSHProjectCubeMap
  101. *** 1786,1796 ****
  102. --- 1788,1800 ----
  103. #include "d3dx9math.inl"
  104. + #ifdef _MSC_VER
  105. #if _MSC_VER >= 1200
  106. #pragma warning(pop)
  107. #else
  108. #pragma warning(default:4201)
  109. #endif
  110. + #endif // _MSC_VER
  111. #endif // __D3DX9MATH_H__