diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-05-04 15:16:02 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-05-04 20:02:28 +0200 |
| commit | f5f5d7476885fe6107cb9f39504078e833bfb27d (patch) | |
| tree | 25c03a6146274e404426ab01b9f27632e9d89ff4 /canvas | |
| parent | e20254da3bf67d298b262066ea9c8bb376623ca1 (diff) | |
messing with UNOMINMAX no longer seems to be necessary
and it sometimes causes trouble when including o3tl/strong_int.hxx
Change-Id: I2957dc5c0159e1a9ab61681953023f6850de0125
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115098
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/Library_directx9canvas.mk | 5 | ||||
| -rw-r--r-- | canvas/Library_gdipluscanvas.mk | 5 | ||||
| -rw-r--r-- | canvas/StaticLibrary_directxcanvas.mk | 5 |
3 files changed, 0 insertions, 15 deletions
diff --git a/canvas/Library_directx9canvas.mk b/canvas/Library_directx9canvas.mk index 738999f8246e..28b10bb116d8 100644 --- a/canvas/Library_directx9canvas.mk +++ b/canvas/Library_directx9canvas.mk @@ -28,11 +28,6 @@ $(eval $(call gb_Library_set_componentfile,directx9canvas,canvas/source/directx/ $(eval $(call gb_Library_use_sdk_api,directx9canvas)) -# clear NOMINMAX because GdiplusTypes.h uses those macros :( -$(eval $(call gb_Library_add_defs,directx9canvas,\ - -UNOMINMAX \ -)) - $(eval $(call gb_Library_use_external,directx9canvas,boost_headers)) $(eval $(call gb_Library_use_libraries,directx9canvas,\ diff --git a/canvas/Library_gdipluscanvas.mk b/canvas/Library_gdipluscanvas.mk index 80adf6f44d18..86634d401f94 100644 --- a/canvas/Library_gdipluscanvas.mk +++ b/canvas/Library_gdipluscanvas.mk @@ -30,11 +30,6 @@ $(eval $(call gb_Library_use_external,gdipluscanvas,boost_headers)) $(eval $(call gb_Library_use_sdk_api,gdipluscanvas)) -# clear NOMINMAX because GdiplusTypes.h uses those macros :( -$(eval $(call gb_Library_add_defs,gdipluscanvas,\ - -UNOMINMAX \ -)) - $(eval $(call gb_Library_use_libraries,gdipluscanvas,\ cppu \ tk \ diff --git a/canvas/StaticLibrary_directxcanvas.mk b/canvas/StaticLibrary_directxcanvas.mk index c7f475248a5e..1e0d34409806 100644 --- a/canvas/StaticLibrary_directxcanvas.mk +++ b/canvas/StaticLibrary_directxcanvas.mk @@ -22,11 +22,6 @@ $(eval $(call gb_StaticLibrary_use_api,directxcanvas,\ udkapi \ )) -# clear NOMINMAX because GdiplusTypes.h uses those macros :( -$(eval $(call gb_StaticLibrary_add_defs,directxcanvas,\ - -UNOMINMAX \ -)) - $(eval $(call gb_StaticLibrary_add_exception_objects,directxcanvas,\ canvas/source/directx/dx_bitmap \ canvas/source/directx/dx_bitmapcanvashelper \ |