diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-01-04 18:38:59 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-01-04 18:39:53 +0100 |
| commit | 52394ea0f992755fc289b3385ed90e5a43360e57 (patch) | |
| tree | ccbb52777449dbcfc9390e260f4f512983df4b3c /canvas | |
| parent | get rid of obsolete pathdelimiter escape (diff) | |
| download | core-52394ea0f992755fc289b3385ed90e5a43360e57.tar.gz core-52394ea0f992755fc289b3385ed90e5a43360e57.zip | |
canvas: work around NOMINMAX windows breakage
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/Library_directx5canvas.mk | 3 | ||||
| -rw-r--r-- | canvas/Library_directx9canvas.mk | 2 | ||||
| -rw-r--r-- | canvas/Library_gdipluscanvas.mk | 2 |
3 files changed, 7 insertions, 0 deletions
diff --git a/canvas/Library_directx5canvas.mk b/canvas/Library_directx5canvas.mk index b531a8446b7e..13e24676d62b 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 081c1074f93f..070df099ca39 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 93b08c860f1e..7531d75d9969 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)),) |