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

IDE: fixed SetBuildTarget checking if target changed

Browse Source 
git-svn-id: trunk@27924 -
This commit is contained in:
mattias 2010-10-28 13:11:37 +00:00
parent 3171130474
commit 69a7a8d886
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ide/buildmanager.pas
View File

@ -358,10 +358,9 @@ end;
function TBuildManager.GetTargetOS(UseCache: boolean): string; function TBuildManager.GetTargetOS(UseCache: boolean): string;
begin begin
if UseCache then ;
if OverrideTargetOS<>'' then if OverrideTargetOS<>'' then
Result:=OverrideTargetOS Result:=OverrideTargetOS
else if Project1<>nil then else if (Project1<>nil) and (not UseCache) then
Result:=Project1.CompilerOptions.TargetOS Result:=Project1.CompilerOptions.TargetOS
else else
Result:=''; Result:='';
@ -372,10 +371,9 @@ end;
function TBuildManager.GetTargetCPU(UseCache: boolean): string; function TBuildManager.GetTargetCPU(UseCache: boolean): string;
begin begin
if UseCache then ;
if OverrideTargetCPU<>'' then if OverrideTargetCPU<>'' then
Result:=OverrideTargetCPU Result:=OverrideTargetCPU
else if Project1<>nil then else if (Project1<>nil) and (not UseCache) then
Result:=Project1.CompilerOptions.TargetCPU Result:=Project1.CompilerOptions.TargetCPU
else else
Result:=''; Result:='';
@ -1825,19 +1823,14 @@ begin
NewTargetOS:=GetTargetOS(false); NewTargetOS:=GetTargetOS(false);
NewTargetCPU:=GetTargetCPU(false); NewTargetCPU:=GetTargetCPU(false);
NewLCLWidgetType:=GetLCLWidgetType(false); NewLCLWidgetType:=GetLCLWidgetType(false);
debugln(['TBuildManager.SetBuildTarget TargetOS="',TargetOS,'" NewTargetOS="',NewTargetOS,'" Def=',GetDefaultTargetOS]);
if Project1<>nil then
debugln(['TBuildManager.SetBuildTarget ProjOS=',Project1.CompilerOptions.TargetOS]);
FPCTargetChanged:=(OldTargetOS<>NewTargetOS) FPCTargetChanged:=(OldTargetOS<>NewTargetOS)
or (OldTargetCPU<>NewTargetCPU); or (OldTargetCPU<>NewTargetCPU);
LCLTargetChanged:=(OldLCLWidgetType<>NewLCLWidgetType); LCLTargetChanged:=(OldLCLWidgetType<>NewLCLWidgetType);
DebugLn('TMainIDE.SetBuildTarget AAA1 Old=',OldTargetCPU,'-',OldTargetOS,'-',OldLCLWidgetType,
' New=',NewTargetCPU,'-',NewTargetOS,'-',NewLCLWidgetType,' FPC=',dbgs(FPCTargetChanged),' LCL=',dbgs(LCLTargetChanged));
if FPCTargetChanged or LCLTargetChanged then begin if FPCTargetChanged or LCLTargetChanged then begin
DebugLn('TMainIDE.SetBuildTarget Old=',OldTargetCPU,'-',OldTargetOS,'-',OldLCLWidgetType, //DebugLn('TMainIDE.SetBuildTarget Old=',OldTargetCPU,'-',OldTargetOS,'-',OldLCLWidgetType,
' New=',NewTargetCPU,'-',NewTargetOS,'-',NewLCLWidgetType,' FPC=',dbgs(FPCTargetChanged),' LCL=',dbgs(LCLTargetChanged)); // ' New=',NewTargetCPU,'-',NewTargetOS,'-',NewLCLWidgetType,' FPC=',dbgs(FPCTargetChanged),' LCL=',dbgs(LCLTargetChanged));
IncreaseBuildMacroChangeStamp; IncreaseBuildMacroChangeStamp;
end; end;
if LCLTargetChanged then if LCLTargetChanged then