thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fallback to the nasm compatible yasm.

Browse source 
svn-id: r48980
This commit is contained in:
Andre Heider 2010-05-09 13:31:34 +00:00
parent 998531a022
commit 09a54d765f
2 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile.common
View file

@ -132,7 +132,7 @@ ifdef USE_NASM
# Build rule for NASM assembler files
%.o: %.asm
$(QUIET)$(MKDIR) $(*D)
$(QUIET_NASM)$(NASM) -O1 $(NASMFLAGS) -g -o $*.o $(<)
$(QUIET_NASM)$(NASM) $(NASMFLAGS) -o $*.o $(<)
endif
# Include the dependency tracking files.

21
configure vendored
View file

@ -2191,11 +2191,24 @@ if test "$_have_x86" = yes ; then
for path_dir in $_nasmpath; do
if test -x "$path_dir/nasm$NATIVEEXEEXT" ; then
NASM="$path_dir/nasm$NATIVEEXEEXT"
NASMFLAGS="-O1 -g"
echo $NASM
break
fi
done
# fallback to the nasm compatible yasm
if test x$NASM = x -o x$NASM = x'"$NASM"'; then
for path_dir in $_nasmpath; do
if test -x "$path_dir/yasm$NATIVEEXEEXT" ; then
NASM="$path_dir/yasm$NATIVEEXEEXT"
NASMFLAGS="-a x86 -m x86"
echo $NASM
break
fi
done
fi
IFS="$ac_save_ifs"
if test x$NASM = x -o x$NASM = x'"$NASM"'; then
@ -2204,16 +2217,16 @@ if test "$_have_x86" = yes ; then
else
case $_host_os in
os2-emx*)
NASMFLAGS="-f aout"
NASMFLAGS="$NASMFLAGS -f aout"
;;
mingw*)
NASMFLAGS="-f win32"
NASMFLAGS="$NASMFLAGS -f win32"
;;
darwin*)
NASMFLAGS="-f macho"
NASMFLAGS="$NASMFLAGS -f macho"
;;
*)
NASMFLAGS="-f elf"
NASMFLAGS="$NASMFLAGS -f elf"
;;
esac
_nasm=yes