diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-12-13 01:45:24 +0100 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-12-13 09:58:26 +0100 |
| commit | b2882faf43ea1fa473621d0378c5d87ae3b3d5a2 (patch) | |
| tree | 709c4c3754c395f2c839ebe3bd4c5b4d730cd4d5 /vcl | |
| parent | 1aa0a43d60336eb1f0e51805939a7cc00b377a2b (diff) | |
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 <glogow@fbihome.de>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/Library_desktop_detector.mk | 3 | ||||
| -rw-r--r-- | vcl/source/app/salplug.cxx | 2 |
2 files changed, 4 insertions, 1 deletions
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() |