diff options
| author | David Tardon <dtardon@redhat.com> | 2014-05-30 15:35:48 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2014-05-30 20:13:51 +0200 |
| commit | c887ea477f0d674d3721ffdf9ef92b5b5bfc5528 (patch) | |
| tree | 1d83dbd12941b4d87aab691a16d1af3a39ffc5e6 /RepositoryExternal.mk | |
| parent | cb90b4958f3d3f74f80128df17e917cfa536961b (diff) | |
build libwps as shared lib
Change-Id: Ic30d54461f799b745d0887b830445f00efeb6faa
(cherry picked from commit f85d10fdf651d131ecb0c3622326b3b076205e80)
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 33 |
1 files changed, 28 insertions, 5 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 08884a6a8c8f..9e20991c7c3e 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2003,22 +2003,45 @@ gb_ExternalProject__use_wps := else # !SYSTEM_WPS +ifeq ($(COM),MSC) + +$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\ + wps \ +)) + define gb_LinkTarget__use_wps $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,libwps)/inc \ $$(INCLUDE) \ ) -$(call gb_LinkTarget_add_libs,$(1),\ - $(call gb_UnpackedTarball_get_dir,libwps)/src/lib/.libs/libwps-0.3$(gb_StaticLibrary_PLAINEXT) \ + +$(call gb_LinkTarget_use_libraries,$(1),\ + wps \ ) -$(call gb_LinkTarget_use_external_project,$(1),libwps) endef -define gb_ExternalProject__use_wps -$(call gb_ExternalProject_use_external_project,$(1),libwps) + +else # !MSC + +$(eval $(call gb_Helper_register_packages_for_install,ooo, \ + libwps \ +)) + +define gb_LinkTarget__use_wps +$(call gb_LinkTarget_use_package,$(1),libwps) + +$(call gb_LinkTarget_set_include,$(1),\ + -I$(call gb_UnpackedTarball_get_dir,libwps)/inc \ + $$(INCLUDE) \ +) +$(call gb_LinkTarget_add_libs,$(1),\ + -L$(call gb_UnpackedTarball_get_dir,libwps)/src/lib/.libs -lwps-0.3 \ +) endef +endif # MSC + endif # SYSTEM_WPS |