diff options
Diffstat (limited to 'vcl/Library_vclplug_gen.mk')
| -rw-r--r-- | vcl/Library_vclplug_gen.mk | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk index a4dd1ae75373..500783ed67e1 100644 --- a/vcl/Library_vclplug_gen.mk +++ b/vcl/Library_vclplug_gen.mk @@ -60,7 +60,7 @@ $(eval $(call gb_Library_use_externals,vclplug_gen,\ icuuc \ valgrind \ Xrender \ - skia \ + $(if $(filter SKIA,$(BUILD_TYPE)),skia) \ )) $(eval $(call gb_Library_add_libs,vclplug_gen,\ @@ -94,7 +94,7 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gen,\ vcl/unx/generic/dtrans/X11_transferable \ vcl/unx/generic/gdi/cairo_xlib_cairo \ vcl/unx/generic/gdi/x11cairotextrender \ - vcl/unx/generic/gdi/gdiimpl \ + vcl/unx/generic/gdi/gdiimpl \ vcl/unx/generic/gdi/salbmp \ vcl/unx/generic/gdi/salgdi2 \ vcl/unx/generic/gdi/font \ @@ -105,12 +105,13 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gen,\ vcl/unx/generic/window/salobj \ vcl/unx/x11/x11sys \ vcl/unx/x11/xlimits \ - vcl/opengl/x11/cairotextrender \ - vcl/opengl/x11/gdiimpl \ - vcl/opengl/x11/salvd \ - vcl/skia/x11/cairotextrender \ - vcl/skia/x11/gdiimpl \ - vcl/skia/x11/salvd \ + vcl/opengl/x11/cairotextrender \ + vcl/opengl/x11/gdiimpl \ + vcl/opengl/x11/salvd \ + $(if $(filter SKIA,$(BUILD_TYPE)), \ + vcl/skia/x11/cairotextrender \ + vcl/skia/x11/gdiimpl \ + vcl/skia/x11/salvd) \ )) # ultimately we want to split the x11 dependencies out |