paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-06-05 20:18:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed fpc src defines for bsd

Browse Source 
git-svn-id: trunk@4451 -
This commit is contained in:
mattias 2003-08-03 10:27:31 +00:00
parent 3c90980862
commit 3fa610411f
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
components/codetools/definetemplates.pas
View File

@ -45,16 +45,15 @@
} }
unit DefineTemplates; unit DefineTemplates;
{$ifdef FPC} {$mode objfpc} {$endif}{$H+} {$mode objfpc}{$H+}
{ $Define VerboseDefineCache} { $Define VerboseDefineCache}
interface interface
uses uses
Classes, SysUtils, CodeToolsStrConsts, ExprEval Classes, SysUtils, CodeToolsStrConsts, ExprEval, Laz_XMLCfg, AVL_Tree,
{$ifdef FPC}, Laz_XMLCfg{$endif}, AVL_Tree, Process, Process, KeywordFuncLists, FileProcs;
KeywordFuncLists, FileProcs;
const const
ExternalMacroStart = ExprEval.ExternalMacroStart; ExternalMacroStart = ExprEval.ExternalMacroStart;
@ -2592,7 +2591,11 @@ begin
ctsDefaultppc386TargetOperatingSystem, ctsDefaultppc386TargetOperatingSystem,
ExternalMacroStart+'TargetOS',TargetOS,da_DefineRecurse); ExternalMacroStart+'TargetOS',TargetOS,da_DefineRecurse);
AddTemplate(NewDefTempl); AddTemplate(NewDefTempl);
if (TargetOS='linux') then if (TargetOS='linux')
or (TargetOS='freebsd')
or (TargetOS='netbsd')
or (TargetOS='openbsd')
then
SrcOS:='unix' SrcOS:='unix'
else else
SrcOS:=TargetOS; SrcOS:=TargetOS;
@ -2781,7 +2784,7 @@ var
SrcOSMacroUsed: boolean; SrcOSMacroUsed: boolean;
i: integer; i: integer;
begin begin
// writeln('%%%Browse ',ADirPath); //writeln('Browse ',ADirPath);
if ADirPath='' then exit; if ADirPath='' then exit;
if not (ADirPath[length(ADirPath)]=PathDelim) then if not (ADirPath[length(ADirPath)]=PathDelim) then
ADirPath:=ADirPath+PathDelim; ADirPath:=ADirPath+PathDelim;
@ -2897,13 +2900,13 @@ var
inc(PathEnd); inc(PathEnd);
if PathEnd>PathStart then begin if PathEnd>PathStart then begin
ADirPath:=copy(UnitSearchPath,PathStart,PathEnd-PathStart); ADirPath:=copy(UnitSearchPath,PathStart,PathEnd-PathStart);
//writeln('&&& FindStandardPPUSources ',ADirPath); //writeln('FindStandardPPUSources A ',ADirPath);
// search all ppu files in this directory // search all ppu files in this directory
if FindFirst(ADirPath+CurMask,faAnyFile,FileInfo)=0 then begin if FindFirst(ADirPath+CurMask,faAnyFile,FileInfo)=0 then begin
repeat repeat
UnitName:=ExtractFileName(FileInfo.Name); UnitName:=ExtractFileName(FileInfo.Name);
UnitName:=copy(UnitName,1,length(UnitName)-4); UnitName:=copy(UnitName,1,length(UnitName)-4);
//writeln('&&& FindStandardPPUSources B ',UnitName); //writeln('FindStandardPPUSources B ',UnitName);
AddFPCSourceLinkForUnit(UnitName); AddFPCSourceLinkForUnit(UnitName);
until FindNext(FileInfo)<>0; until FindNext(FileInfo)<>0;
end; end;

2
components/codetools/finddeclarationtool.pas
View File

@ -3530,6 +3530,8 @@ begin
then begin then begin
if Scanner.InitialValues.IsDefined('LINUX') then if Scanner.InitialValues.IsDefined('LINUX') then
SystemAlias:='SYSLINUX' SystemAlias:='SYSLINUX'
else if Scanner.InitialValues.IsDefined('BSD') then
SystemAlias:='SYSBSD'
else if Scanner.InitialValues.IsDefined('WIN32') then else if Scanner.InitialValues.IsDefined('WIN32') then
SystemAlias:='SYSWIN32'; SystemAlias:='SYSWIN32';
end; end;

4
ide/main.pp
View File

@ -7637,6 +7637,7 @@ begin
CompilerUnitLinks:=''; CompilerUnitLinks:='';
if UnitLinksValid then if UnitLinksValid then
CompilerUnitLinks:=InputHistories.FPCConfigCache.GetUnitLinks(CurOptions); CompilerUnitLinks:=InputHistories.FPCConfigCache.GetUnitLinks(CurOptions);
FPCSrcTemplate:=CodeToolBoss.DefinePool.CreateFPCSrcTemplate( FPCSrcTemplate:=CodeToolBoss.DefinePool.CreateFPCSrcTemplate(
CodeToolBoss.GlobalValues.Variables[ExternalMacroStart+'FPCSrcDir'], CodeToolBoss.GlobalValues.Variables[ExternalMacroStart+'FPCSrcDir'],
CompilerUnitSearchPath, CompilerUnitSearchPath,
@ -9366,6 +9367,9 @@ end.
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.629 2003/08/03 10:27:30 mattias
fixed fpc src defines for bsd
Revision 1.628 2003/07/31 19:56:49 mattias Revision 1.628 2003/07/31 19:56:49 mattias
fixed double messages SETLabel fixed double messages SETLabel