mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cairo: use libraries from WORKDIR

Browse Source 
Change-Id: Ieb28a48c5fe3b0d89261ff790ecc9db2b5bbf21c
This commit is contained in:
Michael Stahl 2013-10-23 21:27:05 +02:00
parent 2793c546dc
commit d89f48b43c
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
RepositoryExternal.mk
View File

@ -1034,10 +1034,10 @@ $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,cairo)/src \ -I$(call gb_UnpackedTarball_get_dir,cairo)/src \
$$(INCLUDE) \ $$(INCLUDE) \
) )
$(call gb_LinkTarget_use_libraries,$(1),\ $(call gb_LinkTarget_add_libs,$(1),\
cairo \ -L$(call gb_UnpackedTarball_get_dir,cairo)/src/.libs -lcairo \
$(if $(filter-out MACOSX WNT,$(OS)), \ $(if $(filter-out MACOSX WNT,$(OS)), \
pixman-1 \ -L$(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs -lpixman-1 \
) \ ) \
) )

1
external/cairo/ExternalPackage_cairo.mk vendored
View File

@ -11,7 +11,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,cairo,cairo))
$(eval $(call gb_ExternalPackage_use_external_project,cairo,cairo)) $(eval $(call gb_ExternalPackage_use_external_project,cairo,cairo))
$(eval $(call gb_ExternalPackage_add_file,cairo,lib/libcairo.so,src/.libs/libcairo.so.2.11000.2))
$(eval $(call gb_ExternalPackage_add_library_for_install,cairo,lib/libcairo.so.2,src/.libs/libcairo.so.2.11000.2)) $(eval $(call gb_ExternalPackage_add_library_for_install,cairo,lib/libcairo.so.2,src/.libs/libcairo.so.2.11000.2))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:

1
external/cairo/ExternalPackage_pixman.mk vendored
View File

@ -11,7 +11,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,pixman,pixman))
$(eval $(call gb_ExternalPackage_use_external_project,pixman,pixman)) $(eval $(call gb_ExternalPackage_use_external_project,pixman,pixman))
$(eval $(call gb_ExternalPackage_add_file,pixman,lib/libpixman-1.so,pixman/.libs/libpixman-1.so.0.24.4))
$(eval $(call gb_ExternalPackage_add_library_for_install,pixman,lib/libpixman-1.so.0,pixman/.libs/libpixman-1.so.0.24.4)) $(eval $(call gb_ExternalPackage_add_library_for_install,pixman,lib/libpixman-1.so.0,pixman/.libs/libpixman-1.so.0.24.4))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4: