--- file_not_specified_in_diff +++ file_not_specified_in_diff @@ -, +, @@ --- lazarus/ide/frames/compiler_compilation_options.pas +++ lazarus/ide/frames/compiler_compilation_options.pas @@ -384,45 +384,45 @@ end; var - Options: TBaseCompilerOptions absolute AOptions; + CompOptions: TBaseCompilerOptions absolute AOptions; begin - Options.CreateMakefileOnBuild := chkCreateMakefile.Checked; + CompOptions.CreateMakefileOnBuild := chkCreateMakefile.Checked; // execute before - Options.ExecuteBefore.Command := ExecuteBeforeCommandComboBox.Text; + CompOptions.ExecuteBefore.Command := ExecuteBeforeCommandComboBox.Text; with InputHistories.HistoryLists.GetList('BuildExecBefore',true,rltCaseSensitive) do begin Assign(ExecuteBeforeCommandComboBox.Items); - Push(Options.ExecuteBefore.Command); + Push(CompOptions.ExecuteBefore.Command); end; - WriteSettingsParsers(Options.ExecuteBefore,ExecBeforeParsersCheckListBox); + WriteSettingsParsers(CompOptions.ExecuteBefore,ExecBeforeParsersCheckListBox); - if Options.ExecuteBefore is TProjectCompilationToolOptions then - Options.ExecuteBefore.CompileReasons := + if CompOptions.ExecuteBefore is TProjectCompilationToolOptions then + CompOptions.ExecuteBefore.CompileReasons := MakeCompileReasons(chkExecBeforeCompile, chkExecBeforeBuild, chkExecBeforeRun); // compiler path - Options.CompilerPath := cobCompiler.Text; + CompOptions.CompilerPath := cobCompiler.Text; EnvironmentOptions.CompilerFileHistory.Assign(cobCompiler.Items); - AddToRecentList(Options.CompilerPath,EnvironmentOptions.CompilerFileHistory,30,rltFile); + AddToRecentList(CompOptions.CompilerPath,EnvironmentOptions.CompilerFileHistory,30,rltFile); - if Options is TProjectCompilerOptions then + if CompOptions is TProjectCompilerOptions then begin - TProjectCompilerOptions(Options).CompileReasons := + TProjectCompilerOptions(CompOptions).CompileReasons := MakeCompileReasons(chkCompilerCompile, chkCompilerBuild, chkCompilerRun); end - else if Options is TPkgCompilerOptions then - TPkgCompilerOptions(Options).SkipCompiler := chkCompilerCompile.Checked; + else if CompOptions is TPkgCompilerOptions then + TPkgCompilerOptions(CompOptions).SkipCompiler := chkCompilerCompile.Checked; // execute after - Options.ExecuteAfter.Command := ExecuteAfterCommandComboBox.Text; + CompOptions.ExecuteAfter.Command := ExecuteAfterCommandComboBox.Text; with InputHistories.HistoryLists.GetList('BuildExecAfter',true,rltCaseSensitive) do begin Assign(ExecuteAfterCommandComboBox.Items); - Push(Options.ExecuteAfter.Command); + Push(CompOptions.ExecuteAfter.Command); end; - WriteSettingsParsers(Options.ExecuteAfter,ExecAfterParsersCheckListBox); - if Options.ExecuteAfter is TProjectCompilationToolOptions then - Options.ExecuteAfter.CompileReasons := + WriteSettingsParsers(CompOptions.ExecuteAfter,ExecAfterParsersCheckListBox); + if CompOptions.ExecuteAfter is TProjectCompilationToolOptions then + CompOptions.ExecuteAfter.CompileReasons := MakeCompileReasons(chkExecAfterCompile, chkExecAfterBuild, chkExecAfterRun); end;