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/unx/generic/plugadapt | |
| 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/unx/generic/plugadapt')
| -rw-r--r-- | vcl/unx/generic/plugadapt/salplug.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
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 ); |