codetools: fpc sources: packegs/rtl-extra add include path src/SrcOS and src/SrcOS2, bug #32263

git-svn-id: branches/fixes_1_8@55682 -
This commit is contained in:
mattias 2017-08-19 08:33:54 +00:00
parent 39027865b0
commit 1f4f46ecdb

View File

@ -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);