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

merge r62477 #61ff6d46d1: Fix compilation with FPC trunk

Browse Source 
git-svn-id: branches/fixes_2_0@62478 -
This commit is contained in:
ondrej 2020-01-03 10:24:51 +00:00
parent b812427da7
commit 08a6145ef0
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ide/frames/compiler_compilation_options.pas
View File

@ -385,15 +385,15 @@ procedure TCompilerCompilationOptionsFrame.WriteSettings(AOptions: TAbstractIDEO
var var
Options: TBaseCompilerOptions absolute AOptions; Options: TBaseCompilerOptions absolute AOptions;
HL: THistoryList;
begin begin
Options.CreateMakefileOnBuild := chkCreateMakefile.Checked; Options.CreateMakefileOnBuild := chkCreateMakefile.Checked;
// execute before // execute before
Options.ExecuteBefore.Command := ExecuteBeforeCommandComboBox.Text; Options.ExecuteBefore.Command := ExecuteBeforeCommandComboBox.Text;
with InputHistories.HistoryLists.GetList('BuildExecBefore',true,rltCaseSensitive) do begin HL := InputHistories.HistoryLists.GetList('BuildExecBefore',true,rltCaseSensitive);
Assign(ExecuteBeforeCommandComboBox.Items); HL.Assign(ExecuteBeforeCommandComboBox.Items);
Push(Options.ExecuteBefore.Command); HL.Push(Options.ExecuteBefore.Command);
end;
WriteSettingsParsers(Options.ExecuteBefore,ExecBeforeParsersCheckListBox); WriteSettingsParsers(Options.ExecuteBefore,ExecBeforeParsersCheckListBox);
@ -416,10 +416,9 @@ begin
// execute after // execute after
Options.ExecuteAfter.Command := ExecuteAfterCommandComboBox.Text; Options.ExecuteAfter.Command := ExecuteAfterCommandComboBox.Text;
with InputHistories.HistoryLists.GetList('BuildExecAfter',true,rltCaseSensitive) do begin HL := InputHistories.HistoryLists.GetList('BuildExecAfter',true,rltCaseSensitive);
Assign(ExecuteAfterCommandComboBox.Items); HL.Assign(ExecuteAfterCommandComboBox.Items);
Push(Options.ExecuteAfter.Command); HL.Push(Options.ExecuteAfter.Command);
end;
WriteSettingsParsers(Options.ExecuteAfter,ExecAfterParsersCheckListBox); WriteSettingsParsers(Options.ExecuteAfter,ExecAfterParsersCheckListBox);
if Options.ExecuteAfter is TProjectCompilationToolOptions then if Options.ExecuteAfter is TProjectCompilationToolOptions then
Options.ExecuteAfter.CompileReasons := Options.ExecuteAfter.CompileReasons :=