# HG changeset patch
# User Robert McIntyre <rlm@mit.edu>
# Date 1363901411 0
# Node ID 690c44762f6f924e571093ba8d30c2cbf397a924
# Parent  9c1b4651b731e3d197754b99123d6b584468a79a
enable proper optional mmx.

diff -r 9c1b4651b731 -r 690c44762f6f configure.ac
--- a/configure.ac	Thu Mar 21 20:35:16 2013 +0000
+++ b/configure.ac	Thu Mar 21 21:30:11 2013 +0000
@@ -15,8 +15,8 @@
 
 
 AS_CASE([$target], 
-        [i?86-*-*], [VBA_USE_C_CORE=no]
- 	[*]       , [VBA_USE_C_CORE=yes])
+        [i?86-*-*], [VBA_USE_C_CORE="no"  VBA_USE_MMX="yes"]
+ 	[*]       , [VBA_USE_C_CORE="yes" VBA_USE_MMX="no" ])
 
 AC_ARG_ENABLE(c-core,
   AC_HELP_STRING([--enable-c-core],[enable C core (default is no on x86 targets)]),
@@ -36,6 +36,20 @@
                 VBA_LIBS="$VBA_LIBS ../prof/libprof.a"],
         [no],  [])
 
+AC_ARG_ENABLE(mmx,
+  AC_HELP_STRING([--enable-mmx],[use MMX (default is yes on x86 targets)]),
+                 [VBA_USE_MMX=$enableval])
+
+AC_PATH_PROG(NASM, nasm)
+AM_CONDITIONAL([USE_MMX], [test "x$VBA_USE_MMX" = xyes])
+AS_IF([test "x$VBA_USE_MMX" = xyes],
+  [AS_IF([test "x$NASM" = x], 
+    [AC_MSG_ERROR([*** Couldn't find nasm program.])],
+    [AM_CXXFLAGS="$AM_CXXFLAGS -DMMX"
+     VBA_LIBS="$VBA_LIBS ../filters/lib386.a"])])
+
+
+
 # Checks for programs.
 AC_PROG_CXX
 AC_PROG_CC
@@ -44,7 +58,6 @@
 AC_PROG_RANLIB
 AC_PROG_CPP
 AC_PROG_MKDIR_P
-AC_PATH_PROG(NASM, nasm)
 
 # Checks for libraries.
 AC_CHECK_LIB(z, gzopen,
@@ -110,13 +123,13 @@
 AC_SUBST([VBA_SRC_EXTRA])
 AC_SUBST([VBA_LIBS])
 
-
 AC_OUTPUT
 
 
 echo "********   RLM   ****************"
 echo "target= $target"
 echo "VBA_USE_C_CORE= $VBA_USE_C_CORE"
+echo "VBA_USE_MMX= $VBA_USE_MMX"
 echo "AM_CXXFLAGS= $AM_CXXFLAGS"
 echo "enable_c_core= $enable_c_core"
 echo "enable_profiling= $enable_profiling"
diff -r 9c1b4651b731 -r 690c44762f6f src/filters/Makefile.am
--- a/src/filters/Makefile.am	Thu Mar 21 20:35:16 2013 +0000
+++ b/src/filters/Makefile.am	Thu Mar 21 21:30:11 2013 +0000
@@ -1,8 +1,11 @@
 SUFFIXES = .asm
 
+if USE_MMX
 noinst_LIBRARIES = lib386.a libfilter.a
-
 lib386_a_SOURCES = 2xSaImmx.asm
+else
+noinst_LIBRARIES = libfilter.a
+endif
 
 .asm.o:
 	$(NASM) -f elf -o $@ $<
diff -r 9c1b4651b731 -r 690c44762f6f src/sdl/Makefile.am
--- a/src/sdl/Makefile.am	Thu Mar 21 20:35:16 2013 +0000
+++ b/src/sdl/Makefile.am	Thu Mar 21 21:30:11 2013 +0000
@@ -30,7 +30,6 @@
 	../common/libgbcom.a	\
 	../gb/libgb.a		\
 	../gba/libgba.a		\
-	../filters/lib386.a 	\
 	../filters/libfilter.a	\
 	@VBA_LIBS@		\
 	../lua/libgblua.a