forks
/
dexed
mirror of https://gitlab.com/basile.b/dexed.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

invalid libman entries are not passed anymore.

This commit is contained in:
Basile Burg 2014-08-25 04:37:59 +02:00
parent 074a767438
commit aec45f5e11
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/ce_libman.pas
View File

@ -78,9 +78,12 @@ begin
itm := TLibraryItem(fCol.Items[i]); itm := TLibraryItem(fCol.Items[i]);
ce_dcd.addDcdImport(itm.libSourcePath); ce_dcd.addDcdImport(itm.libSourcePath);
end; end;
end; end;
(**
* the caller gets all the *.lib/*.a files in aList if someAliases is nil
* otherwise the static libs selected by the aliases in someAliases.
*)
procedure TLibraryManager.getLibFiles(const someAliases, aList: TStrings); procedure TLibraryManager.getLibFiles(const someAliases, aList: TStrings);
var var
itm: TLibraryItem; itm: TLibraryItem;
@ -91,11 +94,15 @@ begin
begin begin
itm := TLibraryItem(fCol.Items[i]); itm := TLibraryItem(fCol.Items[i]);
if someAliases <> nil then if someAliases <> nil then
if someAliases.IndexOf(itm.libAlias) = -1 then continue; if someAliases.IndexOf(itm.libAlias) = -1 then
continue;
// single lib files // single lib files
if fileExists(itm.libFile) then if fileExists(itm.libFile) then
begin begin
if aList.IndexOf(itm.libFile) <> -1 then continue; if aList.IndexOf(itm.libFile) <> -1 then
continue;
if not FileExists(itm.libFile) then
continue;
aList.Add(itm.libFile); aList.Add(itm.libFile);
end end
// folder of lib file // folder of lib file
@ -117,6 +124,10 @@ begin
end; end;
end; end;
(**
* the caller gets all the paths were are located the lib sources in aList if someAliases is nil
* otherwise the paths were are located the lib sources selected by the aliases in someAliases.
*)
procedure TLibraryManager.getLibSources(const someAliases, aList: TStrings); procedure TLibraryManager.getLibSources(const someAliases, aList: TStrings);
var var
itm: TLibraryItem; itm: TLibraryItem;
@ -126,9 +137,13 @@ begin
begin begin
itm := TLibraryItem(fCol.Items[i]); itm := TLibraryItem(fCol.Items[i]);
if someAliases <> nil then if someAliases <> nil then
if someAliases.IndexOf(itm.libAlias) = -1 then continue; if someAliases.IndexOf(itm.libAlias) = -1 then
continue;
// //
if aList.IndexOf(itm.libSourcePath) <> -1 then continue; if aList.IndexOf(itm.libSourcePath) <> -1 then
continue;
if not directoryExists(itm.libSourcePath) then
continue;
aList.Add('-I' + itm.libSourcePath); aList.Add('-I' + itm.libSourcePath);
end; end;
end; end;