diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-05-29 09:44:00 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-05-29 09:44:32 +0100 |
| commit | 7ccef10f9c7c5af5258a29733783f9164894e3f7 (patch) | |
| tree | ffa51af0d01a89d03c4301072e7c6b8d3c10edc6 /shell | |
| parent | e689eb6401e69c39c2e52a4659b49b7b98422914 (diff) | |
get shell to build for me again
Change-Id: Idf2dc8025085e417e7368d77420131ad459544b8
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 \ )) |