ide: fix Options changed through "Change Build Mode" CoolBar button isn't respected by the compiler. Issue #28059

git-svn-id: trunk@51229 -
This commit is contained in:
ondrej 2016-01-08 12:36:01 +00:00
parent 434aa922dd
commit 4b7b10696b

View File

@ -4039,11 +4039,13 @@ begin
Project1.CompilerOptions.OtherDefines.Assign(Project1.OtherDefines); Project1.CompilerOptions.OtherDefines.Assign(Project1.OtherDefines);
Capt := Format(dlgProjectOptionsFor, [Project1.GetTitleOrName]); Capt := Format(dlgProjectOptionsFor, [Project1.GetTitleOrName]);
if DoOpenIDEOptions(nil, Capt, AFilter, []) if DoOpenIDEOptions(nil, Capt, AFilter, []) then
and not Project1.OtherDefines.Equals(Project1.CompilerOptions.OtherDefines) then
begin begin
if not Project1.OtherDefines.Equals(Project1.CompilerOptions.OtherDefines) then
Project1.OtherDefines.Assign(Project1.CompilerOptions.OtherDefines); Project1.OtherDefines.Assign(Project1.CompilerOptions.OtherDefines);
Project1.Modified:=True; Project1.Modified:=True;
MainBuildBoss.SetBuildTargetProject1(false);
MainIDE.UpdateCaption;
end; end;
end; end;
@ -4924,7 +4926,6 @@ begin
UpdateCaption; UpdateCaption;
AProject.DefineTemplates.AllChanged; AProject.DefineTemplates.AllChanged;
IncreaseCompilerParseStamp; IncreaseCompilerParseStamp;
MainBuildBoss.SetBuildTargetProject1(false);
if AProject.UseAsDefault then if AProject.UseAsDefault then
begin begin