paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-16 10:19:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

* support varaiable_cpu

Browse Source
This commit is contained in:
peter 2004-07-11 18:58:19 +00:00
parent 7373a649f1
commit acdd47c907
2 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
utils/fpcm/fpcmmain.pp
View File

@ -918,6 +918,7 @@ implementation
LoadRequires(t,c,ReqFPCMake); LoadRequires(t,c,ReqFPCMake);
{ Add the current requirements to our parents requirements } { Add the current requirements to our parents requirements }
s:=Trim(ReqFPCMake.GetVariable('require_packages',true)+' '+ s:=Trim(ReqFPCMake.GetVariable('require_packages',true)+' '+
ReqFPCMake.GetVariable('require_packages'+cpusuffix[c],true)+' '+
ReqFPCMake.GetVariable('require_packages'+targetsuffix[t],true)+' '+ ReqFPCMake.GetVariable('require_packages'+targetsuffix[t],true)+' '+
ReqFPCMake.GetVariable('require_packages'+targetsuffix[t]+cpusuffix[c],true)); ReqFPCMake.GetVariable('require_packages'+targetsuffix[t]+cpusuffix[c],true));
SetVariable('require_packages'+targetsuffix[t]+cpusuffix[c],s,true); SetVariable('require_packages'+targetsuffix[t]+cpusuffix[c],s,true);
@ -939,6 +940,7 @@ implementation
begin begin
{ packages } { packages }
s:=Trim(FromFPCMake.GetVariable('require_packages',true)+' '+ s:=Trim(FromFPCMake.GetVariable('require_packages',true)+' '+
FromFPCMake.GetVariable('require_packages'+CpuSuffix[c],true)+' '+
FromFPCMake.GetVariable('require_packages'+TargetSuffix[t],true)+' '+ FromFPCMake.GetVariable('require_packages'+TargetSuffix[t],true)+' '+
FromFPCMake.GetVariable('require_packages'+TargetSuffix[t]+CpuSuffix[c],true)); FromFPCMake.GetVariable('require_packages'+TargetSuffix[t]+CpuSuffix[c],true));
Verbose(FPCMakeDebug,'Required packages for '+TargetStr[t]+'-'+CpuStr[c]+': '+s); Verbose(FPCMakeDebug,'Required packages for '+TargetStr[t]+'-'+CpuStr[c]+': '+s);
@ -968,6 +970,7 @@ implementation
until false; until false;
{ sub dirs } { sub dirs }
s:=Trim(FromFPCMake.GetVariable('target_dirs',true)+' '+ s:=Trim(FromFPCMake.GetVariable('target_dirs',true)+' '+
FromFPCMake.GetVariable('target_dirs'+CpuSuffix[c],true)+' '+
FromFPCMake.GetVariable('target_dirs'+TargetSuffix[t],true)+' '+ FromFPCMake.GetVariable('target_dirs'+TargetSuffix[t],true)+' '+
FromFPCMake.GetVariable('target_dirs'+TargetSuffix[t]+CpuSuffix[c],true)); FromFPCMake.GetVariable('target_dirs'+TargetSuffix[t]+CpuSuffix[c],true));
Verbose(FPCMakeDebug,'Required dirs for '+TargetStr[t]+'-'+CpuStr[c]+': '+s); Verbose(FPCMakeDebug,'Required dirs for '+TargetStr[t]+'-'+CpuStr[c]+': '+s);
@ -1055,6 +1058,7 @@ implementation
i : integer; i : integer;
begin begin
s:=Sec['packages']+' '+ s:=Sec['packages']+' '+
Sec['packages'+CpuSuffix[c]]+' '+
Sec['packages'+TargetSuffix[t]]+' '+ Sec['packages'+TargetSuffix[t]]+' '+
Sec['packages'+TargetSuffix[t]+CpuSuffix[c]]; Sec['packages'+TargetSuffix[t]+CpuSuffix[c]];
repeat repeat
@ -1557,7 +1561,10 @@ implementation
end. end.
{ {
$Log$ $Log$
Revision 1.41 2004-06-29 19:20:49 marco Revision 1.42 2004-07-11 18:58:19 peter
* support varaiable_cpu
Revision 1.41 2004/06/29 19:20:49 marco
* rtl only autoadded if name<>rtl (+/- line 1030) * rtl only autoadded if name<>rtl (+/- line 1030)
Revision 1.40 2004/06/06 14:11:54 karoly Revision 1.40 2004/06/06 14:11:54 karoly

27
utils/fpcm/fpcmwr.pp
View File

@ -351,6 +351,17 @@ implementation
if not firsttarget then if not firsttarget then
FOutput.Add('endif'); FOutput.Add('endif');
end; end;
for c:=low(TCpu) to high(TCpu) do
if (c in FInput.IncludeCpus) then
begin
s:=FInput.GetVariable(IniVar+CpuSuffix[c],false);
if s<>'' then
begin
FOutput.Add('ifeq ($(CPU_TARGET),'+CpuStr[c]+')');
FOutput.Add('override '+FixVariable(IniVar)+'+='+s);
FOutput.Add('endif');
end;
end;
end; end;
@ -439,6 +450,17 @@ implementation
if not firsttarget then if not firsttarget then
FOutput.Add('endif'); FOutput.Add('endif');
end; end;
for c:=low(TCpu) to high(TCpu) do
if (c in FInput.IncludeCpus) then
begin
s:=FInput.GetVariable(IniVar+TargetSuffix[t]+CpuSuffix[c],false);
if s<>'' then
begin
FOutput.Add('ifeq ($(CPU_TARGET),'+CpuStr[c]+')');
addtokens(s);
FOutput.Add('endif');
end;
end;
end; end;
@ -933,7 +955,10 @@ implementation
end. end.
{ {
$Log$ $Log$
Revision 1.30 2004-04-20 22:59:31 olle Revision 1.31 2004-07-11 18:58:19 peter
* support varaiable_cpu
Revision 1.30 2004/04/20 22:59:31 olle
* support for new fpcini section [defines] * support for new fpcini section [defines]
Revision 1.29 2004/04/01 12:26:56 olle Revision 1.29 2004/04/01 12:26:56 olle