summaryrefslogtreecommitdiff
path: root/vcl/Library_vclplug_gen.mk
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-06-29 16:22:09 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-06-30 11:35:17 +0100
commit1e409eadc59ac9164b1af01a821ea26c1167cdb2 (patch)
treec1835f6b10fe898b9f234a86f8b74f523892079e /vcl/Library_vclplug_gen.mk
parenta0ae520db0a920b68d53592ffb7521e3dc916c05 (diff)
make cairo an unconditional requirement for text rendering
Diffstat (limited to 'vcl/Library_vclplug_gen.mk')
-rw-r--r--vcl/Library_vclplug_gen.mk16
1 files changed, 16 insertions, 0 deletions
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index b5cca31d365f..783d56b61f65 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -64,6 +64,17 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_gen,\
$(gb_STDLIBS) \
))
+ifeq ($(SYSTEM_CAIRO),YES)
+$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
+ $$(LDFLAGS) \
+ $$(CAIRO_LIBS) \
+))
+else
+$(eval $(call gb_Library_add_linked_libs,vclplug_gen,\
+ cairo \
+))
+endif
+
$(eval $(call gb_Library_add_exception_objects,vclplug_gen,\
vcl/unx/generic/app/i18n_cb \
vcl/unx/generic/app/i18n_ic \
@@ -119,6 +130,11 @@ $(eval $(call gb_Library_set_defs,vclplug_gen,\
-DVCLPLUG_GEN_IMPLEMENTATION \
))
+## unconditional cairo
+$(eval $(call gb_Library_set_cxxflags,vclplug_gen,\
+ $$(CXXFLAGS) \
+ $$(CAIRO_CFLAGS) \
+))
## handle RandR
ifneq ($(ENABLE_RANDR),)