--- configure.orig	2007-04-29 16:03:52.000000000 -0500
+++ configure	2007-10-03 14:33:44.000000000 -0500
@@ -860,6 +860,7 @@
   --with(out)-opengl        Use OpenGL for output (default: without)
   --with(out)-aido          Use a shared memory area for output (default: without)
   --with(out)-assembler   Use assembler cores if available (default: with)
+  --with(out)-mmx	Use assembler cores if available (default: with)
   --with(out)-zsnesc4     Use ZSNES C4 core if available (default: same as --with-assembler)
   --with(out)-zsnesfx     Use ZSNES SuperFX core if available (default: same as --with-assembler)
   --with(out)-correct-vram-reads Use Correct VRAM read logic (default: with)
@@ -5873,7 +5874,9 @@
 ZSNESFX='#ZSNESFX=1'
 ZSNESC4='#ZSNESC4=1'
 ASMCPU=''
+if test yes = "$with_mmx"; then
 ASMKREED='#ASMKREED=1'
+fi
 SDD1_DECOMP='#SDD1_DECOMP=1'
 JMA='#JMA=1'
 SPC700ASM=''
@@ -5995,6 +5998,60 @@
 echo "$as_me:$LINENO: result: $snes9x_cv_i386_cpu" >&5
 echo "${ECHO_T}$snes9x_cv_i386_cpu" >&6
 
+echo "$as_me:$LINENO: checking if the OS is FreeBSD" >&5
+echo $ECHO_N "checking if the OS is FreeBSD... $ECHO_C" >&6
+if test "${snes9x_cv_freebsd_os+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+  cat >conftest.$ac_ext <<_ACEOF
+#line 3885 "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#ifdef __FreeBSD__
+/* */
+#else
+#error Not FreeBSD.
+#endif
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  snes9x_cv_freebsd_os=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+snes9x_cv_freebsd_os=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+
+echo "$as_me:$LINENO: result: $snes9x_cv_freebsd_os" >&5
+echo "${ECHO_T}$snes9x_cv_freebsd_os" >&6
+
+
 echo "$as_me:$LINENO: checking if the OS is Linux" >&5
 echo $ECHO_N "checking if the OS is Linux... $ECHO_C" >&6
 if test "${snes9x_cv_linux_os+set}" = set; then
@@ -6365,7 +6422,10 @@
   with_joystick=yes
 fi;
 
-if test yes = "$snes9x_cv_linux_os" -a yes = "$with_joystick"; then
+if test yes = "$snes9x_cv_freebsd_os" -a yes = "$with_joystick"; then
+   JOYDEFINES=' -DJOYSTICK_SUPPORT'
+   SYSLIBS="$SYSLIBS"' -lusbhid'
+elif test yes = "$snes9x_cv_linux_os" -a yes = "$with_joystick"; then
    JOYDEFINES=' -DJOYSTICK_SUPPORT'
 else
    with_joystick="no"
@@ -6396,6 +6456,13 @@
    CPUINC='-Ish'
 fi
 
+# Check whether --with-mmx or --without-mmx was given.
+if test "${with_mmx+set}" = set -a yes = "$with_assembler"; then
+  withval="$with_mmx"
+
+else
+  with_mmx=no
+fi;
 
 # Check whether --with-sdd1-decomp or --without-sdd1-decomp was given.
 if test "${with_sdd1_decomp+set}" = set; then
@@ -9758,7 +9825,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-#if defined(__linux) || defined(__sun) || defined(__sgi)
+#if defined(__linux) || defined(__sun) || defined(__sgi) || defined(__FreeBSD__)
 /* */
 #else
 #error No sound for this platform
@@ -10013,6 +10080,7 @@
 sound support....... $snes9x_cv_sound
 display system...... $snes9x_info_display
 joystick support.... $with_joystick
+using mmx code....   $with_mmx
 netplay support..... $with_netplay
 SDD1 decompression.. $with_sdd1_decomp
 JMA decompression... $with_jma_decomp