codetools: fixed typo, fpc sources: reset include path, added include path packages/graph/src/inc

git-svn-id: trunk@44245 -
This commit is contained in:
mattias 2014-02-26 14:18:41 +00:00
parent a75f97aa4e
commit 7e053d470f

View File

@ -2026,12 +2026,13 @@ var
FCLBaseSrcDir: TDefineTemplate;
PackagesFCLAsyncDir: TDefineTemplate;
PackagesExtraDir: TDefineTemplate;
PackagesFCLExtraDir: TDefineTemplate;
PackagesSubDir: TDefineTemplate;
PkgExtraGraphDir: TDefineTemplate;
PkgExtraAMunitsDir: TDefineTemplate;
FCLSubSrcDir: TDefineTemplate;
FCLSubDir: TDefineTemplate;
Ok: Boolean;
PackagesFCLExtraDir: TDefineTemplate;
begin
{$IFDEF VerboseFPCSrcScan}
DebugLn('CreateFPCSrcTemplate FPCSrcDir="',FPCSrcDir,'"');
@ -2054,8 +2055,8 @@ begin
Format(ctsFreePascalSourcesPlusDesc,['RTL, FCL, Packages, Compiler']),
'','',da_Block);
// The free pascal sources build a world of their own,
// reset search paths
// The Free Pascal sources build a world of their own
// => reset all search paths
MainDir:=TDefineTemplate.Create('Free Pascal Source Directory',
ctsFreePascalSourceDir,'',FPCSrcDir,da_Directory);
Result.AddChild(MainDir);
@ -2065,6 +2066,9 @@ begin
DefTempl:=TDefineTemplate.Create('Reset UnitPath',
ctsUnitPathInitialization,UnitPathMacroName,'',da_DefineRecurse);
MainDir.AddChild(DefTempl);
DefTempl:=TDefineTemplate.Create('Reset IncPath',
ctsUnitPathInitialization,IncludePathMacroName,'',da_DefineRecurse);
MainDir.AddChild(DefTempl);
// rtl
RTLDir:=TDefineTemplate.Create('RTL',ctsRuntimeLibrary,'','rtl',da_Directory);
@ -2261,6 +2265,16 @@ begin
+';'+IncPathMacro)
,da_DefineRecurse));
// packages/graph
PackagesSubDir:=TDefineTemplate.Create('graph','graph','','graph',da_Directory);
PackagesDir.AddChild(PackagesSubDir);
PackagesSubDir.AddChild(TDefineTemplate.Create('Include Path',
Format(ctsIncludeDirectoriesPlusDirs,['packages/graph/src/inc']),
IncludePathMacroName,
d(DefinePathMacro+'/src/inc;'
+IncPathMacro)
,da_DefineRecurse));
// utils
UtilsDir:=TDefineTemplate.Create('Utils',ctsUtilsDirectories,'',
'utils',da_Directory);