diff options
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/Library_directx9canvas.mk | 6 | ||||
| -rw-r--r-- | canvas/Library_gdipluscanvas.mk | 6 | ||||
| -rw-r--r-- | canvas/StaticLibrary_directxcanvas.mk | 6 | ||||
| -rw-r--r-- | canvas/source/directx/dx_winstuff.hxx | 6 |
4 files changed, 24 insertions, 0 deletions
diff --git a/canvas/Library_directx9canvas.mk b/canvas/Library_directx9canvas.mk index 22a989a308b0..6fcba4e002cb 100644 --- a/canvas/Library_directx9canvas.mk +++ b/canvas/Library_directx9canvas.mk @@ -43,6 +43,12 @@ $(eval $(call gb_Library_add_defs,directx9canvas,\ -UNOMINMAX \ )) +ifeq ($(WINDOWS_SDK_VERSION),80) +$(eval $(call gb_Library_add_defs,directx9canvas,\ + -DWIN8_SDK=1 \ +)) +endif + $(eval $(call gb_Library_use_libraries,directx9canvas,\ cppu \ tk \ diff --git a/canvas/Library_gdipluscanvas.mk b/canvas/Library_gdipluscanvas.mk index 327f9c1b2927..b20ac69fb276 100644 --- a/canvas/Library_gdipluscanvas.mk +++ b/canvas/Library_gdipluscanvas.mk @@ -43,6 +43,12 @@ $(eval $(call gb_Library_add_defs,gdipluscanvas,\ -UNOMINMAX \ )) +ifeq ($(WINDOWS_SDK_VERSION),80) +$(eval $(call gb_Library_add_defs,gdipluscanvas,\ + -DWIN8_SDK=1 \ +)) +endif + ifneq ($(strip $(VERBOSE)$(verbose)),) $(eval $(call gb_Library_add_defs,gdipluscanvas,\ -DVERBOSE \ diff --git a/canvas/StaticLibrary_directxcanvas.mk b/canvas/StaticLibrary_directxcanvas.mk index 232429cb7c4a..fed7f87e8cd8 100644 --- a/canvas/StaticLibrary_directxcanvas.mk +++ b/canvas/StaticLibrary_directxcanvas.mk @@ -43,6 +43,12 @@ $(eval $(call gb_StaticLibrary_add_defs,directxcanvas,\ -UNOMINMAX \ )) +ifeq ($(WINDOWS_SDK_VERSION),80) +$(eval $(call gb_StaticLibrary_add_defs,directxcanvas,\ + -DWIN8_SDK=1 \ +)) +endif + $(eval $(call gb_StaticLibrary_add_exception_objects,directxcanvas,\ canvas/source/directx/dx_bitmap \ canvas/source/directx/dx_bitmapcanvashelper \ diff --git a/canvas/source/directx/dx_winstuff.hxx b/canvas/source/directx/dx_winstuff.hxx index 595022e10182..82fe2d8c51b1 100644 --- a/canvas/source/directx/dx_winstuff.hxx +++ b/canvas/source/directx/dx_winstuff.hxx @@ -81,6 +81,12 @@ typedef IDirectDrawSurface surface_type; +#elif WIN8_SDK == 1 //Windows 8 SDK + + #include <d3d9.h> + + typedef IDirect3DSurface9 surface_type; + #else #include <dxsdkver.h> |