canvas: work around NOMINMAX windows breakage

52394ea0 · Michael Stahl · 7cfb7a44 · 52394ea0 · 52394ea0 · 52394ea0
Kaydet (Commit) 52394ea0 authored Ock 04, 2012 tarafından Michael Stahl
Showing with 7 additions and 0 deletions

Library_directx5canvas.mk canvas/Library_directx5canvas.mk +3 -0

Library_directx9canvas.mk canvas/Library_directx9canvas.mk +2 -0

Library_gdipluscanvas.mk canvas/Library_gdipluscanvas.mk +2 -0

No files found.
--- a/canvas/Library_directx5canvas.mk
+++ b/canvas/Library_directx5canvas.mk
@@ -40,8 +40,11 @@ $(eval $(call gb_Library_add_api,directx5canvas,\
    offapi \
    udkapi \
 ))
+# clear NOMINMAX because GdiplusTypes.h uses those macros :(
 $(eval $(call gb_Library_add_defs,directx5canvas,\
 	-DDIRECTX_VERSION=0x0500 \
+	-UNOMINMAX \
 ))
 $(eval $(call gb_Library_add_linked_libs,directx5canvas,\

--- a/canvas/Library_directx9canvas.mk
+++ b/canvas/Library_directx9canvas.mk
@@ -40,8 +40,10 @@ $(eval $(call gb_Library_add_api,directx9canvas,\
    udkapi \
 ))
+# clear NOMINMAX because GdiplusTypes.h uses those macros :(
 $(eval $(call gb_Library_add_defs,directx9canvas,\
 	-DDIRECTX_VERSION=0x0900 \
+	-UNOMINMAX \
 ))
 $(eval $(call gb_Library_add_linked_libs,directx9canvas,\

--- a/canvas/Library_gdipluscanvas.mk
+++ b/canvas/Library_gdipluscanvas.mk
@@ -40,8 +40,10 @@ $(eval $(call gb_Library_add_api,gdipluscanvas,\
    udkapi \
 ))
+# clear NOMINMAX because GdiplusTypes.h uses those macros :(
 $(eval $(call gb_Library_add_defs,gdipluscanvas,\
 	-DDIRECTX_VERSION=0x0900 \
+	-UNOMINMAX \
 ))
 ifneq ($(strip $(VERBOSE)$(verbose)),)