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

fixed IDE compilation overriding CPU, OS, LCLset when project is cross and IDE uses default

Browse Source 
git-svn-id: trunk@9126 -
This commit is contained in:
mattias 2006-04-15 11:35:44 +00:00
parent 5c9c26ad49
commit 6704fbd47c
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ide/main.pp
View File

@ -580,8 +580,9 @@ type
procedure OnCopyError(const ErrorData: TCopyErrorData;
var Handled: boolean; Data: TObject);
// methods fro building
// methods for building
procedure SetBuildTarget(const TargetOS, TargetCPU, LCLWidgetType: string);
procedure SetBuildTargetIDE;
public
CurDefinesCompilerFilename: String;
CurDefinesCompilerOptions: String;
@ -5278,6 +5279,24 @@ begin
end;
end;
procedure TMainIDE.SetBuildTargetIDE;
var
NewTargetOS: String;
NewTargetCPU: String;
NewLCLWidgetSet: String;
begin
NewTargetOS:=MiscellaneousOptions.BuildLazOpts.TargetOS;
NewTargetCPU:=MiscellaneousOptions.BuildLazOpts.TargetCPU;
NewLCLWidgetSet:=LCLPlatformNames[MiscellaneousOptions.BuildLazOpts.LCLPlatform];
if (NewTargetOS='') or (NewTargetOS='default') then
NewTargetOS:=GetDefaultTargetOS;
if (NewTargetCPU='') or (NewTargetCPU='default') then
NewTargetCPU:=GetDefaultTargetCPU;
if (NewLCLWidgetSet='') or (NewLCLWidgetSet='default') then
NewLCLWidgetSet:=GetDefaultLCLWidgetType;
SetBuildTarget(NewTargetOS,NewTargetCPU,NewLCLWidgetSet);
end;
function TMainIDE.DoOpenFileInSourceEditor(AnUnitInfo: TUnitInfo;
PageIndex: integer; Flags: TOpenFlags): TModalResult;
var NewSrcEdit: TSourceEditor;
@ -7732,9 +7751,7 @@ begin
MessagesView.BeginBlock;
try
SetBuildTarget(MiscellaneousOptions.BuildLazOpts.TargetOS,
MiscellaneousOptions.BuildLazOpts.TargetCPU,
LCLPlatformNames[MiscellaneousOptions.BuildLazOpts.LCLPlatform]);
SetBuildTargetIDE;
// first compile all lazarus components (LCL, SynEdit, CodeTools, ...)
SourceNotebook.ClearErrorLines;