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 /RepositoryExternal.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 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 6712055d26b7..d4281c91ec02 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -287,7 +287,6 @@ else # !SYSTEM_EXPAT $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ expat \ - expat_utf16 \ expat_x64 \ )) @@ -299,11 +298,6 @@ $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ ) -$(if $(filter expat_utf16,$(2)),\ - $(call gb_LinkTarget_add_defs,$(1),\ - -DXML_UNICODE \ -)) - $(call gb_LinkTarget_use_static_libraries,$(1),\ $(2) \ ) @@ -312,18 +306,12 @@ endef endif # SYSTEM_EXPAT -# now define 2 wrappers that select which internal static library to use... define gb_LinkTarget__use_expat_utf8 $(call gb_LinkTarget__use_expat,$(1),expat) endef -define gb_LinkTarget__use_expat_utf16 -$(call gb_LinkTarget__use_expat,$(1),expat_utf16) - -endef - -define gb_LinkTarget__use_expat_utf16_x64 +define gb_LinkTarget__use_expat_utf8_x64 $(call gb_LinkTarget__use_expat,$(1),expat_x64) endef |