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

fixed switching TARGET_OS

Browse Source 
git-svn-id: trunk@4380 -
This commit is contained in:
mattias 2003-07-07 18:06:05 +00:00
parent 757fc41c8d
commit 8db6d830ec
2 changed files with 41 additions and 24 deletions

13
ide/compileroptions.pp
View File

@ -641,6 +641,7 @@ type
procedure FileBrowseBtnClick(Sender: TObject);
procedure InhTreeViewSelectionChanged(Sender: TObject);
procedure InheritedPageResize(Sender: TObject);
procedure LCLWidgetTypeRadioGroupClick(Sender: TObject);
procedure chkAdditionalConfigFileClick(Sender: TObject);
procedure PathEditBtnClick(Sender: TObject);
procedure PathEditBtnExecuted(Sender: TObject);
@ -2655,6 +2656,11 @@ begin
InheritedPage.ClientWidth,InheritedPage.ClientHeight-y);
end;
procedure TfrmCompilerOptions.LCLWidgetTypeRadioGroupClick(Sender: TObject);
begin
end;
{------------------------------------------------------------------------------
TfrmCompilerOptions GetCompilerOptions
------------------------------------------------------------------------------}
@ -2686,9 +2692,9 @@ begin
// parsing
case CompilerOpts.Style of
1: radStyleIntel.Checked := true;
2: radStyleATT.Checked := true;
3: radStyleATT.Checked := true;
1: radStyleIntel.Checked := true;
2: radStyleATT.Checked := true;
3: radStyleATT.Checked := true;
end;
chkSymD2Ext.Checked := CompilerOpts.D2Extensions;
@ -4471,6 +4477,7 @@ begin
end;
Columns:=Items.Count;
ItemIndex:=1;
OnClick:=@LCLWidgetTypeRadioGroupClick;
end;
end;

52
ide/main.pp
View File

@ -7587,14 +7587,19 @@ begin
{writeln('TMainIDE.RescanCompilerDefines A ',CurOptions,
' OnlyIfCompilerChanged=',OnlyIfCompilerChanged,
' Valid=',InputHistories.FPCConfigCache.Valid(true),
' ID=',InputHistories.FPCConfigCache.FindItem(CurOptions)
);}
' ID=',InputHistories.FPCConfigCache.FindItem(CurOptions),
' CurDefinesCompilerFilename=',CurDefinesCompilerFilename,
' EnvCompilerFilename=',EnvironmentOptions.CompilerFilename,
' CurDefinesCompilerOptions="',CurDefinesCompilerOptions,'"',
' CurOptions="',CurOptions,'"',
'');}
// rescan compiler defines
// ask the compiler for its settings
if OnlyIfCompilerChanged
and (CurDefinesCompilerFilename=EnvironmentOptions.CompilerFilename)
and (CurDefinesCompilerOptions=CurOptions) then
exit;
//writeln('TMainIDE.RescanCompilerDefines B rebuilding FPC templates');
CompilerTemplate:=CodeToolBoss.DefinePool.CreateFPCTemplate(
EnvironmentOptions.CompilerFilename,CurOptions,
CreateCompilerTestPascalFilename,CompilerUnitSearchPath,
@ -7608,26 +7613,28 @@ begin
and InputHistories.FPCConfigCache.Valid(true)
and (InputHistories.FPCConfigCache.FindItem(CurOptions)>=0);
//writeln('TMainIDE.RescanCompilerDefines B rescanning FPC sources UnitLinksValid=',UnitLinksValid);
// create compiler macros to simulate the Makefiles of the FPC sources
if not UnitLinksValid then begin
FPCSrcTemplate:=CodeToolBoss.DefinePool.CreateFPCSrcTemplate(
CodeToolBoss.GlobalValues.Variables[ExternalMacroStart+'FPCSrcDir'],
CompilerUnitSearchPath,
CodeToolBoss.GetCompiledSrcExtForDirectory(''),
UnitLinksValid, CompilerUnitLinks, CodeToolsOpts);
if FPCSrcTemplate<>nil then begin
CodeToolBoss.DefineTree.RemoveRootDefineTemplateByName(
FPCSrcTemplate.Name);
FPCSrcTemplate.InsertBehind(CompilerTemplate);
// save unitlinks
InputHistories.SetLastFPCUnitLinks(EnvironmentOptions.CompilerFilename,
CurOptions,CompilerUnitSearchPath,CompilerUnitLinks);
InputHistories.Save;
end else begin
MessageDlg(lisFPCSourceDirectoryError,
lisPlzCheckTheFPCSourceDirectory,
mtError,[mbOk],0);
end;
CompilerUnitLinks:='';
if UnitLinksValid then
CompilerUnitLinks:=InputHistories.FPCConfigCache.GetUnitLinks(CurOptions);
FPCSrcTemplate:=CodeToolBoss.DefinePool.CreateFPCSrcTemplate(
CodeToolBoss.GlobalValues.Variables[ExternalMacroStart+'FPCSrcDir'],
CompilerUnitSearchPath,
CodeToolBoss.GetCompiledSrcExtForDirectory(''),
UnitLinksValid, CompilerUnitLinks, CodeToolsOpts);
if FPCSrcTemplate<>nil then begin
CodeToolBoss.DefineTree.RemoveRootDefineTemplateByName(
FPCSrcTemplate.Name);
FPCSrcTemplate.InsertBehind(CompilerTemplate);
// save unitlinks
InputHistories.SetLastFPCUnitLinks(EnvironmentOptions.CompilerFilename,
CurOptions,CompilerUnitSearchPath,CompilerUnitLinks);
InputHistories.Save;
end else begin
MessageDlg(lisFPCSourceDirectoryError,
lisPlzCheckTheFPCSourceDirectory,
mtError,[mbOk],0);
end;
end else begin
MessageDlg(lisCompilerError,lisPlzCheckTheCompilerName,
@ -9331,6 +9338,9 @@ end.
{ =============================================================================
$Log$
Revision 1.619 2003/07/07 18:06:05 mattias
fixed switching TARGET_OS
Revision 1.618 2003/07/04 22:06:49 mattias
implemented interface graphics