diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-11-10 22:14:42 +0100 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-11-20 20:36:42 +0000 |
| commit | 2cb7ba189d308bb8ee30086ebf237518eba8cef1 (patch) | |
| tree | aaf1533d367a39334023e0892cce472455a9faaf /RepositoryExternal.mk | |
| parent | 835d0fb70097b41eef057493bb1fb67c12ce5306 (diff) | |
cairo: convert to gbuild
Change-Id: I1f3dd368a0d0b78b73df3baad214a1079bbbd1d3
Reviewed-on: https://gerrit.libreoffice.org/1144
Reviewed-by: Andras Timar <atimar@suse.com>
Tested-by: Andras Timar <atimar@suse.com>
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 34 |
1 files changed, 9 insertions, 25 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index ad12be06f12e..5b66ac1f8a47 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -744,43 +744,27 @@ $(call gb_LinkTarget_add_libs,$(1),$(CAIRO_LIBS)) endef -else # !SYSTEM_CAIRO +else ifeq ($(SYSTEM_CAIRO),NO) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ cairo \ + $(if $(filter-out MACOSX WNT,$(OS)), \ + pixman-1 \ + ) \ )) -ifneq ($(OS),WNT) -ifeq ($(OS),MACOSX) -$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ - pixman-1 \ -)) -else -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - pixman-1 \ -)) -endif # MACOSX -endif # WNT define gb_LinkTarget__use_cairo $(call gb_LinkTarget_set_include,$(1),\ - $$(INCLUDE) \ - -I$(OUTDIR)/inc/cairo \ + -I$(call gb_UnpackedTarball_get_dir,cairo)/src \ $(FREETYPE_CFLAGS) \ + $$(INCLUDE) \ ) $(call gb_LinkTarget_use_libraries,$(1),\ cairo \ + $(if $(filter-out MACOSX WNT,$(OS)), \ + pixman-1 \ + ) \ ) -ifneq ($(OS),WNT) -ifeq ($(OS),MACOSX) -$(call gb_LinkTarget_use_static_libraries,$(1),\ - pixman-1 \ -) -else -$(call gb_LinkTarget_use_libraries,$(1),\ - pixman-1 \ -) -endif -endif endef |