diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-21 18:56:16 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-21 18:56:16 +0200 |
commit | a233dac0653f3f3054f7ad2da114ed989747e89a (patch) | |
tree | bf1e11438321c06125a94308649c496648061ccb /vcl/Library_vclplug_gen.mk | |
parent | acb6133d89abe071108577f821d7eaa381378879 (diff) | |
parent | e5647de7dd26775e45af24f11ac4f82a5518bd9e (diff) |
resyncing to master
Diffstat (limited to 'vcl/Library_vclplug_gen.mk')
-rw-r--r-- | vcl/Library_vclplug_gen.mk | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk index 95428ae53853..819d9ce8c301 100644 --- a/vcl/Library_vclplug_gen.mk +++ b/vcl/Library_vclplug_gen.mk @@ -32,10 +32,14 @@ $(eval $(call gb_Library_set_include,vclplug_gen,\ -I$(SRCDIR)/vcl/inc \ -I$(SRCDIR)/vcl/inc/pch \ -I$(SRCDIR)/solenv/inc \ - -I$(OUTDIR)/inc/offuh \ -I$(OUTDIR)/inc \ )) +$(eval $(call gb_Library_add_api,vclplug_gen,\ + offapi \ + udkapi \ +)) + $(eval $(call gb_Library_add_linked_libs,vclplug_gen,\ vcl \ tl \ @@ -63,6 +67,22 @@ $(call gb_Library_use_externals,vclplug_gen,\ icuuc \ ) +)) +$(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 \ +)) +endif + $(eval $(call gb_Library_add_exception_objects,vclplug_gen,\ vcl/unx/generic/app/i18n_cb \ vcl/unx/generic/app/i18n_ic \ @@ -117,7 +137,6 @@ $(eval $(call gb_Library_add_defs,vclplug_gen,\ -DVCLPLUG_GEN_IMPLEMENTATION \ )) - ## handle RandR ifneq ($(ENABLE_RANDR),) $(eval $(call gb_Library_add_defs,vclplug_gen,\ |