Commit Graph

9 Commits

Author SHA1 Message Date
marco
74aff88586 --- Merging r49045 into '.':
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 -
2021-05-20 20:03:52 +00:00
pierre
e1b53067a6 Merge commit 48814:
------------------------------------------------------------------------
r48814 | pierre | 2021-02-26 17:15:30 +0000 (Fri, 26 Feb 2021) | 1 line

 Do not add libgcc directory to library directories with -Fl option if -Xd option is used
------------------------------------------------------------------------

------------------------------------------------------------------------
r42843 | pierre | 2019-08-26 21:41:41 +0000 (Mon, 26 Aug 2019) | 1 line

 Partial update for go32v2 and sources
------------------------------------------------------------------------
--- Merging r44112 into '.':
G    installer/install.dat
--- Recording mergeinfo for merge of r44112 into '.':
 G   .
------------------------------------------------------------------------
r48836 | hajny | 2021-02-28 02:08:17 +0000 (Sun, 28 Feb 2021) | 1 line

  * package tplylib added, corrections for more than 31 items on a tab
------------------------------------------------------------------------
--- Merging r48836 into '.':
G    installer/install.dat
--- Recording mergeinfo for merge of r48836 into '.':
 G   .
------------------------------------------------------------------------
r49035 | pierre | 2021-03-22 23:26:26 +0000 (Mon, 22 Mar 2021) | 1 line

 Try to fix short package name issues in install.dat and add missing go32v2 packages
------------------------------------------------------------------------
--- Merging r49035 into '.':
G    installer/install.dat
--- Recording mergeinfo for merge of r49035 into '.':
 G   .

git-svn-id: branches/fixes_3_2@49041 -
2021-03-23 23:59:37 +00:00
pierre
0830edbde5 Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini
git-svn-id: branches/fixes_3_2@46923 -
2020-09-23 09:47:20 +00:00
Jonas Maebe
b6eafa3039 * regenerated Makefiles
git-svn-id: branches/fixes_3_2@46868 -
2020-09-15 19:54:06 +00:00
michael
53e07c91e4 * Merging revisions r46248 from trunk:
------------------------------------------------------------------------
    r46248 | michael | 2020-08-05 13:37:11 +0200 (Wed, 05 Aug 2020) | 1 line
    
    * Fix extension to fit platform
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@46604 -
2020-08-23 09:27:35 +00:00
marco
522350a85d * fixes to 3.2.1
git-svn-id: branches/fixes_3_2@45662 -
2020-06-20 16:47:24 +00:00
pierre
eec778bcd5 Merge of commit 44246 from trunk branch
+ 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 -
2020-02-27 16:52:50 +00:00
pierre
12c54a62e7 Update all Makefile's to enable x86_64-haiku target
git-svn-id: branches/fixes_3_2@42135 -
2019-05-28 22:07:11 +00:00
marco
3de6dfa4fb * some IDE fixes merged
* gnutls with associated fcl-net revisions merged.

git-svn-id: branches/fixes_3_2@41900 -
2019-04-19 14:26:20 +00:00