mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix libmerged: vclplug_svp is in

Browse Source 
Change-Id: I6ab00275b36725fbb0a446c7e5eb888e034a8989
This commit is contained in:
Matúš Kukan
2014-07-03 20:43:32 +02:00
parent e52b3a2be0
commit 9dd152107c
3 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Library_merged.mk
View File

@@ -30,6 +30,12 @@ $(eval $(call gb_Library_use_libraries,merged,\
$(gb_UWINAPI) \ $(gb_UWINAPI) \
)) ))
ifeq ($(GUIBASE),unx)
$(eval $(call gb_Library_use_static_libraries,merged,\
headless \
))
endif
$(eval $(call gb_Library_use_externals,merged,\ $(eval $(call gb_Library_use_externals,merged,\
icu_headers \ icu_headers \
icui18n \ icui18n \

1
vcl/Library_vcl.mk
View File

@@ -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))\" \ -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))\" \ -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))\" \ -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)) $(eval $(call gb_Library_use_sdk_api,vcl))

3
vcl/unx/generic/plugadapt/salplug.cxx
View File

@@ -54,6 +54,9 @@ static SalInstance* tryInstance( const OUString& rModuleBase, bool bForce = fals
SAL_DLLPREFIX SAL_DLLPREFIX
#endif #endif
"vclplug_" + rModuleBase + "lo" SAL_DLLEXTENSION ); "vclplug_" + rModuleBase + "lo" SAL_DLLEXTENSION );
// vclplug_svp is in libmerged
if (rModuleBase == "svp")
aModule = VCLPLUG_SVP_DLL_NAME;
oslModule aMod = osl_loadModuleRelative( oslModule aMod = osl_loadModuleRelative(
reinterpret_cast< oslGenericFunction >( &tryInstance ), aModule.pData, reinterpret_cast< oslGenericFunction >( &tryInstance ), aModule.pData,