diff options
Diffstat (limited to 'vcl/Library_vclplug_gen.mk')
-rw-r--r-- | vcl/Library_vclplug_gen.mk | 56 |
1 files changed, 21 insertions, 35 deletions
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk index 8e1e8428cc00..99b319e453fa 100644 --- a/vcl/Library_vclplug_gen.mk +++ b/vcl/Library_vclplug_gen.mk @@ -49,8 +49,6 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_gen,\ basegfx \ comphelper \ cppuhelper \ - icuuc \ - icule \ i18nisolang1 \ i18npaper \ i18nutil \ @@ -64,22 +62,22 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_gen,\ $(gb_STDLIBS) \ )) -ifeq ($(SYSTEM_CAIRO),YES) -$(eval $(call gb_Library_set_cxxflags,vclplug_gen,\ - $$(CXXFLAGS) \ - $$(CAIRO_CFLAGS) \ - -DSYSTEM_CAIRO \ +$(eval $(call gb_Library_use_externals,vclplug_gen,\ + icule \ + icuuc \ )) + +ifeq ($(SYSTEM_CAIRO),YES) $(eval $(call gb_Library_set_ldflags,vclplug_gen,\ $$(LDFLAGS) \ $$(CAIRO_LIBS) \ )) else -$(eval $(call gb_Library_set_cxxflags,vclplug_gen,\ - $$(CXXFLAGS) \ +$(eval $(call gb_Library_add_cxxflags,vclplug_gen,\ $$(FONTCONFIG_CFLAGS) \ $$(FREETYPE_CFLAGS) \ )) + $(eval $(call gb_Library_add_linked_libs,vclplug_gen,\ cairo \ )) @@ -132,30 +130,26 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gen,\ vcl/unx/generic/window/salobj \ )) -$(eval $(call gb_Library_set_defs,vclplug_gen,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,vclplug_gen,\ -D_XSALSET_LIBNAME=\"$(call gb_Library_get_runtime_filename,spa)\" \ -DVCLPLUG_GEN_IMPLEMENTATION \ )) ## handle RandR ifneq ($(ENABLE_RANDR),) -$(eval $(call gb_Library_set_defs,vclplug_gen,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,vclplug_gen,\ -DUSE_RANDR \ )) ifeq ($(XRANDR_DLOPEN),FALSE) -$(eval $(call gb_Library_set_cxxflags,vclplug_gen,\ - $$(CXXFLAGS) \ +$(eval $(call gb_Library_set_include,vclplug_gen,\ + $$(INCLUDE) \ $$(XRANDR_CFLAGS) \ )) -$(eval $(call gb_Library_set_ldflags,vclplug_gen,\ - $$(LDFLAGS) \ +$(eval $(call gb_Library_add_libs,vclplug_gen,\ $(XRANDR_LIBS) \ )) else -$(eval $(call gb_Library_set_defs,vclplug_gen,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,vclplug_gen,\ -DXRANDR_DLOPEN \ )) endif @@ -165,37 +159,31 @@ endif ifneq ($(USE_XINERAMA),NO) ifneq ($(OS),SOLARIS) # not Solaris -$(eval $(call gb_Library_set_defs,vclplug_gen,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,vclplug_gen,\ -DUSE_XINERAMA_XORG \ )) ifeq ($(XINERAMA_LINK),dynamic) -$(eval $(call gb_Library_set_ldflags,vclplug_gen,\ - $$(LDFLAGS) \ +$(eval $(call gb_Library_add_libs,vclplug_gen,\ -lXinerama \ )) else -$(eval $(call gb_Library_set_ldflags,vclplug_gen,\ - $$(LDFLAGS) \ +$(eval $(call gb_Library_add_libs,vclplug_gen,\ -Wl,-Bstatic -lXinerama -Wl,-Bdynamic \ )) endif else # Solaris -$(eval $(call gb_Library_set_defs,vclplug_gen,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,vclplug_gen,\ -DUSE_XINERAMA_XSUN \ )) ifeq ($(USE_XINERAMA_VERSION),Xorg) # Solaris, Xorg ifeq ($(XINERAMA_LINK),dynamic) -$(eval $(call gb_Library_set_ldflags,vclplug_gen,\ - $$(LDFLAGS) \ +$(eval $(call gb_Library_add_libs,vclplug_gen,\ -lXinerama \ )) else -$(eval $(call gb_Library_set_ldflags,vclplug_gen,\ - $$(LDFLAGS) \ +$(eval $(call gb_Library_add_libs,vclplug_gen,\ -Wl,-Bstatic -lXinerama -Wl,-Bdynamic \ )) endif @@ -205,12 +193,10 @@ endif ## handle Render linking ifeq ($(XRENDER_LINK),YES) -$(eval $(call gb_Library_set_defs,vclplug_gen,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,vclplug_gen,\ -DXRENDER_LINK \ )) -$(eval $(call gb_Library_set_ldflags,vclplug_gen,\ - $$(LDFLAGS) \ +$(eval $(call gb_Library_add_libs,vclplug_gen,\ $(shell pkg-config --libs xrender) \ )) endif |