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

IDE: fixed applying project settings to FPC source directory

Browse Source 
git-svn-id: trunk@28434 -
This commit is contained in:
mattias 2010-11-23 11:09:39 +00:00
parent 8ca0843855
commit 253ceab16b
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ide/buildmanager.pas
View File

@ -673,7 +673,7 @@ begin
AddTemplate(ADefTempl,false, AddTemplate(ADefTempl,false,
'NOTE: Could not create Define Template for Free Pascal Compiler'); 'NOTE: Could not create Define Template for Free Pascal Compiler');
// create template for FPC source directory // create template for FPC source directory
ADefTempl:=CreateFPCSrcTemplate(UnitSetCache,nil); ADefTempl:=CreateFPCSourceTemplate(UnitSetCache,nil);
AddTemplate(ADefTempl,false,lisNOTECouldNotCreateDefineTemplateForFreePascal); AddTemplate(ADefTempl,false,lisNOTECouldNotCreateDefineTemplateForFreePascal);
// create compiler macros for the lazarus sources // create compiler macros for the lazarus sources

11
ide/editdefinetree.pas
View File

@ -50,10 +50,12 @@ function CreateUseDefaultsFlagTemplate: TDefineTemplate;
procedure DisableDefaultsInDirectories(DefTempl: TDefineTemplate); procedure DisableDefaultsInDirectories(DefTempl: TDefineTemplate);
// FPC sources // FPC sources
function CreateFPCSourceTemplate(Config: TFPCUnitSetCache;
Owner: TObject): TDefineTemplate; overload;
function CreateFPCSourceTemplate(const FPCSrcDir, UnitSearchPath, PPUExt, function CreateFPCSourceTemplate(const FPCSrcDir, UnitSearchPath, PPUExt,
DefaultTargetOS, DefaultProcessorName: string; DefaultTargetOS, DefaultProcessorName: string;
UnitLinkListValid: boolean; var UnitLinkList: string; UnitLinkListValid: boolean; var UnitLinkList: string;
Owner: TObject): TDefineTemplate; Owner: TObject): TDefineTemplate; overload;
function CreateLazarusSourceTemplate( function CreateLazarusSourceTemplate(
const LazarusSrcDir, WidgetType, ExtraOptions: string; const LazarusSrcDir, WidgetType, ExtraOptions: string;
Owner: TObject): TDefineTemplate; Owner: TObject): TDefineTemplate;
@ -123,6 +125,13 @@ begin
Result:=PkgTempl.FindChildByName(PkgID); Result:=PkgTempl.FindChildByName(PkgID);
end; end;
function CreateFPCSourceTemplate(Config: TFPCUnitSetCache; Owner: TObject
): TDefineTemplate;
begin
Result:=CreateFPCSrcTemplate(Config,Owner);
DisableDefaultsInDirectories(Result);
end;
function CreateFPCSourceTemplate(const FPCSrcDir, UnitSearchPath, PPUExt, function CreateFPCSourceTemplate(const FPCSrcDir, UnitSearchPath, PPUExt,
DefaultTargetOS, DefaultProcessorName: string; UnitLinkListValid: boolean; DefaultTargetOS, DefaultProcessorName: string; UnitLinkListValid: boolean;
var UnitLinkList: string; Owner: TObject): TDefineTemplate; var UnitLinkList: string; Owner: TObject): TDefineTemplate;