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>
This commit is contained in:
parent
e20254da3b
commit
f5f5d74768
3 changed files with 0 additions and 15 deletions
|
@ -28,11 +28,6 @@ $(eval $(call gb_Library_set_componentfile,directx9canvas,canvas/source/directx/
|
||||||
|
|
||||||
$(eval $(call gb_Library_use_sdk_api,directx9canvas))
|
$(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_external,directx9canvas,boost_headers))
|
||||||
|
|
||||||
$(eval $(call gb_Library_use_libraries,directx9canvas,\
|
$(eval $(call gb_Library_use_libraries,directx9canvas,\
|
||||||
|
|
|
@ -30,11 +30,6 @@ $(eval $(call gb_Library_use_external,gdipluscanvas,boost_headers))
|
||||||
|
|
||||||
$(eval $(call gb_Library_use_sdk_api,gdipluscanvas))
|
$(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,\
|
$(eval $(call gb_Library_use_libraries,gdipluscanvas,\
|
||||||
cppu \
|
cppu \
|
||||||
tk \
|
tk \
|
||||||
|
|
|
@ -22,11 +22,6 @@ $(eval $(call gb_StaticLibrary_use_api,directxcanvas,\
|
||||||
udkapi \
|
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,\
|
$(eval $(call gb_StaticLibrary_add_exception_objects,directxcanvas,\
|
||||||
canvas/source/directx/dx_bitmap \
|
canvas/source/directx/dx_bitmap \
|
||||||
canvas/source/directx/dx_bitmapcanvashelper \
|
canvas/source/directx/dx_bitmapcanvashelper \
|
||||||
|
|
Loading…
Reference in a new issue