paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-17 00:09:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: simplified code

Browse Source 
git-svn-id: trunk@41328 -
This commit is contained in:
mattias 2013-05-20 15:12:23 +00:00
parent e06d6d07ee
commit e9e769f8b2
1 changed files with 57 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ide/buildmanager.pas
View File

@ -2263,8 +2263,8 @@ begin
if IncludeSelf then begin if IncludeSelf then begin
Result:=ParseOpts.MacroValues.Variables; Result:=ParseOpts.MacroValues.Variables;
if ParseOpts.MacroValuesStamp=BuildMacroChangeStamp then exit;
if ParseOpts.MacroValuesStamp<>BuildMacroChangeStamp then begin
// compute macro values // compute macro values
if ParseOpts.MacroValuesParsing then begin if ParseOpts.MacroValuesParsing then begin
@ -2305,11 +2305,10 @@ begin
finally finally
ParseOpts.MacroValuesParsing:=false; ParseOpts.MacroValuesParsing:=false;
end; end;
end;
end else begin end else begin
Result:=ParseOpts.InheritedMacroValues; Result:=ParseOpts.InheritedMacroValues;
if ParseOpts.InheritedMacroValuesStamp=BuildMacroChangeStamp then exit;
if ParseOpts.InheritedMacroValuesStamp<>BuildMacroChangeStamp then begin
// compute inherited values // compute inherited values
if ParseOpts.InheritedMacroValuesParsing then begin if ParseOpts.InheritedMacroValuesParsing then begin
if ConsoleVerbosity>=0 then if ConsoleVerbosity>=0 then
@ -2337,7 +2336,6 @@ begin
end; end;
end; end;
end; end;
end;
procedure TBuildManager.AppendMatrixCustomOption(Sender: TObject; procedure TBuildManager.AppendMatrixCustomOption(Sender: TObject;
var Options: string; Types: TBuildMatrixGroupTypes); var Options: string; Types: TBuildMatrixGroupTypes);