1.1 --- a/Makefile.am	Fri Oct 24 03:47:30 2008 +0000
     1.2 +++ b/Makefile.am	Fri Oct 24 03:48:40 2008 +0000
     1.3 @@ -62,7 +62,7 @@
     1.4  	mkdir -p $(BUNDLE)/Contents/MacOS
     1.5  	mkdir -p $(BUNDLE)/Contents/Resources
     1.6  	cp Info.plist $(BUNDLE)/Contents
     1.7 -	cp lxdreamrc $(BUNDLE)/Contents/Resources
     1.8 +	cp $(srcdir)/lxdreamrc $(BUNDLE)/Contents/Resources
     1.9  	cp src/lxdream $(BUNDLE)/Contents/MacOS
    1.10  	cp -R $(srcdir)/pixmaps/* $(BUNDLE)/Contents/Resources
    1.11  	$(srcdir)/bundlelibs.pl $(BUNDLE)/Contents/MacOS/lxdream $(BUNDLE)/Contents/Frameworks

     2.1 --- a/Makefile.in	Fri Oct 24 03:47:30 2008 +0000
     2.2 +++ b/Makefile.in	Fri Oct 24 03:48:40 2008 +0000
     2.3 @@ -806,7 +806,7 @@
     2.4  @GUI_COCOA_TRUE@	mkdir -p $(BUNDLE)/Contents/MacOS
     2.5  @GUI_COCOA_TRUE@	mkdir -p $(BUNDLE)/Contents/Resources
     2.6  @GUI_COCOA_TRUE@	cp Info.plist $(BUNDLE)/Contents
     2.7 -@GUI_COCOA_TRUE@	cp lxdreamrc $(BUNDLE)/Contents/Resources
     2.8 +@GUI_COCOA_TRUE@	cp $(srcdir)/lxdreamrc $(BUNDLE)/Contents/Resources
     2.9  @GUI_COCOA_TRUE@	cp src/lxdream $(BUNDLE)/Contents/MacOS
    2.10  @GUI_COCOA_TRUE@	cp -R $(srcdir)/pixmaps/* $(BUNDLE)/Contents/Resources
    2.11  @GUI_COCOA_TRUE@	$(srcdir)/bundlelibs.pl $(BUNDLE)/Contents/MacOS/lxdream $(BUNDLE)/Contents/Frameworks

     3.1 --- a/src/Makefile.am	Fri Oct 24 03:47:30 2008 +0000
     3.2 +++ b/src/Makefile.am	Fri Oct 24 03:48:40 2008 +0000
     3.3 @@ -54,8 +54,7 @@
     3.4  	pvr2/gl_sl.c pvr2/gl_slsrc.c pvr2/glutil.c pvr2/glutil.h pvr2/glrender.c \
     3.5  	pvr2/vertex.glsl pvr2/fragment.glsl \
     3.6          maple/maple.c maple/maple.h \
     3.7 -        maple/controller.c maple/controller.h maple/kbd.c maple/mouse.c \
     3.8 -        maple/lightgun.c \
     3.9 +        maple/controller.c maple/kbd.c maple/mouse.c maple/lightgun.c \
    3.10          loader.c loader.h elf.h bootstrap.c bootstrap.h util.c gdlist.c gdlist.h \
    3.11  	display.c display.h dckeysyms.h \
    3.12  	drivers/audio_null.c drivers/video_null.c \

     4.1 --- a/src/Makefile.in	Fri Oct 24 03:47:30 2008 +0000
     4.2 +++ b/src/Makefile.in	Fri Oct 24 03:48:40 2008 +0000
     4.3 @@ -112,30 +112,30 @@
     4.4  	pvr2/scene.h pvr2/gl_sl.c pvr2/gl_slsrc.c pvr2/glutil.c \
     4.5  	pvr2/glutil.h pvr2/glrender.c pvr2/vertex.glsl \
     4.6  	pvr2/fragment.glsl maple/maple.c maple/maple.h \
     4.7 -	maple/controller.c maple/controller.h maple/kbd.c \
     4.8 -	maple/mouse.c maple/lightgun.c loader.c loader.h elf.h \
     4.9 -	bootstrap.c bootstrap.h util.c gdlist.c gdlist.h display.c \
    4.10 -	display.h dckeysyms.h drivers/audio_null.c \
    4.11 -	drivers/video_null.c drivers/video_gl.c drivers/video_gl.h \
    4.12 -	drivers/gl_fbo.c sh4/sh4.def sh4/sh4core.in sh4/sh4x86.in \
    4.13 -	sh4/sh4dasm.in sh4/sh4stat.in sh4/sh4x86.c sh4/x86op.h \
    4.14 -	sh4/ia32abi.h sh4/ia32mac.h sh4/ia64abi.h sh4/sh4trans.c \
    4.15 -	sh4/sh4trans.h x86dasm/x86dasm.c x86dasm/x86dasm.h \
    4.16 -	x86dasm/i386-dis.c x86dasm/dis-init.c x86dasm/dis-buf.c \
    4.17 -	x86dasm/ansidecl.h x86dasm/bfd.h x86dasm/dis-asm.h \
    4.18 -	x86dasm/symcat.h x86dasm/sysdep.h gtkui/gtkui.c gtkui/gtkui.h \
    4.19 -	gtkui/gtk_win.c gtkui/gtkcb.c gtkui/gtk_mmio.c \
    4.20 -	gtkui/gtk_debug.c gtkui/gtk_dump.c gtkui/gtk_ctrl.c \
    4.21 -	gtkui/gtk_path.c gtkui/gtk_gd.c drivers/video_gtk.c \
    4.22 -	cocoaui/cocoaui.c cocoaui/cocoaui.h cocoaui/cocoa_win.c \
    4.23 -	cocoaui/cocoa_gd.c cocoaui/cocoa_prefs.c cocoaui/cocoa_path.c \
    4.24 -	cocoaui/cocoa_ctrl.c drivers/video_osx.c drivers/mac_keymap.h \
    4.25 -	drivers/mac_keymap.txt drivers/video_gdk.c drivers/video_glx.c \
    4.26 -	drivers/video_glx.h drivers/video_nsgl.c drivers/video_nsgl.h \
    4.27 -	drivers/audio_osx.c drivers/audio_pulse.c drivers/audio_esd.c \
    4.28 -	drivers/audio_alsa.c drivers/cd_linux.c drivers/cd_osx.c \
    4.29 -	drivers/osx_iokit.c drivers/osx_iokit.h drivers/cd_none.c \
    4.30 -	drivers/joy_linux.c drivers/joy_linux.h
    4.31 +	maple/controller.c maple/kbd.c maple/mouse.c maple/lightgun.c \
    4.32 +	loader.c loader.h elf.h bootstrap.c bootstrap.h util.c \
    4.33 +	gdlist.c gdlist.h display.c display.h dckeysyms.h \
    4.34 +	drivers/audio_null.c drivers/video_null.c drivers/video_gl.c \
    4.35 +	drivers/video_gl.h drivers/gl_fbo.c sh4/sh4.def sh4/sh4core.in \
    4.36 +	sh4/sh4x86.in sh4/sh4dasm.in sh4/sh4stat.in sh4/sh4x86.c \
    4.37 +	sh4/x86op.h sh4/ia32abi.h sh4/ia32mac.h sh4/ia64abi.h \
    4.38 +	sh4/sh4trans.c sh4/sh4trans.h x86dasm/x86dasm.c \
    4.39 +	x86dasm/x86dasm.h x86dasm/i386-dis.c x86dasm/dis-init.c \
    4.40 +	x86dasm/dis-buf.c x86dasm/ansidecl.h x86dasm/bfd.h \
    4.41 +	x86dasm/dis-asm.h x86dasm/symcat.h x86dasm/sysdep.h \
    4.42 +	gtkui/gtkui.c gtkui/gtkui.h gtkui/gtk_win.c gtkui/gtkcb.c \
    4.43 +	gtkui/gtk_mmio.c gtkui/gtk_debug.c gtkui/gtk_dump.c \
    4.44 +	gtkui/gtk_ctrl.c gtkui/gtk_path.c gtkui/gtk_gd.c \
    4.45 +	drivers/video_gtk.c cocoaui/cocoaui.c cocoaui/cocoaui.h \
    4.46 +	cocoaui/cocoa_win.c cocoaui/cocoa_gd.c cocoaui/cocoa_prefs.c \
    4.47 +	cocoaui/cocoa_path.c cocoaui/cocoa_ctrl.c drivers/video_osx.c \
    4.48 +	drivers/mac_keymap.h drivers/mac_keymap.txt \
    4.49 +	drivers/video_gdk.c drivers/video_glx.c drivers/video_glx.h \
    4.50 +	drivers/video_nsgl.c drivers/video_nsgl.h drivers/audio_osx.c \
    4.51 +	drivers/audio_pulse.c drivers/audio_esd.c drivers/audio_alsa.c \
    4.52 +	drivers/cd_linux.c drivers/cd_osx.c drivers/osx_iokit.c \
    4.53 +	drivers/osx_iokit.h drivers/cd_none.c drivers/joy_linux.c \
    4.54 +	drivers/joy_linux.h
    4.55  @BUILD_SH4X86_TRUE@am__objects_1 = sh4x86.$(OBJEXT) sh4trans.$(OBJEXT) \
    4.56  @BUILD_SH4X86_TRUE@	x86dasm.$(OBJEXT) i386-dis.$(OBJEXT) \
    4.57  @BUILD_SH4X86_TRUE@	dis-init.$(OBJEXT) dis-buf.$(OBJEXT)
    4.58 @@ -419,18 +419,17 @@
    4.59  	pvr2/yuv.c pvr2/rendsave.c pvr2/scene.c pvr2/scene.h \
    4.60  	pvr2/gl_sl.c pvr2/gl_slsrc.c pvr2/glutil.c pvr2/glutil.h \
    4.61  	pvr2/glrender.c pvr2/vertex.glsl pvr2/fragment.glsl \
    4.62 -	maple/maple.c maple/maple.h maple/controller.c \
    4.63 -	maple/controller.h maple/kbd.c maple/mouse.c maple/lightgun.c \
    4.64 -	loader.c loader.h elf.h bootstrap.c bootstrap.h util.c \
    4.65 -	gdlist.c gdlist.h display.c display.h dckeysyms.h \
    4.66 -	drivers/audio_null.c drivers/video_null.c drivers/video_gl.c \
    4.67 -	drivers/video_gl.h drivers/gl_fbo.c sh4/sh4.def sh4/sh4core.in \
    4.68 -	sh4/sh4x86.in sh4/sh4dasm.in sh4/sh4stat.in $(am__append_1) \
    4.69 -	$(am__append_3) $(am__append_4) $(am__append_5) \
    4.70 -	$(am__append_6) $(am__append_7) $(am__append_8) \
    4.71 -	$(am__append_9) $(am__append_10) $(am__append_11) \
    4.72 -	$(am__append_12) $(am__append_13) $(am__append_14) \
    4.73 -	$(am__append_15)
    4.74 +	maple/maple.c maple/maple.h maple/controller.c maple/kbd.c \
    4.75 +	maple/mouse.c maple/lightgun.c loader.c loader.h elf.h \
    4.76 +	bootstrap.c bootstrap.h util.c gdlist.c gdlist.h display.c \
    4.77 +	display.h dckeysyms.h drivers/audio_null.c \
    4.78 +	drivers/video_null.c drivers/video_gl.c drivers/video_gl.h \
    4.79 +	drivers/gl_fbo.c sh4/sh4.def sh4/sh4core.in sh4/sh4x86.in \
    4.80 +	sh4/sh4dasm.in sh4/sh4stat.in $(am__append_1) $(am__append_3) \
    4.81 +	$(am__append_4) $(am__append_5) $(am__append_6) \
    4.82 +	$(am__append_7) $(am__append_8) $(am__append_9) \
    4.83 +	$(am__append_10) $(am__append_11) $(am__append_12) \
    4.84 +	$(am__append_13) $(am__append_14) $(am__append_15)
    4.85  @BUILD_SH4X86_TRUE@test_testsh4x86_LDADD = @GLIB_LIBS@ @GTK_LIBS@ @LIBPNG_LIBS@
    4.86  @BUILD_SH4X86_TRUE@test_testsh4x86_SOURCES = test/testsh4x86.c x86dasm/x86dasm.c \
    4.87  @BUILD_SH4X86_TRUE@	x86dasm/x86dasm.h x86dasm/i386-dis.c x86dasm/dis-init.c \

     5.1 --- a/test/Makefile.in	Fri Oct 24 03:47:30 2008 +0000
     5.2 +++ b/test/Makefile.in	Fri Oct 24 03:48:40 2008 +0000
     5.3 @@ -77,6 +77,15 @@
     5.4  
     5.5  build-tests: testsh4 testmath testide testta testregs testrend testdisp testspu testmmu
     5.6  
     5.7 +lib/crt0.so: lib/crt0.s
     5.8 +	$(mkdir_p) lib
     5.9 +	$(SH4CC) $(SH4CFLAGS) -o $@ -c $< 
    5.10 +
    5.11 +lib-arm/crt0.ao: lib-arm/crt0.s
    5.12 +	$(mkdir_p) lib-arm
    5.13 +	$(ARMCC) $(ARMCFLAGS) -o $@ -c $< 
    5.14 +
    5.15 +
    5.16  testsh4: lib/crt0.so sh4/testsh4.so timer.so interrupt.so \
    5.17  	 sh4/add.so sh4/addc.so sh4/addv.so sh4/and.so sh4/andi.so \
    5.18  	 sh4/bf.so sh4/bsr.so sh4/bt.so sh4/cmp.so sh4/cmpstr.so \
    5.19 @@ -148,9 +157,9 @@
    5.20  
    5.21  .PHONY : clean
    5.22  clean:
    5.23 -	rm -f *.o *.so *.ao *.ac *.bin sh4/*.so mapleid ide readmem dumpasic \
    5.24 -	   testsh4 testta testdisp testregs testide testmath testmmu \
    5.25 -	   testrend testspu dcflash.rom
    5.26 +	rm -f *.o *.so *.ao *.ac *.bin sh4/*.so lib/*.so lib-arm/*.ao mapleid \
    5.27 +	   readmem dumpasic testsh4 testta testdisp testregs testide testmath \
    5.28 +	   testmmu testaica testrend testspu ide dcflash.rom
    5.29  
    5.30  distclean: clean
    5.31  	rm -f Makefile
    5.32 @@ -167,7 +176,7 @@
    5.33          sh4/cmpstr.s sh4/div0.s sh4/div1.s sh4/excslot.s sh4/float.s sh4/fmov.s \
    5.34          sh4/ftrc.s sh4/inc.s sh4/mac.s sh4/ldc.s sh4/rot.s sh4/shl.s sh4/shld.s sh4/sub.s \
    5.35          sh4/subc.s sh4/tas.s sh4/testsh4.c sh4/tlb.s sh4/vmexit.s sh4/trapa.s sh4/undef.s \
    5.36 -        sh4/xtrct.s testdata.c testdata.h testdisp.c testide.c testmath.c \
    5.37 +        sh4/xtrct.s testdata.c testdata.h testdisp.c testide.c testmath.c testaica.c \
    5.38          testmmu.c testregs.c testrend.c testspu.c testta.c testyuv.c timer.c timer.h \
    5.39          testta.data testta2.data testta3.data testta4.data testta5.data testsort.data \
    5.40          lxdream.rc dc.x lib/crt0.s lib/libc.a lib/libm.a lib/newlib-1.8.2-dc.patch \