From 1f4f46ecdbf85f72b7641b1edad8f2467815ce75 Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Sat, 19 Aug 2017 08:33:54 +0000
Subject: [PATCH] codetools: fpc sources: packegs/rtl-extra add include path
 src/SrcOS and src/SrcOS2, bug #32263

git-svn-id: branches/fixes_1_8@55682 -
---
 components/codetools/definetemplates.pas | 64 ++++++++++++------------
 1 file changed, 33 insertions(+), 31 deletions(-)

diff --git a/components/codetools/definetemplates.pas b/components/codetools/definetemplates.pas
index 989c2c71d4..816522ce3c 100644
--- a/components/codetools/definetemplates.pas
+++ b/components/codetools/definetemplates.pas
@@ -2502,6 +2502,39 @@ begin
         d(DefinePathMacro+'/inc'),da_DefineRecurse));
     end;
 
+    // packages/rtl-console
+    PackagesSubDir:=TDefineTemplate.Create('rtl-console','rtl-console','','rtl-console',da_Directory);
+    PackagesDir.AddChild(PackagesSubDir);
+    PackagesSubDir.AddChild(TDefineTemplate.Create('Include Path',
+      Format(ctsIncludeDirectoriesPlusDirs,['packages/rtl-console/src/inc']),
+      IncludePathMacroName,
+      d(DefinePathMacro+'/src/inc;'
+       +IncPathMacro)
+      ,da_DefineRecurse));
+
+    // packages/rtl-extra
+    PackagesSubDir:=TDefineTemplate.Create('rtl-extra','rtl-extra','','rtl-extra',da_Directory);
+    PackagesDir.AddChild(PackagesSubDir);
+    PackagesSubDir.AddChild(TDefineTemplate.Create('Include Path',
+      Format(ctsIncludeDirectoriesPlusDirs,['packages/rtl-extra/src/OS']),
+      IncludePathMacroName,
+      d(DefinePathMacro+'/src/inc;'
+       +DefinePathMacro+'/src/'+TargetOSMacro+';'
+       +DefinePathMacro+'/src/'+SrcOS+';'
+       +DefinePathMacro+'/src/'+SrcOS2+';'
+       +IncPathMacro)
+      ,da_DefineRecurse));
+
+    // packages/rtl-objpas
+    PackagesSubDir:=TDefineTemplate.Create('rtl-objpas','rtl-objpas','','rtl-objpas',da_Directory);
+    PackagesDir.AddChild(PackagesSubDir);
+    PackagesSubDir.AddChild(TDefineTemplate.Create('Include Path',
+      Format(ctsIncludeDirectoriesPlusDirs,['packages/rtl-objpas/src/inc']),
+      IncludePathMacroName,
+      d(DefinePathMacro+'/src/inc;'
+       +IncPathMacro)
+      ,da_DefineRecurse));
+
     // packages/fcl-base
     FCLBaseDir:=TDefineTemplate.Create('FCL-base',
         ctsFreePascalComponentLibrary,'','fcl-base',
@@ -2610,37 +2643,6 @@ begin
        +IncPathMacro)
       ,da_DefineRecurse));
 
-    // packages/rtl-console
-    PackagesSubDir:=TDefineTemplate.Create('rtl-console','rtl-console','','rtl-console',da_Directory);
-    PackagesDir.AddChild(PackagesSubDir);
-    PackagesSubDir.AddChild(TDefineTemplate.Create('Include Path',
-      Format(ctsIncludeDirectoriesPlusDirs,['packages/rtl-console/src/inc']),
-      IncludePathMacroName,
-      d(DefinePathMacro+'/src/inc;'
-       +IncPathMacro)
-      ,da_DefineRecurse));
-
-    // packages/rtl-extra
-    PackagesSubDir:=TDefineTemplate.Create('rtl-extra','rtl-extra','','rtl-extra',da_Directory);
-    PackagesDir.AddChild(PackagesSubDir);
-    PackagesSubDir.AddChild(TDefineTemplate.Create('Include Path',
-      Format(ctsIncludeDirectoriesPlusDirs,['packages/rtl-extra/src/OS']),
-      IncludePathMacroName,
-      d(DefinePathMacro+'/src/inc;'
-       +DefinePathMacro+'/src/'+TargetOSMacro+';'
-       +IncPathMacro)
-      ,da_DefineRecurse));
-
-    // packages/rtl-objpas
-    PackagesSubDir:=TDefineTemplate.Create('rtl-objpas','rtl-objpas','','rtl-objpas',da_Directory);
-    PackagesDir.AddChild(PackagesSubDir);
-    PackagesSubDir.AddChild(TDefineTemplate.Create('Include Path',
-      Format(ctsIncludeDirectoriesPlusDirs,['packages/rtl-objpas/src/inc']),
-      IncludePathMacroName,
-      d(DefinePathMacro+'/src/inc;'
-       +IncPathMacro)
-      ,da_DefineRecurse));
-
     // utils
     UtilsDir:=TDefineTemplate.Create('Utils',ctsUtilsDirectories,'',
        'utils',da_Directory);