diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-10-14 15:06:55 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2015-11-19 12:56:56 +0200 |
| commit | 7de4e7c8b7c652e9d72098b71b997f6cf71d0726 (patch) | |
| tree | 8a26d06d504cd186017be8fb42882d8ce4a5b690 | |
| parent | 9cf1ee8eec6841b478837ee4c75b4f6cba1c39da (diff) | |
link vcl against libglyphy
Change-Id: I5b206f5d857d28acda82ce8ac53f835142f46da2
| -rw-r--r-- | RepositoryExternal.mk | 24 | ||||
| -rw-r--r-- | external/glyphy/ExternalPackage_glyphy.mk | 6 | ||||
| -rw-r--r-- | vcl/Library_vcl.mk | 4 |
3 files changed, 34 insertions, 0 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 42f53dbb4ea9..64e48acee186 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -272,6 +272,30 @@ endef endif # SYSTEM_GLEW +$(eval $(call gb_Helper_register_packages_for_install,ooo,\ + liborcus \ +)) + +ifneq ($(SYSTEM_GLEW),) + +else # !SYSTEM_GLYPHY + +define gb_LinkTarget__use_glyphy +$(call gb_LinkTarget_use_package,$(1),glyphy) + +$(call gb_LinkTarget_set_include,$(1),\ + -I$(call gb_UnpackedTarball_get_dir,glyphy/include) \ + $$(INCLUDE) \ +) + +$(call gb_LinkTarget_add_libs,$(1),\ + -L$(call gb_UnpackedTarball_get_dir,glyphy)/src/.libs -lglyphy \ +) + +endef + +endif GLYPHY + define gb_LinkTarget__use_iconv $(call gb_LinkTarget_add_libs,$(1),-liconv) diff --git a/external/glyphy/ExternalPackage_glyphy.mk b/external/glyphy/ExternalPackage_glyphy.mk index 484590d20919..cbae840b894e 100644 --- a/external/glyphy/ExternalPackage_glyphy.mk +++ b/external/glyphy/ExternalPackage_glyphy.mk @@ -11,4 +11,10 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,glyphy,glyphy)) $(eval $(call gb_ExternalPackage_use_external_project,glyphy,glyphy)) +ifeq ($(OS),MACOSX) +$(eval $(call gb_ExternalPackage_add_file,glyphy,$(LIBO_LIB_FOLDER)/libglyphy.dylib,src/.libs/libglyphy.dylib)) +else ifeq ($(DISABLE_DYNLOADING),) +$(eval $(call gb_ExternalPackage_add_file,glyphy,$(LIBO_LIB_FOLDER)/libglyphy.so.0,src/.libs/libglyphy.so.0.0.0)) +endif + # vim: set noet sw=4 ts=4: diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 0da204a390d7..1d2ec5646b57 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -741,6 +741,10 @@ $(eval $(call gb_Library_add_libs,vcl,\ -lXext \ )) +$(eval $(call gb_Library_use_externals,vcl,\ + glyphy \ +)) + $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/opengl/x11/X11DeviceInfo \ )) |