summaryrefslogtreecommitdiff
path: root/canvas/source
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2014-12-10 17:45:00 +0100
committerMichael Stahl <mstahl@redhat.com>2014-12-10 17:47:18 +0100
commitff17c5a2b06367e9fdeff2d5763ccaeb9725511f (patch)
tree124c6c34b168b3bf6d024dfe6e51db878501df5e /canvas/source
parent67f5fa5a23c9678a83eb75534307385475f1d586 (diff)
canvas: remove Windows SDK #ifdefs - all supported MSVC/SDK have DirectX
Change-Id: I5106593ad5472992e3607665849fb35802b6e266
Diffstat (limited to 'canvas/source')
-rw-r--r--canvas/source/directx/dx_winstuff.hxx20
1 files changed, 2 insertions, 18 deletions
diff --git a/canvas/source/directx/dx_winstuff.hxx b/canvas/source/directx/dx_winstuff.hxx
index 469b5cbc9e95..b7c9d8e3f74d 100644
--- a/canvas/source/directx/dx_winstuff.hxx
+++ b/canvas/source/directx/dx_winstuff.hxx
@@ -56,26 +56,10 @@
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
-#if WIN8_SDK == 1 || defined(_USING_V110_SDK71_)
+#include <d3d9.h>
- #include <d3d9.h>
+typedef IDirect3DSurface9 surface_type;
- typedef IDirect3DSurface9 surface_type;
-
-#else
-
- #include <dxsdkver.h>
- #include <d3d9.h>
- #include <d3dx9.h>
- #if _DXSDK_BUILD_MAJOR < 1734 /* Earlier than the August 2009 DXSDK */
- #include <dxerr9.h>
- #else
- #include <dxerr.h>
- #endif
-
- typedef IDirect3DSurface9 surface_type;
-
-#endif
#undef DrawText