[Scummvm-cvs-logs] SF.net SVN: scummvm:[48980] scummvm/trunk

dhewg at users.sourceforge.net dhewg at users.sourceforge.net
Sun May 9 15:31:35 CEST 2010


Revision: 48980
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48980&view=rev
Author:   dhewg
Date:     2010-05-09 13:31:34 +0000 (Sun, 09 May 2010)

Log Message:
-----------
Fallback to the nasm compatible yasm.

Modified Paths:
--------------
    scummvm/trunk/Makefile.common
    scummvm/trunk/configure

Modified: scummvm/trunk/Makefile.common
===================================================================
--- scummvm/trunk/Makefile.common	2010-05-09 12:30:20 UTC (rev 48979)
+++ scummvm/trunk/Makefile.common	2010-05-09 13:31:34 UTC (rev 48980)
@@ -132,7 +132,7 @@
 # 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.

Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure	2010-05-09 12:30:20 UTC (rev 48979)
+++ scummvm/trunk/configure	2010-05-09 13:31:34 UTC (rev 48980)
@@ -2191,11 +2191,24 @@
 		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 @@
 		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


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list