diff options
Diffstat (limited to 'external/liborcus')
| -rw-r--r-- | external/liborcus/Library_orcus-parser.mk | 6 | ||||
| -rw-r--r-- | external/liborcus/Library_orcus.mk | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/external/liborcus/Library_orcus-parser.mk b/external/liborcus/Library_orcus-parser.mk index 4c2ca7f291db..83a4a2f48806 100644 --- a/external/liborcus/Library_orcus-parser.mk +++ b/external/liborcus/Library_orcus-parser.mk @@ -30,6 +30,12 @@ $(eval $(call gb_Library_add_defs,orcus-parser,\ -D__ORCUS_PSR_BUILDING_DLL \ )) +# Needed when building against MSVC in C++17 mode, as +# workdir/UnpackedTarball/liborcus/include/orcus/global.hpp uses std::unary_function: +$(eval $(call gb_Library_add_defs,orcus-parser, \ + -D_HAS_AUTO_PTR_ETC=1 \ +)) + $(eval $(call gb_Library_set_generated_cxx_suffix,orcus-parser,cpp)) $(eval $(call gb_Library_add_generated_exception_objects,orcus-parser,\ diff --git a/external/liborcus/Library_orcus.mk b/external/liborcus/Library_orcus.mk index 9916f6fe5236..6457ec4afc0c 100644 --- a/external/liborcus/Library_orcus.mk +++ b/external/liborcus/Library_orcus.mk @@ -36,6 +36,12 @@ $(eval $(call gb_Library_add_defs,orcus,\ -D__ORCUS_XLS_XML \ )) +# Needed when building against MSVC in C++17 mode, as +# workdir/UnpackedTarball/liborcus/src/liborcus/css_document_tree.cpp uses std::unary_function: +$(eval $(call gb_Library_add_defs,orcus, \ + -D_HAS_AUTO_PTR_ETC=1 \ +)) + $(eval $(call gb_Library_use_libraries,orcus,\ orcus-parser \ )) |