diff options
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/Library_recentfile.mk | 8 | ||||
| -rw-r--r-- | shell/StaticLibrary_xmlparser.mk | 8 |
2 files changed, 15 insertions, 1 deletions
diff --git a/shell/Library_recentfile.mk b/shell/Library_recentfile.mk index 134847dae6fc..758829962040 100644 --- a/shell/Library_recentfile.mk +++ b/shell/Library_recentfile.mk @@ -32,10 +32,18 @@ $(eval $(call gb_Library_set_include,recentfile,\ $$(INCLUDE) \ )) +ifeq ($(GUI),WNT) $(eval $(call gb_Library_use_externals,recentfile,\ expat_utf16 \ )) +else +$(eval $(call gb_Library_use_externals,recentfile,\ + expat_utf8 \ +)) + +endif + $(eval $(call gb_Library_use_libraries,recentfile,\ sal \ $(gb_STDLIBS) \ diff --git a/shell/StaticLibrary_xmlparser.mk b/shell/StaticLibrary_xmlparser.mk index 13638bf0cc20..eeefe1df5e20 100644 --- a/shell/StaticLibrary_xmlparser.mk +++ b/shell/StaticLibrary_xmlparser.mk @@ -36,12 +36,18 @@ ifeq ($(GUI),WNT) $(eval $(call gb_StaticLibrary_add_defs,shell_xmlparser,\ -DXML_UNICODE \ )) -endif $(eval $(call gb_StaticLibrary_use_externals,shell_xmlparser,\ expat_utf16 \ )) +else +$(eval $(call gb_StaticLibrary_use_externals,shell_xmlparser,\ + expat_utf8 \ +)) + +endif + $(eval $(call gb_StaticLibrary_add_exception_objects,shell_xmlparser,\ shell/source/all/xml_parser \ )) |