diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-22 18:02:28 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-22 22:30:20 +0200 |
| commit | c03ff5ebc0f008825e45285f7c4021329bd60c05 (patch) | |
| tree | f47d34d1d7f5f351a273d70b68ce8923aa0eedb1 /RepositoryExternal.mk | |
| parent | 37563db622eef1bf13fe78b21507fba033586560 (diff) | |
libxml2, libxslt: use libraries from WORKDIR
Change-Id: I3067e3c819a4918e1d3c91dc0e0cfa3e4fc92b3d
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 34 |
1 files changed, 27 insertions, 7 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 4eadf2fe1dcd..a01bc5c723e0 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -760,14 +760,21 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \ define gb_LinkTarget__use_libxml2 $(call gb_LinkTarget_use_package,$(1),xml2) -$(call gb_LinkTarget_use_libraries,$(1),\ - xml2 \ -) $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ -I$(call gb_UnpackedTarball_get_dir,xml2)/include \ ) +ifeq ($(COM),MSC) +$(call gb_LinkTarget_add_libs,$(1),\ + $(call gb_UnpackedTarball_get_dir,xml2)/win32/bin.msvc/libxml2.lib \ +) +else +$(call gb_LinkTarget_add_libs,$(1),\ + -L$(call gb_UnpackedTarball_get_dir,xml2)/.libs -lxml2 \ +) +endif + endef define gb_ExternalProject__use_libxml2 $(call gb_ExternalProject_use_package,$(1),xml2) @@ -811,9 +818,16 @@ $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ -I$(call gb_UnpackedTarball_get_dir,xslt) \ ) -$(call gb_LinkTarget_use_libraries,$(1),\ - xslt \ + +ifeq ($(COM),MSC) +$(call gb_LinkTarget_add_libs,$(1),\ + $(call gb_UnpackedTarball_get_dir,xslt)/win32/bin.msvc/libxslt.lib \ ) +else +$(call gb_LinkTarget_add_libs,$(1),\ + -L$(call gb_UnpackedTarball_get_dir,xslt)/libxslt/.libs -lxslt \ +) +endif endef @@ -824,9 +838,15 @@ $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,xslt) \ ) -$(call gb_LinkTarget_use_libraries,$(1),\ - exslt \ +ifeq ($(COM),MSC) +$(call gb_LinkTarget_add_libs,$(1),\ + $(call gb_UnpackedTarball_get_dir,xslt)/win32/bin.msvc/libexslt.lib \ ) +else +$(call gb_LinkTarget_add_libs,$(1),\ + -L$(call gb_UnpackedTarball_get_dir,xslt)/libexslt/.libs -lexslt \ +) +endif endef |