C Makefile
C Makefile.fpc
--- Recording mergeinfo for merge of r49045 into '.':
U .
Summary of conflicts:
Text conflicts: 2
# revisions: 49045
r49045 | jonas | 2021-03-24 15:33:09 +0100 (Wed, 24 Mar 2021) | 1 line
Changed paths:
M /trunk/Makefile
M /trunk/Makefile.fpc
* support building with FPC 3.2.2
git-svn-id: branches/fixes_3_2@49384 -
+ other fixes to packages/*/fpmake.pp with wrong versions.
Fixes shortsrc target in fixes_3_2 branch.
------------------------------------------------------------------------
r44246 | pierre | 2020-02-27 07:32:00 +0000 (Thu, 27 Feb 2020) | 3 lines
* Fix sourcezip make target, correcting mixed case input file names.
------------------------------------------------------------------------
--- Merging r44246 into '.':
U packages/ide/fpmake.pp
U packages/libgbafpc/fpmake.pp
U packages/libndsfpc/fpmake.pp
U packages/vcl-compat/fpmake.pp
--- Recording mergeinfo for merge of r44246 into '.':
U .
git-svn-id: branches/fixes_3_2@44247 -
by also merging commits #4294 and 42967
------------------------------------------------------------------------
r42941 | karoly | 2019-09-07 21:01:14 +0000 (Sat, 07 Sep 2019) | 1 line
vcl-compat: disabled it for palmos, atari, msdos and go32v2. fcl-web is not compiled for these, and that is a dependency.
------------------------------------------------------------------------
--- Merging r42941 into '.':
U packages/vcl-compat/fpmake.pp
--- Recording mergeinfo for merge of r42941 into '.':
U .
------------------------------------------------------------------------
r42967 | pierre | 2019-09-09 08:27:53 +0000 (Mon, 09 Sep 2019) | 1 line
Copy supported systems from fcl-web/fpmake.pp to avoid several build failures
------------------------------------------------------------------------
--- Merging r42967 into '.':
G packages/vcl-compat/fpmake.pp
--- Recording mergeinfo for merge of r42967 into '.':
G .
git-svn-id: branches/fixes_3_2@43180 -
U packages/fpmake_add.inc
U packages/fpmake_proc.inc
A packages/vcl-compat
A packages/vcl-compat/Makefile
A packages/vcl-compat/Makefile.fpc
A packages/vcl-compat/fpmake.pp
A packages/vcl-compat/src
A packages/vcl-compat/src/System.NetEncoding.pp
A packages/vcl-compat/tests
A packages/vcl-compat/tests/tcnetencoding.pp
A packages/vcl-compat/tests/testcompat.lpi
A packages/vcl-compat/tests/testcompat.lpr
--- Recording mergeinfo for merge of r42937 into '.':
U .
--- Merging r42939 into '.':
U packages/vcl-compat/fpmake.pp
--- Recording mergeinfo for merge of r42939 into '.':
G .
--- Merging r42975 into '.':
U packages/paszlib/src/zipper.pp
--- Recording mergeinfo for merge of r42975 into '.':
G .
--- Merging r42976 into '.':
U rtl/win/wininc/struct.inc
--- Recording mergeinfo for merge of r42976 into '.':
G .
--- Merging r43058 into '.':
U utils/fpcm/fpmake.pp
--- Recording mergeinfo for merge of r43058 into '.':
G .
--- Merging r43059 into '.':
U packages/graph/src/ptcgraph/ptcmouse.pp
U packages/ptc/docs/CHANGES.txt
U packages/ptc/src/ptcwrapper/ptcwrapper.pp
--- Recording mergeinfo for merge of r43059 into '.':
G .
--- Merging r43085 into '.':
G packages/vcl-compat/fpmake.pp
A packages/vcl-compat/src/system.netencoding.pp
D packages/vcl-compat/src/System.NetEncoding.pp
--- Recording mergeinfo for merge of r43085 into '.':
G .
--- Merging r43086 into '.':
G packages/paszlib/src/zipper.pp
--- Recording mergeinfo for merge of r43086 into '.':
G .
# revisions: 42937,42939,42975,42976,43058,43059,43085,43086
git-svn-id: branches/fixes_3_2@43173 -
