diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-06-29 16:40:32 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-06-30 11:35:17 +0100 |
| commit | ced906ea4d0b2ab93fc1c6417097db513fbef5a7 (patch) | |
| tree | 0da35a7b20166d420e5820ec08b1a452ad2ecfdf /vcl/Library_vclplug_gen.mk | |
| parent | 9302fd5dc62c4e04bc19f1e993f83baa21f14c98 (diff) | |
tweak for internal cairo
Diffstat (limited to 'vcl/Library_vclplug_gen.mk')
| -rw-r--r-- | vcl/Library_vclplug_gen.mk | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk index 783d56b61f65..d1954004b3d3 100644 --- a/vcl/Library_vclplug_gen.mk +++ b/vcl/Library_vclplug_gen.mk @@ -65,11 +65,21 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_gen,\ )) ifeq ($(SYSTEM_CAIRO),YES) +$(eval $(call gb_Library_set_cxxflags,vclplug_gen,\ + $$(CXXFLAGS) \ + $$(CAIRO_CFLAGS) \ + -DSYSTEM_CAIRO \ +)) $(eval $(call gb_Library_set_ldflags,vclplug_gen,\ $$(LDFLAGS) \ $$(CAIRO_LIBS) \ )) else +$(eval $(call gb_Library_set_cxxflags,vclplug_gen,\ + $$(CXXFLAGS) \ + $$(FONTCONFIG_CFLAGS) \ + $$(FREETYPE_CFLAGS) \ +)) $(eval $(call gb_Library_add_linked_libs,vclplug_gen,\ cairo \ )) @@ -130,12 +140,6 @@ $(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),) $(eval $(call gb_Library_set_defs,vclplug_gen,\ |