pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

* Search for dependencies in normal search-path also

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@1363 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
Loesje_
2010-11-02 19:58:39 +00:00
parent 9d0cbed421
commit f9d34962ec
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/geckoport/nsInit.pas
View File

@ -1297,6 +1297,11 @@ begin
NewDir:=ExtractFilePath(aDependentLib); NewDir:=ExtractFilePath(aDependentLib);
SetCurrentDir(NewDir); SetCurrentDir(NewDir);
h := LoadLibrary(aDependentLib); h := LoadLibrary(aDependentLib);
// On Linux (Fedora) at least, some dependencies are not in the xulrunner path,
// but in the normal-library location. So also try to load the dependency without
// the path.
if h = 0 then
h := LoadLibrary(ExtractFileName(aDependentLib));
SetCurrentDir(OldDir); SetCurrentDir(OldDir);
if h <> 0 then if h <> 0 then
AppendDependentLib(h) AppendDependentLib(h)