diff options
author | Tor Lillqvist <tml@collabora.com> | 2014-07-29 17:28:24 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2014-07-29 18:21:02 +0300 |
commit | 5cca1cb6a17984da0ff3cf9c04869c361144173d (patch) | |
tree | 56f5fab82fdc6548ecf2ce60931f2b16201634aa | |
parent | Include <algorithm> for std::min (diff) | |
download | core-5cca1cb6a17984da0ff3cf9c04869c361144173d.tar.gz core-5cca1cb6a17984da0ff3cf9c04869c361144173d.zip |
Accept also WINDOWS_SDK_VERSION == 81
Change-Id: Id1a8f91b6c74c19c3b14b24a86580d06cec3dd97
-rw-r--r-- | canvas/Library_directx9canvas.mk | 2 | ||||
-rw-r--r-- | canvas/Library_gdipluscanvas.mk | 2 | ||||
-rw-r--r-- | canvas/StaticLibrary_directxcanvas.mk | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/canvas/Library_directx9canvas.mk b/canvas/Library_directx9canvas.mk index b6ee7027bd21..2b90429ebcfb 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 385506161201..858c6de73a7e 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 9025b135827e..dabe9c3bc976 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 \ )) |