diff options
| author | David Tardon <dtardon@redhat.com> | 2015-05-19 16:12:08 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2015-05-20 09:42:02 +0200 |
| commit | 78deb81c55266d37e35ff97fbb5b4086245d8ff2 (patch) | |
| tree | 765d016407154ba303a46540733b6f449956adb0 /RepositoryExternal.mk | |
| parent | 4073649f9b360fb4e3c553169c270f31ec6d6e59 (diff) | |
build libetonyek as shared lib
Change-Id: Id98bc62bd41846550dc9149d462a3b85bb2538c5
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 30 |
1 files changed, 29 insertions, 1 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index a114e13d4322..47e4d179aa68 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1700,13 +1700,39 @@ gb_ExternalProject__use_etonyek := else # !SYSTEM_ETONYEK +ifeq ($(COM),MSC) + +$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\ + etonyek \ +)) + +define gb_LinkTarget__use_etonyek +$(call gb_LinkTarget_set_include,$(1),\ + -I$(call gb_UnpackedTarball_get_dir,libetonyek)/inc \ + $$(INCLUDE) \ +) +$(call gb_LinkTarget_use_libraries,$(1),\ + etonyek \ +) + +endef + +else # !MSC + +$(eval $(call gb_Helper_register_packages_for_install,ooo, \ + libetonyek \ +)) + define gb_LinkTarget__use_etonyek +$(call gb_LinkTarget_use_package,$(1),libetonyek) + $(call gb_LinkTarget_set_include,$(1),\ -I${WORKDIR}/UnpackedTarball/libetonyek/inc \ + -DLIBETONYEK_VISIBILITY \ $$(INCLUDE) \ ) $(call gb_LinkTarget_add_libs,$(1),\ - $(call gb_UnpackedTarball_get_dir,libetonyek)/src/lib/.libs/libetonyek-0.1$(gb_StaticLibrary_PLAINEXT) \ + -L$(call gb_UnpackedTarball_get_dir,libetonyek)/src/lib/.libs -letonyek-0.1 \ ) $(call gb_LinkTarget_use_external_project,$(1),libetonyek) @@ -1717,6 +1743,8 @@ $(call gb_ExternalProject_use_external_project,$(1),libetonyek) endef +endif + endif # SYSTEM_ETONYEK |