[Libreoffice-commits] .: canvas/Library_directx5canvas.mk canvas/Library_directx9canvas.mk canvas/Library_gdipluscanvas.mk

[Michael Stahl]

 canvas/Library_directx5canvas.mk |    3 +++
 canvas/Library_directx9canvas.mk |    2 ++
 canvas/Library_gdipluscanvas.mk  |    2 ++
 3 files changed, 7 insertions(+)

New commits:
commit 52394ea0f992755fc289b3385ed90e5a43360e57
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Jan 4 18:38:59 2012 +0100

    canvas: work around NOMINMAX windows breakage

diff --git a/canvas/Library_directx5canvas.mk b/canvas/Library_directx5canvas.mk
index b531a84..13e2467 100644
--- 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,\
diff --git a/canvas/Library_directx9canvas.mk b/canvas/Library_directx9canvas.mk
index 081c107..070df09 100644
--- 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,\
diff --git a/canvas/Library_gdipluscanvas.mk b/canvas/Library_gdipluscanvas.mk
index 93b08c8..7531d75 100644
--- 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)),)