--- a/src/Makefile.in	Mon Oct 06 01:05:12 2008 +0000
+++ b/src/Makefile.in	Fri Nov 07 06:39:12 2008 +0000
@@ -112,30 +112,30 @@
 	pvr2/scene.h pvr2/gl_sl.c pvr2/gl_slsrc.c pvr2/glutil.c \
 	pvr2/glutil.h pvr2/glrender.c pvr2/vertex.glsl \
 	pvr2/fragment.glsl maple/maple.c maple/maple.h \
-	maple/controller.c maple/controller.h maple/kbd.c \
-	maple/mouse.c maple/lightgun.c loader.c loader.h elf.h \
-	bootstrap.c bootstrap.h util.c gdlist.c gdlist.h display.c \
-	display.h dckeysyms.h drivers/audio_null.c \
-	drivers/video_null.c drivers/video_gl.c drivers/video_gl.h \
-	drivers/gl_fbo.c sh4/sh4.def sh4/sh4core.in sh4/sh4x86.in \
-	sh4/sh4dasm.in sh4/sh4stat.in sh4/sh4x86.c sh4/x86op.h \
-	sh4/ia32abi.h sh4/ia32mac.h sh4/ia64abi.h sh4/sh4trans.c \
-	sh4/sh4trans.h x86dasm/x86dasm.c x86dasm/x86dasm.h \
-	x86dasm/i386-dis.c x86dasm/dis-init.c x86dasm/dis-buf.c \
-	x86dasm/ansidecl.h x86dasm/bfd.h x86dasm/dis-asm.h \
-	x86dasm/symcat.h x86dasm/sysdep.h gtkui/gtkui.c gtkui/gtkui.h \
-	gtkui/gtk_win.c gtkui/gtkcb.c gtkui/gtk_mmio.c \
-	gtkui/gtk_debug.c gtkui/gtk_dump.c gtkui/gtk_ctrl.c \
-	gtkui/gtk_path.c gtkui/gtk_gd.c drivers/video_gtk.c \
-	cocoaui/cocoaui.c cocoaui/cocoaui.h cocoaui/cocoa_win.c \
-	cocoaui/cocoa_gd.c cocoaui/cocoa_prefs.c cocoaui/cocoa_path.c \
-	cocoaui/cocoa_ctrl.c drivers/video_osx.c drivers/mac_keymap.h \
-	drivers/mac_keymap.txt drivers/video_gdk.c drivers/video_glx.c \
-	drivers/video_glx.h drivers/video_nsgl.c drivers/video_nsgl.h \
-	drivers/audio_osx.c drivers/audio_pulse.c drivers/audio_esd.c \
-	drivers/audio_alsa.c drivers/cd_linux.c drivers/cd_osx.c \
-	drivers/osx_iokit.c drivers/osx_iokit.h drivers/cd_none.c \
-	drivers/joy_linux.c drivers/joy_linux.h
+	maple/controller.c maple/kbd.c maple/mouse.c maple/lightgun.c \
+	loader.c loader.h elf.h bootstrap.c bootstrap.h util.c \
+	gdlist.c gdlist.h display.c display.h dckeysyms.h \
+	drivers/audio_null.c drivers/video_null.c drivers/video_gl.c \
+	drivers/video_gl.h drivers/gl_fbo.c sh4/sh4.def sh4/sh4core.in \
+	sh4/sh4x86.in sh4/sh4dasm.in sh4/sh4stat.in sh4/sh4x86.c \
+	sh4/x86op.h sh4/ia32abi.h sh4/ia32mac.h sh4/ia64abi.h \
+	sh4/sh4trans.c sh4/sh4trans.h x86dasm/x86dasm.c \
+	x86dasm/x86dasm.h x86dasm/i386-dis.c x86dasm/dis-init.c \
+	x86dasm/dis-buf.c x86dasm/ansidecl.h x86dasm/bfd.h \
+	x86dasm/dis-asm.h x86dasm/symcat.h x86dasm/sysdep.h \
+	gtkui/gtkui.c gtkui/gtkui.h gtkui/gtk_win.c gtkui/gtkcb.c \
+	gtkui/gtk_mmio.c gtkui/gtk_debug.c gtkui/gtk_dump.c \
+	gtkui/gtk_ctrl.c gtkui/gtk_path.c gtkui/gtk_gd.c \
+	drivers/video_gtk.c cocoaui/cocoaui.c cocoaui/cocoaui.h \
+	cocoaui/cocoa_win.c cocoaui/cocoa_gd.c cocoaui/cocoa_prefs.c \
+	cocoaui/cocoa_path.c cocoaui/cocoa_ctrl.c drivers/video_osx.c \
+	drivers/mac_keymap.h drivers/mac_keymap.txt \
+	drivers/video_gdk.c drivers/video_glx.c drivers/video_glx.h \
+	drivers/video_nsgl.c drivers/video_nsgl.h drivers/audio_osx.c \
+	drivers/audio_pulse.c drivers/audio_esd.c drivers/audio_alsa.c \
+	drivers/cd_linux.c drivers/cd_osx.c drivers/osx_iokit.c \
+	drivers/osx_iokit.h drivers/cd_none.c drivers/joy_linux.c \
+	drivers/joy_linux.h
 @BUILD_SH4X86_TRUE@am__objects_1 = sh4x86.$(OBJEXT) sh4trans.$(OBJEXT) \
 @BUILD_SH4X86_TRUE@	x86dasm.$(OBJEXT) i386-dis.$(OBJEXT) \
 @BUILD_SH4X86_TRUE@	dis-init.$(OBJEXT) dis-buf.$(OBJEXT)
