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

fix libman items always added

This commit is contained in:
Basile Burg 2014-08-03 19:51:44 +02:00
parent 645aad2d4f
commit 5ca6cf53f0
1 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/ce_staticexplorer.pas
View File

@ -323,9 +323,6 @@ var
ln: PInt64; ln: PInt64;
nme, knd: string; nme, knd: string;
i: NativeInt; i: NativeInt;
itm: TCollectionItem;
itmt: TLibraryItem;
allALiases: TStringList;
// recursively display members, without master categories. // recursively display members, without master categories.
procedure digMembers(const srcDt: TJsonData; const srcNd: TTreeNode); procedure digMembers(const srcDt: TJsonData; const srcNd: TTreeNode);
@ -390,7 +387,7 @@ begin
dmdproc.Parameters.Add('-o-'); dmdproc.Parameters.Add('-o-');
dmdproc.Parameters.Add('-X'); dmdproc.Parameters.Add('-X');
dmdproc.Parameters.Add('-Xf' + jsf); dmdproc.Parameters.Add('-Xf' + jsf);
// projects add.sources and I. // projects additional sources and I and libman aliases
if fProj <> nil then if fProj <> nil then
begin begin
dmdProc.CurrentDirectory := extractFilePath(fProj.fileName); dmdProc.CurrentDirectory := extractFilePath(fProj.fileName);
@ -398,21 +395,9 @@ begin
dmdproc.Parameters.Add('-I' + fProj.getAbsoluteSourceName(i)); dmdproc.Parameters.Add('-I' + fProj.getAbsoluteSourceName(i));
for nme in fProj.currentConfiguration.pathsOptions.Includes do for nme in fProj.currentConfiguration.pathsOptions.Includes do
dmdproc.Parameters.Add('-I' + nme); dmdproc.Parameters.Add('-I' + nme);
end; with CEMainForm do begin
// add. sources and I from libman. Librarymanager.getAdditionalSources( fProj.LibraryAliases, dmdproc.Parameters);
with CEMainForm do Librarymanager.getAdditionalImport( fProj.LibraryAliases, dmdproc.Parameters);
begin
allALiases := TstringList.Create;
try
for itm in Librarymanager.libraries do
begin
itmt := TLibraryItem(itm);
allALiases.Add(itmt.libAlias);
end;
Librarymanager.getAdditionalSources(allALiases,dmdproc.Parameters);
Librarymanager.getAdditionalImport(allALiases,dmdproc.Parameters);
finally
allALiases.Free;
end; end;
end; end;
// //