Accept also WINDOWS_SDK_VERSION == 81

Desktop / LibreOffice - Tor Lillqvist [collabora.com] - 29 July 2014 10:21 UTC



###

diff --git a/canvas/Library_directx9canvas.mk b/canvas/Library_directx9canvas.mk
index b6ee702..2b90429 100644
--- a/canvas/Library_directx9canvas.mk
+++ b/canvas/Library_directx9canvas.mk
@@ -29,7 +29,7 @@ $(eval $(call gb_Library_add_defs,directx9canvas,\
-UNOMINMAX \
))

-ifeq ($(WINDOWS_SDK_VERSION),80)
+ifneq ($(filter 80 81,$(WINDOWS_SDK_VERSION)),)
$(eval $(call gb_Library_add_defs,directx9canvas,\
-DWIN8_SDK=1 \
))
diff --git a/canvas/Library_gdipluscanvas.mk b/canvas/Library_gdipluscanvas.mk
index 3855061..858c6de 100644
--- a/canvas/Library_gdipluscanvas.mk
+++ b/canvas/Library_gdipluscanvas.mk
@@ -31,7 +31,7 @@ $(eval $(call gb_Library_add_defs,gdipluscanvas,\
-UNOMINMAX \
))

-ifeq ($(WINDOWS_SDK_VERSION),80)
+ifneq ($(filter 80 81,$(WINDOWS_SDK_VERSION)),)
$(eval $(call gb_Library_add_defs,gdipluscanvas,\
-DWIN8_SDK=1 \
))
diff --git a/canvas/StaticLibrary_directxcanvas.mk b/canvas/StaticLibrary_directxcanvas.mk
index 9025b13..dabe9c3 100644
--- a/canvas/StaticLibrary_directxcanvas.mk
+++ b/canvas/StaticLibrary_directxcanvas.mk
@@ -23,7 +23,7 @@ $(eval $(call gb_StaticLibrary_add_defs,directxcanvas,\
-UNOMINMAX \
))

-ifeq ($(WINDOWS_SDK_VERSION),80)
+ifneq ($(filter 80 81,$(WINDOWS_SDK_VERSION)),)
$(eval $(call gb_StaticLibrary_add_defs,directxcanvas,\
-DWIN8_SDK=1 \
))

5cca1cb Accept also WINDOWS_SDK_VERSION == 81
canvas/Library_directx9canvas.mk | 2 +-
canvas/Library_gdipluscanvas.mk | 2 +-
canvas/StaticLibrary_directxcanvas.mk | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)

Upstream: cgit.freedesktop.org

  • Share