ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/public/ibx/trunk/fbintf/client/include/uloadlibrary.inc
(Generate patch)

Comparing ibx/trunk/fbintf/client/include/uloadlibrary.inc (file contents):
Revision 208 by tony, Tue Dec 6 10:33:46 2016 UTC vs.
Revision 209 by tony, Wed Mar 14 12:48:51 2018 UTC

# Line 33 | Line 33 | begin
33      LibName := GetFirebirdLibList;
34    IBLibrary := FindLibrary(LibName);
35    {$IFDEF DARWIN}
36 <  if Result = NilHandle then
36 >  if IBLibrary = NilHandle then
37    begin
38      {See http://paulbeachsblog.blogspot.co.uk/2008/03/where-is-libfbclientdylib-on-macosx.html
39       Try loading direct from Firebird Framework}
40  
41      LibName := '/Library/Frameworks/Firebird.framework/Firebird';
42      IBLibrary := LoadLibrary(LibName);
43 <    if Result = NilHandle then
43 >    if IBLibrary = NilHandle then
44      begin
45        LibName := '/Library/Frameworks/Firebird.framework/Libraries/libfbclient.dylib';
46        IBLibrary := LoadLibrary(LibName);
47      end;
48      if IBLibrary <> NilHandle then
49 <       FBLibraryName := ExtractFileName(LibName);
49 >       FFBLibraryName := ExtractFileName(LibName);
50    end
51    {$ENDIF}
52    FOwnsIBLibrary := IBLibrary <> NilHandle;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines