diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2015-01-08 21:14:04 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2015-01-09 07:17:35 +0100 |
| commit | 5c5edaef89e953d260501678c3d62c47ad9763ac (patch) | |
| tree | 64a4c03d76aeffdeebc5680484bd71999d7bdf2d /vcl | |
| parent | 3f34668673e012860b971e24a7633c300df0c4d1 (diff) | |
Revert "Use SVLIBRARY instead of gb_Library_get_runtime_filename"
$(call gb_Library__get_name,foo) returns "libmerged" if library foo is merged.
This reverts commit ee567a63fad9e755b11ca28696da35f00ed3b0fc.
Change-Id: I6ab9b7f0b01262a6f9d5a6834a6cffdd6ffc6f8a
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/Library_vcl.mk | 4 | ||||
| -rw-r--r-- | vcl/source/app/svapp.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/abstdlg.cxx | 3 | ||||
| -rw-r--r-- | vcl/unx/generic/plugadapt/salplug.cxx | 4 |
4 files changed, 8 insertions, 5 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 1595954956fc..e8df725ebe32 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -46,6 +46,10 @@ $(eval $(call gb_Library_set_include,vcl,\ $(eval $(call gb_Library_add_defs,vcl,\ -DVCL_DLLIMPLEMENTATION \ -DVCLOPENGL_DLLIMPLEMENTATION \ + -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/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 1dc1fb04ddac..0d27e76887cd 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -1389,7 +1389,7 @@ UnoWrapperBase* Application::GetUnoWrapper( bool bCreateIfNotExist ) { #ifndef DISABLE_DYNLOADING osl::Module aTkLib; - OUString aLibName(SVLIBRARY("tk")); + OUString aLibName(TK_DLL_NAME); aTkLib.loadRelative(&thisModule, aLibName, SAL_LOADMODULE_DEFAULT); if (aTkLib.is()) { diff --git a/vcl/source/window/abstdlg.cxx b/vcl/source/window/abstdlg.cxx index 652ac5ef7dfb..869800ace32d 100644 --- a/vcl/source/window/abstdlg.cxx +++ b/vcl/source/window/abstdlg.cxx @@ -21,7 +21,6 @@ #include <rtl/ustring.hxx> #include <osl/module.hxx> -#include <tools/solar.h> #include <vcl/abstdlg.hxx> typedef VclAbstractDialogFactory* (SAL_CALL *FuncPtrCreateDialogFactory)(); @@ -39,7 +38,7 @@ VclAbstractDialogFactory* VclAbstractDialogFactory::Create() #ifndef DISABLE_DYNLOADING static ::osl::Module aDialogLibrary; if (aDialogLibrary.is() || - aDialogLibrary.loadRelative(&thisModule, SVLIBRARY("cui"), + aDialogLibrary.loadRelative(&thisModule, CUI_DLL_NAME, SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY)) { fp = ( VclAbstractDialogFactory* (SAL_CALL*)() ) diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx index 0d829ae1d751..80b5acf44722 100644 --- a/vcl/unx/generic/plugadapt/salplug.cxx +++ b/vcl/unx/generic/plugadapt/salplug.cxx @@ -79,7 +79,7 @@ static SalInstance* tryInstance( const OUString& rModuleBase, bool bForce = fals "vclplug_" + rModuleBase + "lo" SAL_DLLEXTENSION ); // vclplug_svp is in libmerged if (rModuleBase == "svp") - aModule = SVLIBRARY("vclplug_svp"); + aModule = VCLPLUG_SVP_DLL_NAME; oslModule aMod = osl_loadModuleRelative( reinterpret_cast< oslGenericFunction >( &tryInstance ), aModule.pData, @@ -141,7 +141,7 @@ static SalInstance* tryInstance( const OUString& rModuleBase, bool bForce = fals static DesktopType get_desktop_environment() { - OUString aModule(SVLIBRARY("desktop_detector")); + OUString aModule(DESKTOP_DETECTOR_DLL_NAME); oslModule aMod = osl_loadModuleRelative( reinterpret_cast< oslGenericFunction >( &tryInstance ), aModule.pData, SAL_LOADMODULE_DEFAULT ); |