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

codetools: include path for fpc src dir packages/rtl-*

Browse Source 
git-svn-id: branches/fixes_1_6@52555 -
This commit is contained in:
mattias 2016-06-22 11:23:29 +00:00
parent 98cedca2e8
commit ee538e09b6
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
components/codetools/definetemplates.pas
View File

@ -2206,6 +2206,8 @@ end;
function CreateFPCSourceTemplate(FPCSrcDir: string; Owner: TObject function CreateFPCSourceTemplate(FPCSrcDir: string; Owner: TObject
): TDefineTemplate; ): TDefineTemplate;
const
RTLPkgDirs: array[1..4] of string = ('rtl-console','rtl-extra','rtl-objpas','rtl-unicode');
var var
Dir, SrcOS, SrcOS2, aTargetCPU, Dir, SrcOS, SrcOS2, aTargetCPU,
IncPathMacro: string; IncPathMacro: string;
@ -2273,7 +2275,7 @@ var
PkgExtraGraphDir: TDefineTemplate; PkgExtraGraphDir: TDefineTemplate;
PkgExtraAMunitsDir: TDefineTemplate; PkgExtraAMunitsDir: TDefineTemplate;
FCLSubSrcDir: TDefineTemplate; FCLSubSrcDir: TDefineTemplate;
FCLSubDir: TDefineTemplate; FCLSubDir, SubPkgDir: TDefineTemplate;
Ok: Boolean; Ok: Boolean;
begin begin
{$IFDEF VerboseFPCSrcScan} {$IFDEF VerboseFPCSrcScan}
@ -2389,7 +2391,6 @@ begin
ExternalMacroStart+'SrcPath',s,da_DefineRecurse)); ExternalMacroStart+'SrcPath',s,da_DefineRecurse));
RTLDir.AddChild(RTLOSDir); RTLDir.AddChild(RTLOSDir);
// fcl // fcl
FCLDir:=TDefineTemplate.Create('FCL',ctsFreePascalComponentLibrary,'','fcl', FCLDir:=TDefineTemplate.Create('FCL',ctsFreePascalComponentLibrary,'','fcl',
da_Directory); da_Directory);
@ -2421,6 +2422,16 @@ begin
'packages',da_Directory); 'packages',da_Directory);
MainDir.AddChild(PackagesDir); MainDir.AddChild(PackagesDir);
// packages/rtl-*
for s in RTLPkgDirs do begin
SubPkgDir:=TDefineTemplate.Create(s,s,'',s,da_Directory);
PackagesDir.AddChild(SubPkgDir);
SubPkgDir.AddChild(TDefineTemplate.Create('Include Path',
Format(ctsIncludeDirectoriesPlusDirs,['inc']),
IncludePathMacroName,
d(DefinePathMacro+'/inc'),da_DefineRecurse));
end;
// packages/fcl-base // packages/fcl-base
FCLBaseDir:=TDefineTemplate.Create('FCL-base', FCLBaseDir:=TDefineTemplate.Create('FCL-base',
ctsFreePascalComponentLibrary,'','fcl-base', ctsFreePascalComponentLibrary,'','fcl-base',