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

codetools: fixed finding simpleipc.inc under Windows, packages/fcl-process/src/winall include path, bug #32256

Browse Source 
git-svn-id: branches/fixes_1_8@55652 -
This commit is contained in:
mattias 2017-08-12 08:36:14 +00:00
parent 68032a325f
commit 39027865b0
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
components/codetools/definetemplates.pas
View File

@ -2301,10 +2301,12 @@ var
RTLSrcOSDir:=TDefineTemplate.Create('SrcOS',SrcOS,'', RTLSrcOSDir:=TDefineTemplate.Create('SrcOS',SrcOS,'',
SrcOS,da_Directory); SrcOS,da_Directory);
IfTargetOSIsNotSrcOS.AddChild(RTLSrcOSDir); IfTargetOSIsNotSrcOS.AddChild(RTLSrcOSDir);
// add include path inc
RTLSrcOSDir.AddChild(TDefineTemplate.Create('Include Path', RTLSrcOSDir.AddChild(TDefineTemplate.Create('Include Path',
'include path', 'include path',
IncludePathMacroName,IncPathMacro+';inc', IncludePathMacroName,IncPathMacro+';inc',
da_Define)); da_Define));
// add include path $(TargetOS)
RTLSrcOSDir.AddChild(TDefineTemplate.Create('Include Path', RTLSrcOSDir.AddChild(TDefineTemplate.Create('Include Path',
'include path to TargetCPU directories', 'include path to TargetCPU directories',
IncludePathMacroName,IncPathMacro+';'+aTargetCPU, IncludePathMacroName,IncPathMacro+';'+aTargetCPU,
@ -2536,6 +2538,17 @@ begin
+';'+DefinePathMacro+'/'+SrcOS+DS +';'+DefinePathMacro+'/'+SrcOS+DS
+';'+IncPathMacro) +';'+IncPathMacro)
,da_DefineRecurse)); ,da_DefineRecurse));
// packages/fcl-process/src
// IF SrcOS=win then add include path winall
IFTempl:=TDefineTemplate.Create('If SrcOS=win','If SrcOS=win',
'',''''+SrcOS+'''=''win''',da_If);
IFTempl.AddChild(TDefineTemplate.Create('Include Path',
Format(ctsIncludeDirectoriesPlusDirs,['winall']),
IncludePathMacroName,
IncPathMacro
+';winall',
da_DefineRecurse));
FCLSubDir.AddChild(IFTempl);
// packages/fcl-async // packages/fcl-async
PackagesFCLAsyncDir:=TDefineTemplate.Create('fcl-async','fcl-async','','fcl-async',da_Directory); PackagesFCLAsyncDir:=TDefineTemplate.Create('fcl-async','fcl-async','','fcl-async',da_Directory);