mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

get shell to build for me again

Browse Source 
Change-Id: Idf2dc8025085e417e7368d77420131ad459544b8
This commit is contained in:
Caolán McNamara
2012-05-29 09:44:00 +01:00
parent e689eb6401
commit 7ccef10f9c
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
shell/Library_recentfile.mk
View File

@@ -32,10 +32,18 @@ $(eval $(call gb_Library_set_include,recentfile,\
$$(INCLUDE) \ $$(INCLUDE) \
)) ))
ifeq ($(GUI),WNT)
$(eval $(call gb_Library_use_externals,recentfile,\ $(eval $(call gb_Library_use_externals,recentfile,\
expat_utf16 \ expat_utf16 \
)) ))
else
$(eval $(call gb_Library_use_externals,recentfile,\
expat_utf8 \
))
endif
$(eval $(call gb_Library_use_libraries,recentfile,\ $(eval $(call gb_Library_use_libraries,recentfile,\
sal \ sal \
$(gb_STDLIBS) \ $(gb_STDLIBS) \

8
shell/StaticLibrary_xmlparser.mk
View File

@@ -36,12 +36,18 @@ ifeq ($(GUI),WNT)
$(eval $(call gb_StaticLibrary_add_defs,shell_xmlparser,\ $(eval $(call gb_StaticLibrary_add_defs,shell_xmlparser,\
-DXML_UNICODE \ -DXML_UNICODE \
)) ))
endif
$(eval $(call gb_StaticLibrary_use_externals,shell_xmlparser,\ $(eval $(call gb_StaticLibrary_use_externals,shell_xmlparser,\
expat_utf16 \ expat_utf16 \
)) ))
else
$(eval $(call gb_StaticLibrary_use_externals,shell_xmlparser,\
expat_utf8 \
))
endif
$(eval $(call gb_StaticLibrary_add_exception_objects,shell_xmlparser,\ $(eval $(call gb_StaticLibrary_add_exception_objects,shell_xmlparser,\
shell/source/all/xml_parser \ shell/source/all/xml_parser \
)) ))