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

fix 28, double definition of a symbol with sub-dependencies 

+ improvement, select all the libman entries with an asterisk
This commit is contained in:
Basile Burg 2015-08-23 21:25:17 +02:00
parent 8f8a44a288
commit 6d59b11178
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/ce_nativeproject.pas
View File

@ -337,6 +337,7 @@ var
i: Integer; i: Integer;
ex_files: TStringList; ex_files: TStringList;
ex_folds: TStringList; ex_folds: TStringList;
libAliasesPtr: TStringList;
str: string; str: string;
begin begin
if fConfIx = -1 then exit; if fConfIx = -1 then exit;
@ -365,11 +366,17 @@ begin
if ex_folds.IndexOf(ExtractFilePath(abs)) = -1 if ex_folds.IndexOf(ExtractFilePath(abs)) = -1
then aList.Add(abs); // note: process.inc ln 249. double quotes are added if there's a space. then aList.Add(abs); // note: process.inc ln 249. double quotes are added if there's a space.
end; end;
// libraries // libraries: an asterisk in list selects all the entries
LibMan.getLibFiles(fLibAliases, aList); libAliasesPtr := fLibAliases;
LibMan.getLibSources(fLibAliases, aList); if (fLibAliases.Count > 0) and (fLibAliases.Strings[0] = '*') then
libAliasesPtr := nil;
// only link lib file if executable/shared lib
if currentConfiguration.outputOptions.binaryKind in [executable, sharedlib] then
LibMan.getLibFiles(libAliasesPtr, aList);
// but always adds -I<path>
LibMan.getLibSources(libAliasesPtr, aList);
// config // config
TCompilerConfiguration(fOptsColl.Items[fConfIx]).getOpts(aList); currentConfiguration.getOpts(aList);
finally finally
ex_files.Free; ex_files.Free;
ex_folds.Free; ex_folds.Free;