@@ -419,18 +419,17 @@
 	pvr2/yuv.c pvr2/rendsave.c pvr2/scene.c pvr2/scene.h \
 	pvr2/gl_sl.c pvr2/gl_slsrc.c pvr2/glutil.c pvr2/glutil.h \
 	pvr2/glrender.c pvr2/vertex.glsl pvr2/fragment.glsl \
-	maple/maple.c maple/maple.h maple/controller.c \
-	maple/controller.h maple/kbd.c maple/mouse.c maple/lightgun.c \
-	loader.c loader.h elf.h bootstrap.c bootstrap.h util.c \
-	gdlist.c gdlist.h display.c display.h dckeysyms.h \
-	drivers/audio_null.c drivers/video_null.c drivers/video_gl.c \
-	drivers/video_gl.h drivers/gl_fbo.c sh4/sh4.def sh4/sh4core.in \
-	sh4/sh4x86.in sh4/sh4dasm.in sh4/sh4stat.in $(am__append_1) \
-	$(am__append_3) $(am__append_4) $(am__append_5) \
-	$(am__append_6) $(am__append_7) $(am__append_8) \
-	$(am__append_9) $(am__append_10) $(am__append_11) \
-	$(am__append_12) $(am__append_13) $(am__append_14) \
-	$(am__append_15)
+	maple/maple.c maple/maple.h maple/controller.c maple/kbd.c \
+	maple/mouse.c maple/lightgun.c loader.c loader.h elf.h \
+	bootstrap.c bootstrap.h util.c gdlist.c gdlist.h display.c \
+	display.h dckeysyms.h drivers/audio_null.c \
+	drivers/video_null.c drivers/video_gl.c drivers/video_gl.h \
+	drivers/gl_fbo.c sh4/sh4.def sh4/sh4core.in sh4/sh4x86.in \
+	sh4/sh4dasm.in sh4/sh4stat.in $(am__append_1) $(am__append_3) \
+	$(am__append_4) $(am__append_5) $(am__append_6) \
+	$(am__append_7) $(am__append_8) $(am__append_9) \
+	$(am__append_10) $(am__append_11) $(am__append_12) \
+	$(am__append_13) $(am__append_14) $(am__append_15)
 @BUILD_SH4X86_TRUE@test_testsh4x86_LDADD = @GLIB_LIBS@ @GTK_LIBS@ @LIBPNG_LIBS@
 @BUILD_SH4X86_TRUE@test_testsh4x86_SOURCES = test/testsh4x86.c x86dasm/x86dasm.c \
 @BUILD_SH4X86_TRUE@	x86dasm/x86dasm.h x86dasm/i386-dis.c x86dasm/dis-init.c \