diff options
| author | jonas <jonas@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2013-11-27 19:19:16 +0000 |
|---|---|---|
| committer | jonas <jonas@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2013-11-27 19:19:16 +0000 |
| commit | ece500e8a1a0646af20963315f7287bb593d662d (patch) | |
| tree | e7c0799ffb448a846c5b63729f191cc72c860ba1 /Makefile | |
| parent | 854c8ddec5cefb13ff5c628ae3af3028cca1cf98 (diff) | |
| download | fpc-ece500e8a1a0646af20963315f7287bb593d662d.tar.gz | |
* allow 2.6.4 as starting version
git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@26144 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 13 |
1 files changed, 11 insertions, 2 deletions
@@ -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 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_VERSION=2.7.1 REQUIREDVERSION=2.6.2 -REQUIREDVERSION2=2.6.2 +REQUIREDVERSION2=2.6.4 ifndef inOS2 override FPCDIR:=$(BASEDIR) export FPCDIR @@ -1255,6 +1255,7 @@ ASNAME=$(BINUTILSPREFIX)as LDNAME=$(BINUTILSPREFIX)ld ARNAME=$(BINUTILSPREFIX)ar RCNAME=$(BINUTILSPREFIX)rc +NASMNAME=$(BINUTILSPREFIX)nasm ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1283,10 +1284,18 @@ else ARPROG=$(ARNAME) endif endif +ifndef NASMPROG +ifdef CROSSBINDIR +NASMPROG=$(CROSSBINDIR)/$(NASMNAME)$(SRCEXEEXT) +else +NASMPROG=$(NASMNAME) +endif +endif AS=$(ASPROG) LD=$(LDPROG) RC=$(RCPROG) AR=$(ARPROG) +NASM=$(NASMPROG) ifdef inUnix PPAS=./ppas$(SRCBATCHEXT) else |