diff options
| -rw-r--r-- | vcl/Library_vclplug_gen.mk | 16 | ||||
| -rw-r--r-- | vcl/unx/generic/gdi/salgdi3.cxx | 6 |
2 files changed, 16 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,\ diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx index 17240c90080a..25dc002cfdc5 100644 --- a/vcl/unx/generic/gdi/salgdi3.cxx +++ b/vcl/unx/generic/gdi/salgdi3.cxx @@ -83,9 +83,15 @@ #include <graphite_serverfont.hxx> #endif +#ifdef SYSTEM_CAIRO #include <cairo.h> #include <cairo-ft.h> #include <cairo-xlib-xrender.h> +#else +#include <cairo/cairo.h> +#include <cairo/cairo-ft.h> +#include <cairo/cairo-xlib-xrender.h> +#endif struct BOX { |