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

fixed checking fpcsrcdir changes

Browse Source 
git-svn-id: trunk@4799 -
This commit is contained in:
mattias 2003-11-14 13:13:15 +00:00
parent 48284b663a
commit 05791d45a7
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
designer/componenteditors.pas
View File

@ -161,7 +161,7 @@ type
function GetVerb(Index: Integer): string; override; function GetVerb(Index: Integer): string; override;
function GetVerbCount: Integer; override; function GetVerbCount: Integer; override;
function IsInInlined: Boolean; override; function IsInInlined: Boolean; override;
procedure Copy; virtual; override; procedure Copy; override;
procedure PrepareItem(Index: Integer; const AnItem: TMenuItem); override; procedure PrepareItem(Index: Integer; const AnItem: TMenuItem); override;
property Component: TComponent read FComponent; property Component: TComponent read FComponent;
property Designer: TComponentEditorDesigner read GetDesigner; property Designer: TComponentEditorDesigner read GetDesigner;

25
ide/main.pp
View File

@ -8125,12 +8125,14 @@ begin
writeln('NOTE: Compiler Filename not set! (see Environment Options)'); writeln('NOTE: Compiler Filename not set! (see Environment Options)');
end; end;
if (EnvironmentOptions.LazarusDirectory='') then begin if (EnvironmentOptions.LazarusDirectory='')
or not FileExists(EnvironmentOptions.LazarusDirectory) then begin
writeln(''); writeln('');
writeln( writeln(
'NOTE: Lazarus Source Directory not set! (see Environment Options)'); 'NOTE: Lazarus Source Directory not set! (see Environment Options)');
end; end;
if (EnvironmentOptions.FPCSourceDirectory='') then begin if (EnvironmentOptions.FPCSourceDirectory='')
or not FileExists(EnvironmentOptions.FPCSourceDirectory) then begin
writeln(''); writeln('');
writeln('NOTE: FPC Source Directory not set! (see Environment Options)'); writeln('NOTE: FPC Source Directory not set! (see Environment Options)');
end; end;
@ -8228,6 +8230,7 @@ var
CurOptions: String; CurOptions: String;
TargetOS, TargetProcessor: string; TargetOS, TargetProcessor: string;
UnitLinksValid: boolean; UnitLinksValid: boolean;
i: Integer;
begin begin
if Project1.CompilerOptions.TargetOS<>'' then if Project1.CompilerOptions.TargetOS<>'' then
CurOptions:='-T'+Project1.CompilerOptions.TargetOS CurOptions:='-T'+Project1.CompilerOptions.TargetOS
@ -8259,8 +8262,19 @@ begin
CurDefinesCompilerOptions:=CurOptions; CurDefinesCompilerOptions:=CurOptions;
CodeToolBoss.DefineTree.ReplaceRootSameNameAddFirst(CompilerTemplate); CodeToolBoss.DefineTree.ReplaceRootSameNameAddFirst(CompilerTemplate);
UnitLinksValid:=OnlyIfCompilerChanged UnitLinksValid:=OnlyIfCompilerChanged
and InputHistories.FPCConfigCache.Valid(true) and InputHistories.FPCConfigCache.Valid(true);
and (InputHistories.FPCConfigCache.FindItem(CurOptions)>=0); if UnitLinksValid then begin
i:=InputHistories.FPCConfigCache.FindItem(CurOptions);
if i<0 then begin
UnitLinksValid:=false;
end else begin
if CompareFilenames(InputHistories.FPCConfigCache.Items[i].FPCSrcDir,
EnvironmentOptions.FPCSourceDirectory)<>0 then
begin
UnitLinksValid:=false;
end;
end;
end;
//writeln('TMainIDE.RescanCompilerDefines B rescanning FPC sources UnitLinksValid=',UnitLinksValid); //writeln('TMainIDE.RescanCompilerDefines B rescanning FPC sources UnitLinksValid=',UnitLinksValid);
// create compiler macros to simulate the Makefiles of the FPC sources // create compiler macros to simulate the Makefiles of the FPC sources
@ -10082,6 +10096,9 @@ end.
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.666 2003/11/14 13:13:14 mattias
fixed checking fpcsrcdir changes
Revision 1.665 2003/11/08 11:16:45 mattias Revision 1.665 2003/11/08 11:16:45 mattias
added search result window from Jason added search result window from Jason