From ee538e09b6fe47d350fd36eae426fc6383281de4 Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Wed, 22 Jun 2016 11:23:29 +0000
Subject: [PATCH] codetools: include path for fpc src dir packages/rtl-*

git-svn-id: branches/fixes_1_6@52555 -
---
 components/codetools/definetemplates.pas | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/components/codetools/definetemplates.pas b/components/codetools/definetemplates.pas
index 832625a457..f1e0d7de8b 100644
--- a/components/codetools/definetemplates.pas
+++ b/components/codetools/definetemplates.pas
@@ -2206,6 +2206,8 @@ end;
 
 function CreateFPCSourceTemplate(FPCSrcDir: string; Owner: TObject
   ): TDefineTemplate;
+const
+  RTLPkgDirs: array[1..4] of string = ('rtl-console','rtl-extra','rtl-objpas','rtl-unicode');
 var
   Dir, SrcOS, SrcOS2, aTargetCPU,
   IncPathMacro: string;
@@ -2273,7 +2275,7 @@ var
   PkgExtraGraphDir: TDefineTemplate;
   PkgExtraAMunitsDir: TDefineTemplate;
   FCLSubSrcDir: TDefineTemplate;
-  FCLSubDir: TDefineTemplate;
+  FCLSubDir, SubPkgDir: TDefineTemplate;
   Ok: Boolean;
 begin
   {$IFDEF VerboseFPCSrcScan}
@@ -2389,7 +2391,6 @@ begin
       ExternalMacroStart+'SrcPath',s,da_DefineRecurse));
     RTLDir.AddChild(RTLOSDir);
 
-
     // fcl
     FCLDir:=TDefineTemplate.Create('FCL',ctsFreePascalComponentLibrary,'','fcl',
         da_Directory);
@@ -2421,6 +2422,16 @@ begin
        'packages',da_Directory);
     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
     FCLBaseDir:=TDefineTemplate.Create('FCL-base',
         ctsFreePascalComponentLibrary,'','fcl-base',