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

--- Merging r43915 into '.':

Browse Source 
C    packages/fcl-xml/fpmake.pp
C    packages/fpmkunit/fpmake.pp
--- Recording mergeinfo for merge of r43915 into '.':
 U   .
Summary of conflicts:
  Text conflicts: 2
Summary of conflicts:
  Text conflicts: 2

git-svn-id: branches/fixes_3_2@43980 -
This commit is contained in:
joost 2020-01-19 13:26:11 +00:00
parent 3504d9ea5f
commit 0d9489f617
2 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/fcl-xml/fpmake.pp
View File

@ -21,7 +21,6 @@ begin
P.Version:='3.2.0-beta';
P.Options.Add('-S2h');
D:=P.Dependencies.Add('fcl-base');
D.Version:='3.2.0-beta';
D:=P.Dependencies.Add('iconvenc',[linux,darwin,iphonesim,freebsd,haiku,beos,aix]);
P.Author := 'Sebastian Guenther, Sergei Gorelkin and FPC development team';

4
packages/fpmkunit/fpmake.pp
View File

@ -33,13 +33,9 @@ begin
// here to be able to update all requirements to
// compile fpmake from a single place
D:=P.Dependencies.Add('hash');
D.Version:='3.2.0-beta';
D:=P.Dependencies.Add('paszlib');
D.Version:='3.2.0-beta';
D:=P.Dependencies.Add('fcl-process',AllOSes-[morphos,aros,amiga,go32v2,os2]);
D.Version:='3.2.0-beta';
D:=P.Dependencies.Add('libtar');
D.Version:='3.2.0-beta';
with P.Targets.AddUnit('src/fpmkunit.pp') do
ResourceStrings:=true;