diff options
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 11440feabc7d..5847c4672ee1 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -237,11 +237,18 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ ascii_expat_xmlparse \ expat_xmlparse \ expat_xmltok \ + expat_xmlparse_x64 \ + expat_xmltok_x64 \ )) define gb_LinkTarget__use_expat $(if $(2),,$(error gb_LinkTarget__use_expat needs additional parameter)) +$(call gb_LinkTarget_set_include,$(1),\ + -I$(OUTDIR)/inc/external/expat \ + $$(INCLUDE) \ +) + $(if $(filter-out ascii_expat_xmlparse,$(2)),\ $(call gb_LinkTarget_add_defs,$(1),\ -DXML_UNICODE \ @@ -249,7 +256,7 @@ $(if $(filter-out ascii_expat_xmlparse,$(2)),\ $(call gb_LinkTarget_use_static_libraries,$(1),\ $(2) \ - expat_xmltok \ + $(3)\ ) endef @@ -258,12 +265,17 @@ 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),ascii_expat_xmlparse) +$(call gb_LinkTarget__use_expat,$(1),ascii_expat_xmlparse,expat_xmltok) endef define gb_LinkTarget__use_expat_utf16 -$(call gb_LinkTarget__use_expat,$(1),expat_xmlparse) +$(call gb_LinkTarget__use_expat,$(1),expat_xmlparse,expat_xmltok) + +endef + +define gb_LinkTarget__use_expat_utf16_x64 +$(call gb_LinkTarget__use_expat,$(1),expat_xmlparse_x64,expat_xmltok_x64) endef |