incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h..@apache.org
Subject svn commit: r1179067 - in /incubator/ooo/trunk/main/vcl: Library_vcl.mk unx/generic/plugadapt/salplug.cxx
Date Wed, 05 Oct 2011 06:57:48 GMT
Author: hdu
Date: Wed Oct  5 06:57:48 2011
New Revision: 1179067

URL: http://svn.apache.org/viewvc?rev=1179067&view=rev
Log:
fix vclplug detection after DLLPOSTFIX changes (author=ariel)

Modified:
    incubator/ooo/trunk/main/vcl/Library_vcl.mk
    incubator/ooo/trunk/main/vcl/unx/generic/plugadapt/salplug.cxx

Modified: incubator/ooo/trunk/main/vcl/Library_vcl.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/Library_vcl.mk?rev=1179067&r1=1179066&r2=1179067&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/Library_vcl.mk (original)
+++ incubator/ooo/trunk/main/vcl/Library_vcl.mk Wed Oct  5 06:57:48 2011
@@ -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

Modified: incubator/ooo/trunk/main/vcl/unx/generic/plugadapt/salplug.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/unx/generic/plugadapt/salplug.cxx?rev=1179067&r1=1179066&r2=1179067&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/unx/generic/plugadapt/salplug.cxx (original)
+++ incubator/ooo/trunk/main/vcl/unx/generic/plugadapt/salplug.cxx Wed Oct  5 06:57:48 2011
@@ -67,6 +67,7 @@ static SalInstance* tryInstance( const O
     aModName.appendAscii( SAL_DLLPREFIX"vclplug_" );
     aModName.append( rModuleBase );
     aModName.appendAscii( SAL_DLLPOSTFIX );
+    aModName.appendAscii( SAL_DLLEXTENSION );
     OUString aModule = aModName.makeStringAndClear();
 
     oslModule aMod = osl_loadModuleRelative(



Mime
View raw message