[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                   |    3 +++
 patches/dev300/win32-dxsdk-200908.diff |   18 ++++++++++++++++++
 2 files changed, 21 insertions(+)

New commits:
commit d1c5fba832eea8efe72048b97509119c681739f5
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Sep 22 23:28:59 2009 +0300

    Enable building against the August 2009 DirectX SDK
    
    * patches/dev300/win32-dxsdk-200908.diff: New patch. dxerr9.h is no
      longer in the August 2009 DirectX SDK.
    
    * patches/dev300/apply: Add it to Fixes.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index dd1b5a9..fe5db6b 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3034,6 +3034,9 @@ win32-cygwin-1.7.diff, i#59477, tml
 # Recognize Windows SDK 7
 win32-sdk7.diff, tml
 
+# Build also against DirectX SDK August 2009
+win32-dxsdk-200908.diff, tml
+
 [ Fixes ]
 # fix problem with calling private and protected members in layout code
 sfx2-privateprotectedpublic.diff
diff --git a/patches/dev300/win32-dxsdk-200908.diff b/patches/dev300/win32-dxsdk-200908.diff
new file mode 100644
index 0000000..3d17909
--- /dev/null
+++ b/patches/dev300/win32-dxsdk-200908.diff
@@ -0,0 +1,18 @@
+--- canvas/source/directx/dx_winstuff.hxx
++++ canvas/source/directx/dx_winstuff.hxx
+@@ -89,9 +89,14 @@
+ 
+ #else
+ 
++    #include <dxsdkver.h>
+     #include <d3d9.h>
+     #include <d3dx9.h>
++    #if _DXSDK_BUILD_MAJOR < 1734 /* Earlier than the August 2009 DXSDK */
+-    #include <dxerr9.h>
++        #include <dxerr9.h>
++    #else
++        #include <dxerr.h>
++    #endif
+ 
+     typedef IDirect3DSurface9 surface_type;
+