diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-09-13 12:23:36 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-10-02 11:24:38 +0200 |
| commit | 0f3be2e19fa408d7069d586ccf04cb3f3eccd6b9 (patch) | |
| tree | 7cd14806e1098bdc08cfc84f0e00480f8d09dc68 /vcl/Library_vcl.mk | |
| parent | 3af4e1a0825c5b11ae4ef58fc411378aab669387 (diff) | |
Unify sal plugin loaders
Change-Id: Ic099761eaff80349e985ccf62e3f4aa6b2e98022
Reviewed-on: https://gerrit.libreoffice.org/61103
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'vcl/Library_vcl.mk')
| -rw-r--r-- | vcl/Library_vcl.mk | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index d8fd456b3417..e75ff64b2b34 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -106,6 +106,7 @@ $(eval $(call gb_Library_use_externals,vcl,\ lcms2 \ mdds_headers \ )) + ifeq ($(DISABLE_GUI),) $(eval $(call gb_Library_use_externals,vcl,\ epoxy \ @@ -474,7 +475,7 @@ vcl_headless_freetype_code=\ ifeq ($(USING_X11),TRUE) $(eval $(call gb_Library_add_exception_objects,vcl,\ - vcl/unx/generic/plugadapt/salplug \ + vcl/source/app/salplug \ vcl/unx/generic/printer/jobdata \ vcl/unx/generic/printer/ppdparser \ vcl/unx/generic/gdi/nativewindowhandleprovider \ @@ -520,8 +521,10 @@ $(eval $(call gb_Library_add_libs,vcl,\ -lpthread \ )) endif -else - $(eval $(call gb_Library_add_exception_objects,vcl,\ + +else # ! DISABLE_GUI + +$(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/opengl/DeviceInfo \ vcl/opengl/gdiimpl \ vcl/opengl/salbmp \ @@ -547,7 +550,8 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/opengl/x11/X11DeviceInfo \ )) endif -endif +endif # ! DISABLE_GUI + ifeq ($(OS),HAIKU) $(eval $(call gb_Library_add_exception_objects,vcl,\ @@ -563,7 +567,7 @@ $(eval $(call gb_Library_add_libs,vcl,\ )) $(eval $(call gb_Library_add_exception_objects,vcl, \ - $(if $(or $(ENABLE_QT5),$(ENABLE_KDE5)),vcl/unx/generic/plugadapt/salplug) \ + $(if $(or $(ENABLE_QT5),$(ENABLE_KDE5)),vcl/source/app/salplug) \ )) $(eval $(call gb_Library_use_externals,vcl,\ @@ -574,6 +578,7 @@ $(eval $(call gb_Library_use_externals,vcl,\ )) endif + ifeq ($(OS),ANDROID) $(eval $(call gb_Library_add_libs,vcl,\ -llog \ @@ -605,7 +610,6 @@ $(eval $(call gb_Library_add_cxxflags,vcl,\ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/ios/iosinst \ vcl/ios/dummies \ - $(vcl_really_generic_code) \ $(vcl_coretext_code) \ $(vcl_quartz_code) \ $(vcl_headless_code) \ @@ -624,7 +628,7 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\ )) $(eval $(call gb_Library_add_exception_objects,vcl,\ - vcl/osx/salplug \ + vcl/source/app/salplug \ )) endif @@ -633,7 +637,7 @@ ifeq ($(OS),WNT) $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/opengl/win/WinDeviceInfo \ vcl/opengl/win/blocklist_parser \ - vcl/win/app/salplug \ + vcl/source/app/salplug \ )) $(eval $(call gb_Library_use_system_win32_libs,vcl,\ |