paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-10-22 10:01:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

* first part of aspell libloading fix

Browse Source 
git-svn-id: trunk@12233 -
This commit is contained in:
Almindor 2008-11-26 12:58:35 +00:00
parent c1cfc941b4
commit 109dddc439
1 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
packages/aspell/src/aspell.pp
View File

@ -15,30 +15,18 @@ interface
uses
cTypes;
{$IFDEF Linux}
const libaspell = '/usr/lib/libaspell.so';
{$ENDIF}
{$IFDEF FreeBSD}
const libaspell = '/usr/local/lib/libaspell.so';
{$ENDIF}
{$IFDEF darwin}
const libaspell = '/opt/local/lib/libaspell.dylib';
{$ENDIF}
{$IFDEF windows}
{$IFDEF UNIX}
// TODO: check if it works pathless in beosOB
{$ifndef DARWIN}
const libaspell = 'libaspell.so';
{$ELSE}
{WARNING Is it possible to omit the path?}
const libaspell = '/opt/local/lib/libaspell.dylib';
{$ENDIF}
{$ELSE} // windows
const libaspell = 'aspell-%s.dll';
{$ENDIF}
{$IFDEF BeOS}
const libaspell = '/boot/home/config/lib/libaspell.so';
{$ENDIF}
{$IFDEF Solaris}
const libaspell = '/opt/csw/lib/libpspell.so.15';
{$ENDIF}
{$IFDEF SkyOS}
{$DEFINE STATIC_ASPELL}
{$LINKLIB aspell}
@ -1074,11 +1062,10 @@ begin
libname := '/sw/lib/libaspell.dylib';
LibHandle := LoadLibrary(libname);
end;
{$endif}
{$ifdef linux}
{$else}
{$ifdef unix} // we're not in windblows
if LibHandle = 0 then begin
for i := 15 to 30 do begin // TODO: make sure to up this when required
for i := 15 to 20 do begin // TODO: make sure to cut this if they break compat
str(i, s);
libname := libn + '.' + s;
LibHandle := LoadLibrary(libname);
@ -1086,7 +1073,8 @@ begin
Break;
end;
end;
{$endif}
{$endif} // unix
{$endif} // darwin
if LibHandle = 0 then
Exit(False);