paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-22 14:30:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Fix wrongly renamed units/packages

Browse Source
This commit is contained in:
Michaël Van Canneyt 2023-07-19 14:41:15 +02:00
parent 6b5a4dbf6e
commit 354c4ddcc1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/fpmkunit/fpmake.pp
View File

@ -12,7 +12,7 @@ begin
begin begin
{$endif ALLPACKAGES} {$endif ALLPACKAGES}
P:=AddPackage('{$ifdef unix}cthreads,{$endif} fpmkunit'); P:=AddPackage('fpmkunit');
P.ShortName:='fpmk'; P.ShortName:='fpmk';
{$ifdef ALLPACKAGES} {$ifdef ALLPACKAGES}
P.Directory:=ADirectory; P.Directory:=ADirectory;
@ -37,7 +37,7 @@ begin
D:=P.Dependencies.Add('fcl-process',AllOSes-[morphos,aros,amiga,go32v2,os2]); D:=P.Dependencies.Add('fcl-process',AllOSes-[morphos,aros,amiga,go32v2,os2]);
D:=P.Dependencies.Add('libtar'); D:=P.Dependencies.Add('libtar');
with P.Targets.AddUnit('src/{$ifdef unix}cthreads,{$endif} fpmkunit.pp') do with P.Targets.AddUnit('src/fpmkunit.pp') do
ResourceStrings:=true; ResourceStrings:=true;
{$ifndef ALLPACKAGES} {$ifndef ALLPACKAGES}

4
packages/fppkg/fpmake.pp
View File

@ -17,7 +17,7 @@ Var
Data2Inc : string; Data2Inc : string;
begin begin
AddCustomFpmakeCommandlineOption('data2inc', 'Use indicated data2inc executable.'); AddCustomFpmakeCommandlineOption('data2inc', 'Use indicated data2inc executable.');
AddCustomFpmakeCommandlineOption('gen{$ifdef unix}cthreads,{$endif} fpmkunit', 'Regenerate the fpmkunitsrc.inc file (fppkg).'); AddCustomFpmakeCommandlineOption('genfpmkunit', 'Regenerate the fpmkunitsrc.inc file (fppkg).');
With Installer do With Installer do
begin begin
@ -31,7 +31,7 @@ begin
P.Dependencies.Add('fcl-xml'); P.Dependencies.Add('fcl-xml');
P.Dependencies.Add('fcl-process',AllOSes-[go32v2,os2]); P.Dependencies.Add('fcl-process',AllOSes-[go32v2,os2]);
P.Dependencies.Add('paszlib'); P.Dependencies.Add('paszlib');
P.Dependencies.Add('{$ifdef unix}cthreads,{$endif} fpmkunit'); P.Dependencies.Add('fpmkunit');
P.Dependencies.Add('univint',[MacOSX,iphonesim,ios]); P.Dependencies.Add('univint',[MacOSX,iphonesim,ios]);
P.Dependencies.Add('fcl-net', TargetsWithfpWeb); P.Dependencies.Add('fcl-net', TargetsWithfpWeb);