Browse Source

+ added NASM to the default tools in fpcmake.ini

git-svn-id: trunk@26097 -
nickysn 11 years ago
parent
commit
07e3792801
2 changed files with 203 additions and 182 deletions
  1. 192 182
      utils/fpcm/fpcmake.inc
  2. 11 0
      utils/fpcm/fpcmake.ini

File diff suppressed because it is too large
+ 192 - 182
utils/fpcm/fpcmake.inc


+ 11 - 0
utils/fpcm/fpcmake.ini

@@ -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

Some files were not shown because too many files changed in this diff