shell/Library_recentfile.mk | 8 ++++++++
shell/StaticLibrary_xmlparser.mk | 8 +++++++-
2 files changed, 15 insertions(+), 1 deletion(-)
New commits:
commit 7ccef10f9c7c5af5258a29733783f9164894e3f7
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue May 29 09:44:00 2012 +0100
get shell to build for me again
Change-Id: Idf2dc8025085e417e7368d77420131ad459544b8
diff --git a/shell/Library_recentfile.mk b/shell/Library_recentfile.mk
index 134847d..7588299 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 13638bf..eeefe1d 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 \
))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
