diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2012-11-15 17:55:05 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-11-15 18:33:09 +0200 |
| commit | d8edf07ed9e7a3e2f2ab43ffd2935b93326f2caa (patch) | |
| tree | fcc91844900827238324f8ad93f1dbf64306b13b /expat/UnpackedTarball_expat.mk | |
| parent | 42782fddff98eeab5c8249918e9ba000f08c22e8 (diff) | |
Bin use of UTF-16 expat variant in the Windows shell extension
Thus we can drop that variant completely.
Change-Id: I11a8e40436921219bd6dd4afad4c7907ccb6b84c
Diffstat (limited to 'expat/UnpackedTarball_expat.mk')
| -rw-r--r-- | expat/UnpackedTarball_expat.mk | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/expat/UnpackedTarball_expat.mk b/expat/UnpackedTarball_expat.mk index a4daa51ea173..660271aa8300 100644 --- a/expat/UnpackedTarball_expat.mk +++ b/expat/UnpackedTarball_expat.mk @@ -15,18 +15,15 @@ $(eval $(call gb_UnpackedTarball_add_patches,expat,\ expat/expat-2.1.0.patch \ )) -# This is a bit hackish -# we need to compile it twice: -# with -DXML_UNICODE and without. +# This is a bit hackish. + +# When building for Windows (as 32-bit) we need to build it twice: as +# 32- and 64-bit code, to be able to produce a 64-bit Explorer +# ("shell") extension that is used when the 32-bit LibreOffice is +# installed on a 64-bit OS. -# This is a bit hackish too ;-) -# on windows 64 bit platform we need to link it twice: -# with $(LINK_X64_BINARY) and with $(gb_LINK). $(eval $(call gb_UnpackedTarball_set_post_action,expat,\ - cp lib/xmltok.c lib/unicode_xmltok.c && \ - cp lib/xmlrole.c lib/unicode_xmlrole.c && \ - cp lib/xmlparse.c lib/unicode_xmlparse.c \ - $(if $(filter $(BUILD_X64),TRUE), && \ + $(if $(filter $(BUILD_X64),TRUE), \ cp lib/xmlparse.c lib/xmlparse_x64.c && \ cp lib/xmltok.c lib/xmltok_x64.c && \ cp lib/xmlrole.c lib/xmlrole_x64.c) \ |