Library_merged.mk | 6 ++++++ vcl/Library_vcl.mk | 1 + vcl/unx/generic/plugadapt/salplug.cxx | 3 +++ 3 files changed, 10 insertions(+)
New commits: commit 9dd152107c6a1644b180da24f01e3d5a3e309d13 Author: Matúš Kukan <matus.ku...@collabora.com> Date: Thu Jul 3 20:43:32 2014 +0200 fix libmerged: vclplug_svp is in Change-Id: I6ab00275b36725fbb0a446c7e5eb888e034a8989 diff --git a/Library_merged.mk b/Library_merged.mk index 4cfff2b..533acb0a 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 e527508..0c980e9 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 cf7ff97..40a9683 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,
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits