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

* allow 2.6.4 as starting version

Browse Source 
git-svn-id: trunk@26144 -
This commit is contained in:
Jonas Maebe 2013-11-27 19:19:16 +00:00
parent e55332ab6f
commit 4a8d7f8ce9
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@ -1,5 +1,5 @@
# #
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013-10-05 rev 25642] # Don't edit, this file is generated by FPCMake Version 2.0.0 [2013-11-16 rev 26097]
# #
default: help default: help
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android i8086-msdos MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android i8086-msdos
@ -322,7 +322,7 @@ endif
override PACKAGE_NAME=fpc override PACKAGE_NAME=fpc
override PACKAGE_VERSION=2.7.1 override PACKAGE_VERSION=2.7.1
REQUIREDVERSION=2.6.2 REQUIREDVERSION=2.6.2
REQUIREDVERSION2=2.6.2 REQUIREDVERSION2=2.6.4
ifndef inOS2 ifndef inOS2
override FPCDIR:=$(BASEDIR) override FPCDIR:=$(BASEDIR)
export FPCDIR export FPCDIR
@ -1255,6 +1255,7 @@ ASNAME=$(BINUTILSPREFIX)as
LDNAME=$(BINUTILSPREFIX)ld LDNAME=$(BINUTILSPREFIX)ld
ARNAME=$(BINUTILSPREFIX)ar ARNAME=$(BINUTILSPREFIX)ar
RCNAME=$(BINUTILSPREFIX)rc RCNAME=$(BINUTILSPREFIX)rc
NASMNAME=$(BINUTILSPREFIX)nasm
ifndef ASPROG ifndef ASPROG
ifdef CROSSBINDIR ifdef CROSSBINDIR
ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
@ -1283,10 +1284,18 @@ else
ARPROG=$(ARNAME) ARPROG=$(ARNAME)
endif endif
endif endif
ifndef NASMPROG
ifdef CROSSBINDIR
NASMPROG=$(CROSSBINDIR)/$(NASMNAME)$(SRCEXEEXT)
else
NASMPROG=$(NASMNAME)
endif
endif
AS=$(ASPROG) AS=$(ASPROG)
LD=$(LDPROG) LD=$(LDPROG)
RC=$(RCPROG) RC=$(RCPROG)
AR=$(ARPROG) AR=$(ARPROG)
NASM=$(NASMPROG)
ifdef inUnix ifdef inUnix
PPAS=./ppas$(SRCBATCHEXT) PPAS=./ppas$(SRCBATCHEXT)
else else

2
Makefile.fpc
View File

@ -21,7 +21,7 @@ rule=help
[prerules] [prerules]
REQUIREDVERSION=2.6.2 REQUIREDVERSION=2.6.2
REQUIREDVERSION2=2.6.2 REQUIREDVERSION2=2.6.4
# make versions < 3.77 (OS2 version) are buggy # make versions < 3.77 (OS2 version) are buggy