diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-07-03 20:43:32 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-07-03 20:48:32 +0200 |
| commit | 9dd152107c6a1644b180da24f01e3d5a3e309d13 (patch) | |
| tree | 2d6efa4095fe29e40c0f7d216409a6711505c531 | |
| parent | e52b3a2be08b8811f76e1f2bbb1e2438dcfbb3b3 (diff) | |
fix libmerged: vclplug_svp is in
Change-Id: I6ab00275b36725fbb0a446c7e5eb888e034a8989
| -rw-r--r-- | Library_merged.mk | 6 | ||||
| -rw-r--r-- | vcl/Library_vcl.mk | 1 | ||||
| -rw-r--r-- | vcl/unx/generic/plugadapt/salplug.cxx | 3 |
3 files changed, 10 insertions, 0 deletions
diff --git a/Library_merged.mk b/Library_merged.mk index 4cfff2bfc06b..533acb0a542b 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -30,6 +30,12 @@ $(eval $(call gb_Library_use_libraries,merged,\ $(gb_UWINAPI) \ )) +ifeq ($(GUIBASE),unx) +$(eval $(call gb_Library_use_static_libraries,merged,\ + headless \ +)) +endif + $(eval $(call gb_Library_use_externals,merged,\ icu_headers \ icui18n \ diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index e5275080aefd..0c980e98db85 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -48,6 +48,7 @@ $(eval $(call gb_Library_add_defs,vcl,\ -DCUI_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,cui))\" \ -DDESKTOP_DETECTOR_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,desktop_detector))\" \ -DTK_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,tk))\" \ + -DVCLPLUG_SVP_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,vclplug_svp))\" \ )) $(eval $(call gb_Library_use_sdk_api,vcl)) diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx index cf7ff979b7b5..40a9683bc8a2 100644 --- a/vcl/unx/generic/plugadapt/salplug.cxx +++ b/vcl/unx/generic/plugadapt/salplug.cxx @@ -54,6 +54,9 @@ static SalInstance* tryInstance( const OUString& rModuleBase, bool bForce = fals SAL_DLLPREFIX #endif "vclplug_" + rModuleBase + "lo" SAL_DLLEXTENSION ); + // vclplug_svp is in libmerged + if (rModuleBase == "svp") + aModule = VCLPLUG_SVP_DLL_NAME; oslModule aMod = osl_loadModuleRelative( reinterpret_cast< oslGenericFunction >( &tryInstance ), aModule.pData, |