summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
Diffstat (limited to 'vcl')
-rw-r--r--vcl/Library_desktop_detector.mk3
-rw-r--r--vcl/source/app/salplug.cxx2
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()