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

+ added NASM to the default tools in fpcmake.ini

Browse Source 
git-svn-id: trunk@26097 -
This commit is contained in:
nickysn 2013-11-16 12:37:46 +00:00
parent f488e8decd
commit 07e3792801
2 changed files with 228 additions and 207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

424
utils/fpcm/fpcmake.inc
View File

File diff suppressed because it is too large Load Diff

11
utils/fpcm/fpcmake.ini
View File

@ -1134,6 +1134,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
# assembler, redefine it if cross compiling # assembler, redefine it if cross compiling
ifndef ASPROG ifndef ASPROG
@ -1171,11 +1172,21 @@ ARPROG=$(ARNAME)
endif endif
endif endif
# NASM assembler, redefine it if cross compiling
ifndef NASMPROG
ifdef CROSSBINDIR
NASMPROG=$(CROSSBINDIR)/$(NASMNAME)$(SRCEXEEXT)
else
NASMPROG=$(NASMNAME)
endif
endif
# Override defaults # Override defaults
AS=$(ASPROG) AS=$(ASPROG)
LD=$(LDPROG) LD=$(LDPROG)
RC=$(RCPROG) RC=$(RCPROG)
AR=$(ARPROG) AR=$(ARPROG)
NASM=$(NASMPROG)
# ppas.bat / ppas.sh # ppas.bat / ppas.sh
ifdef inUnix ifdef inUnix