diff options
| author | Herbert Dürr <hdu@apache.org> | 2011-10-05 05:57:48 +0000 |
|---|---|---|
| committer | Herbert Dürr <hdu@apache.org> | 2011-10-05 05:57:48 +0000 |
| commit | d7ab6f4faa1d1a04f95767764c19f0fcd062a37a (patch) | |
| tree | 51b07f829dd9ad8ef9ff7efb8614bcff567413a2 /vcl | |
| parent | 8cd8633030ae18d24ab85ef30ad9dfa834cc41ab (diff) | |
fix vclplug detection after DLLPOSTFIX changes (author=ariel)
Diffstat (limited to 'vcl')
| -rwxr-xr-x | vcl/Library_vcl.mk | 2 | ||||
| -rw-r--r-- | vcl/unx/generic/plugadapt/salplug.cxx | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 8ed102a9f32e..a1537c32db87 100755 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -171,7 +171,7 @@ ifeq ($(GUIBASE),unx) $(eval $(call gb_Library_set_defs,vcl,\ $$(DEFS) \ -DSAL_DLLPREFIX=\"$(gb_Library_SYSPRE)\" \ - -DSAL_DLLPOSTFIX=\"$(gb_Library_OOOEXT)\" \ + -DSAL_DLLPOSTFIX=\"\" \ -D_XSALSET_LIBNAME=\"$(call gb_Library_get_runtime_filename,spa)\" \ )) ## handle fontconfig diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx index 00058bf24461..29970e1299e6 100644 --- a/vcl/unx/generic/plugadapt/salplug.cxx +++ b/vcl/unx/generic/plugadapt/salplug.cxx @@ -67,6 +67,7 @@ static SalInstance* tryInstance( const OUString& rModuleBase ) aModName.appendAscii( SAL_DLLPREFIX"vclplug_" ); aModName.append( rModuleBase ); aModName.appendAscii( SAL_DLLPOSTFIX ); + aModName.appendAscii( SAL_DLLEXTENSION ); OUString aModule = aModName.makeStringAndClear(); oslModule aMod = osl_loadModuleRelative( |