Repository.mk | 2 +- vcl/Library_desktop_detector.mk | 3 ++- vcl/source/app/salplug.cxx | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-)
New commits: commit b2882faf43ea1fa473621d0378c5d87ae3b3d5a2 Author: Jan-Marek Glogowski <[email protected]> AuthorDate: Mon Dec 13 01:45:24 2021 +0100 Commit: Jan-Marek Glogowski <[email protected]> CommitDate: Mon Dec 13 09:58:26 2021 +0100 desktop_detector is also a vcl plugin Change-Id: I71445c16744674f75fed190911749f38226169e0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126715 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <[email protected]> diff --git a/Repository.mk b/Repository.mk index f386b8aa7c05..ae2804c6ebcc 100644 --- a/Repository.mk +++ b/Repository.mk @@ -363,7 +363,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ dbtools \ deploymentmisc \ $(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \ - $(if $(USING_X11),desktop_detector) \ $(call gb_Helper_optional,SCRIPTING,dlgprov) \ $(if $(filter WNT,$(OS)),directx9canvas) \ $(if $(ENABLE_OPENGL_CANVAS),oglcanvas) \ @@ -486,6 +485,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ $(eval $(call gb_Helper_register_plugins_for_install,OOOLIBS,ooo, \ acc \ cui \ + $(if $(USING_X11),desktop_detector) \ icg \ sdui \ $(if $(USING_X11),vclplug_gen) \ diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk index f28ff9078e64..b11f1367edab 100644 --- a/vcl/Library_desktop_detector.mk +++ b/vcl/Library_desktop_detector.mk @@ -19,6 +19,8 @@ $(eval $(call gb_Library_Library,desktop_detector)) +$(eval $(call gb_Library_set_plugin_for,desktop_detector,vcl)) + $(eval $(call gb_Library_set_include,desktop_detector,\ $$(INCLUDE) \ -I$(SRCDIR)/vcl/inc \ @@ -31,7 +33,6 @@ $(eval $(call gb_Library_add_defs,desktop_detector,\ $(eval $(call gb_Library_use_sdk_api,desktop_detector)) $(eval $(call gb_Library_use_libraries,desktop_detector,\ - vcl \ tl \ utl \ sot \ diff --git a/vcl/source/app/salplug.cxx b/vcl/source/app/salplug.cxx index 2737fb85663d..313ca6a4d719 100644 --- a/vcl/source/app/salplug.cxx +++ b/vcl/source/app/salplug.cxx @@ -140,6 +140,8 @@ SalInstance* tryInstance( const OUString& rModuleBase, bool bForce = false ) #ifdef DESKTOPDETECT #ifndef DISABLE_DYNLOADING extern "C" typedef DesktopType Fn_get_desktop_environment(); +#else +extern "C" DesktopType get_desktop_environment(); #endif DesktopType lcl_get_desktop_environment()
