--- trunk/configure	2007/10/08 16:19:16	19
+++ trunk/configure	2007/10/08 16:19:23	20
@@ -27,7 +27,7 @@
 #  SUCH DAMAGE.
 #
 #
-#  $Id: configure,v 1.173 2005/10/21 15:19:24 debug Exp $
+#  $Id: configure,v 1.180 2005/11/23 22:03:23 debug Exp $
 #
 #  This is a minimal configure script, hardcoded for GXemul. This script
 #  figures out which compiler flags will work, and creates Makefiles in
@@ -64,6 +64,7 @@
 	#  Stable:
 	ENABLEARM=YES
 	ENABLEMIPS=YES
+	ENABLEPPC=YES
 else
 	#  Development:
 	ENABLEALPHA=YES
@@ -74,6 +75,7 @@
 	ENABLEIA64=NO
 	ENABLEM68K=NO
 	ENABLEMIPS=YES
+	ENABLENEWMIPS=NO
 	ENABLEPPC=YES
 	ENABLESH=NO
 	ENABLESPARC=NO
@@ -106,6 +108,7 @@
 			ENABLEIA64=YES
 			ENABLEM68K=YES
 			ENABLEMIPS=YES
+			ENABLENEWMIPS=YES
 			ENABLEPPC=YES
 			ENABLESH=YES
 			ENABLESPARC=YES
@@ -142,6 +145,10 @@
 			ENABLEMIPS=NO
 		else if [ z$a = z--enable-mips ]; then
 			ENABLEMIPS=YES
+		else if [ z$a = z--disable-newmips ]; then
+			ENABLENEWMIPS=NO
+		else if [ z$a = z--enable-newmips ]; then
+			ENABLENEWMIPS=YES
 		else if [ z$a = z--disable-ppc ]; then
 			ENABLEPPC=NO
 		else if [ z$a = z--enable-ppc ]; then
@@ -246,6 +253,13 @@
 			fi
 			printf "MIPS CPU emulation\n"
 
+			if [ z$ENABLENEWMIPS = zYES ]; then
+				printf "  --disable-newmips  disable "
+			else
+				printf "  --enable-newmips   enable "
+			fi
+			printf "(New, dyntrans) MIPS CPU emulation\n"
+
 			if [ z$ENABLEPPC = zYES ]; then
 				printf "  --disable-ppc      disable "
 			else
@@ -288,7 +302,7 @@
 			exit
 		fi; fi; fi; fi; fi; fi; fi; fi; fi; fi; fi; fi; fi; fi; fi; fi
 		fi; fi; fi; fi; fi; fi; fi; fi; fi; fi; fi; fi; fi; fi; fi; fi
-		fi; fi; fi; fi; fi
+		fi; fi; fi; fi; fi; fi; fi
 	done
 fi
 
@@ -345,7 +359,7 @@
 	CPU_ARCHS="$CPU_ARCHS tmp_arm_r8.o tmp_arm_r9.o"
 	CPU_ARCHS="$CPU_ARCHS tmp_arm_ra.o tmp_arm_rb.o"
 	CPU_ARCHS="$CPU_ARCHS tmp_arm_rc.o tmp_arm_rd.o"
-	CPU_ARCHS="$CPU_ARCHS tmp_arm_re.o tmp_arm_rf.o"
+	CPU_ARCHS="$CPU_ARCHS tmp_arm_re.o tmp_arm_rf.o tmp_arm_multi.o"
 	CPU_TOOLS="$CPU_TOOLS generate_arm_dpi generate_arm_r"
 	CPU_TOOLS="$CPU_TOOLS generate_arm_loadstore generate_arm_multi"
 fi
@@ -372,6 +386,10 @@
 if [ z$ENABLEMIPS = zYES ]; then
 	printf "#define ENABLE_MIPS\n" >> config.h
 fi
+if [ z$ENABLENEWMIPS = zYES ]; then
+	printf "#define ENABLE_NEWMIPS\n" >> config.h
+	CPU_ARCHS="$CPU_ARCHS cpu_newmips.o"
+fi
 if [ z$ENABLEPPC = zYES ]; then
 	printf "#define ENABLE_PPC\n" >> config.h
 	CPU_ARCHS="$CPU_ARCHS cpu_ppc.o"
@@ -1302,8 +1320,8 @@
 
 
 #  Create the Makefiles:
-
-for a in . src src/cpus src/devices src/devices/fonts src/promemul; do
+D=". src src/include src/cpus src/devices src/devices/fonts src/promemul"
+for a in $D; do
 	echo "creating $a/Makefile"
 	touch $a/Makefile
 	cat _Makefile.header > $a/Makefile