Commit Graph

22 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
marco
522350a85d * fixes to 3.2.1
git-svn-id: branches/fixes_3_2@45662 -
2020-06-20 16:47:24 +00:00
marco
bceb71bf9f * version to 3.2.0-beta
git-svn-id: branches/fixes_3_2@39633 -
2018-08-18 15:25:41 +00:00
joost
ac87da7c42 * Filter the Makefile's unit searchpaths from the fpmake command line.
To void cluttering the .fpm file

git-svn-id: trunk@31317 -
2015-08-12 19:15:14 +00:00
marco
d407b668d1 * version updated to 3.1.1
git-svn-id: trunk@29399 -
2015-01-04 21:09:04 +00:00
joost
fcade9d8b8 * Re-generated utils-Makefile.fpcs and Makefiles
git-svn-id: trunk@29394 -
2015-01-04 20:37:29 +00:00
Tomas Hajny
77967432ef * always use forward slashes in path to fpmake similarly to paths to other tools in Makefiles
git-svn-id: trunk@26641 -
2014-02-01 00:11:09 +00:00
joost
94e7cd5a51 * Switched utils to fpmake building
git-svn-id: trunk@24621 -
2013-05-26 19:05:11 +00:00
pierre
921deb7ac7 Avoid failure in exported directories
git-svn-id: trunk@23995 -
2013-03-25 13:06:47 +00:00
pierre
4d62c91ae1 Fix make function name error
git-svn-id: trunk@23962 -
2013-03-22 22:29:12 +00:00
pierre
e69606c82e Use getrev pascal program to regenerate revision.inc
git-svn-id: trunk@23961 -
2013-03-22 22:26:33 +00:00
pierre
dd7d1e2cfe Create pascal program to convert svn info output
git-svn-id: trunk@23960 -
2013-03-22 22:19:26 +00:00
pierre
b9cb784bc6 Use revision.inc file if present
git-svn-id: trunk@23956 -
2013-03-22 15:27:13 +00:00
yury
4ee4e6fba0 * Top level makefile: Fixed and simplified cross-building. It is now possible to perform cross builds when having only bootstrap compiler executable.
- Always use fresh native fpcmake executable.
  - Build fresh native fpcmake executable when cross-compiling.
  - Explicitly specify a compiler which is used to bootstrap fpmake and fpcmake. Always use fresh native compiler for that. 
* New bootstrap target for fpcmake to build native fpcmake regardless of CPU/OS settings.

git-svn-id: trunk@23641 -
2013-02-21 14:54:57 +00:00
Jonas Maebe
1d4a25df3b * fixed fcl and fpcdir paths/dependencies
git-svn-id: trunk@6719 -
2007-03-04 19:59:42 +00:00
Jonas Maebe
60d19ea1e6 * forgot to commit
git-svn-id: trunk@6224 -
2007-01-27 11:44:02 +00:00
peter
dde36768ec don't use ../data2inc it doesn't work for cross compiles
use data2inc only if it is available
2005-04-25 07:41:51 +00:00
marco
36faaa39b0 * fix for data2inc built by CVS 2005-04-13 17:11:32 +00:00
peter
3fc45a47d2 * Win32 fixes for Makefile so it doesn't require sh.exe 2001-06-06 21:58:16 +00:00
peter
293d6a1671 * Makefile fixes 2001-05-03 21:35:04 +00:00
peter
d65ec7ac1c * default.fpcdir is back
* subdir requirement checking works, but not very optimal yet as
    it can load the same Makefile.fpc multiple times
2001-02-01 22:00:03 +00:00
peter
d9b97cc5bf * New FPCMake update 2001-01-29 21:52:17 +00:00