1.1 --- a/src/Makefile.in	Sat Jun 14 11:54:15 2008 +0000
     1.2 +++ b/src/Makefile.in	Thu Jun 19 04:40:37 2008 +0000
     1.3 @@ -53,7 +53,7 @@
     1.4  @GUI_GTK_TRUE@        drivers/video_gtk.c drivers/video_gtk.h
     1.5  
     1.6  @GUI_COCOA_TRUE@am__append_4 = cocoaui/cocoaui.c cocoaui/cocoaui.h \
     1.7 -@GUI_COCOA_TRUE@	cocoaui/cocoa_win.c drivers/video_osx.c drivers/mac_keymap.h
     1.8 +@GUI_COCOA_TRUE@	cocoaui/cocoa_win.c cocoaui/cocoa_gd.c drivers/video_osx.c drivers/mac_keymap.h
     1.9  
    1.10  @VIDEO_OSMESA_TRUE@am__append_5 = drivers/video_gdk.c drivers/video_gdk.h 
    1.11  @VIDEO_GLX_TRUE@am__append_6 = drivers/video_glx.c drivers/video_glx.h
    1.12 @@ -103,22 +103,23 @@
    1.13  	pvr2/scene.h pvr2/gl_sl.c pvr2/gl_slsrc.c pvr2/glutil.c \
    1.14  	pvr2/glutil.h pvr2/glrender.c maple/maple.c maple/maple.h \
    1.15  	maple/controller.c maple/controller.h maple/kbd.c \
    1.16 -	maple/mouse.c loader.c bootstrap.c util.c display.c display.h \
    1.17 -	dckeysyms.h drivers/audio_null.c drivers/video_null.c \
    1.18 -	drivers/video_gl.c drivers/video_gl.h drivers/gl_fbo.c \
    1.19 -	sh4/sh4x86.c sh4/x86op.h sh4/ia32abi.h sh4/ia32mac.h \
    1.20 -	sh4/ia64abi.h sh4/sh4trans.c sh4/sh4trans.h x86dasm/x86dasm.c \
    1.21 -	x86dasm/x86dasm.h x86dasm/i386-dis.c x86dasm/dis-init.c \
    1.22 -	x86dasm/dis-buf.c gtkui/gtkui.c gtkui/gtkui.h gtkui/main_win.c \
    1.23 -	gtkui/gtkcb.c gtkui/mmio_win.c gtkui/debug_win.c \
    1.24 -	gtkui/dump_win.c gtkui/ctrl_dlg.c gtkui/path_dlg.c \
    1.25 -	gtkui/gdrom_menu.c drivers/video_gtk.c drivers/video_gtk.h \
    1.26 -	cocoaui/cocoaui.c cocoaui/cocoaui.h cocoaui/cocoa_win.c \
    1.27 -	drivers/video_osx.c drivers/mac_keymap.h drivers/video_gdk.c \
    1.28 -	drivers/video_gdk.h drivers/video_glx.c drivers/video_glx.h \
    1.29 -	drivers/video_nsgl.c drivers/video_nsgl.h \
    1.30 -	drivers/audio_pulse.c drivers/audio_esd.c drivers/audio_alsa.c \
    1.31 -	drivers/cd_linux.c drivers/cd_none.c drivers/joy_linux.c
    1.32 +	maple/mouse.c loader.c bootstrap.c util.c gdlist.c gdlist.h \
    1.33 +	display.c display.h dckeysyms.h drivers/audio_null.c \
    1.34 +	drivers/video_null.c drivers/video_gl.c drivers/video_gl.h \
    1.35 +	drivers/gl_fbo.c sh4/sh4x86.c sh4/x86op.h sh4/ia32abi.h \
    1.36 +	sh4/ia32mac.h sh4/ia64abi.h sh4/sh4trans.c sh4/sh4trans.h \
    1.37 +	x86dasm/x86dasm.c x86dasm/x86dasm.h x86dasm/i386-dis.c \
    1.38 +	x86dasm/dis-init.c x86dasm/dis-buf.c gtkui/gtkui.c \
    1.39 +	gtkui/gtkui.h gtkui/main_win.c gtkui/gtkcb.c gtkui/mmio_win.c \
    1.40 +	gtkui/debug_win.c gtkui/dump_win.c gtkui/ctrl_dlg.c \
    1.41 +	gtkui/path_dlg.c gtkui/gdrom_menu.c drivers/video_gtk.c \
    1.42 +	drivers/video_gtk.h cocoaui/cocoaui.c cocoaui/cocoaui.h \
    1.43 +	cocoaui/cocoa_win.c cocoaui/cocoa_gd.c drivers/video_osx.c \
    1.44 +	drivers/mac_keymap.h drivers/video_gdk.c drivers/video_gdk.h \
    1.45 +	drivers/video_glx.c drivers/video_glx.h drivers/video_nsgl.c \
    1.46 +	drivers/video_nsgl.h drivers/audio_pulse.c drivers/audio_esd.c \
    1.47 +	drivers/audio_alsa.c drivers/cd_linux.c drivers/cd_none.c \
    1.48 +	drivers/joy_linux.c
    1.49  @BUILD_SH4X86_TRUE@am__objects_1 = sh4x86.$(OBJEXT) sh4trans.$(OBJEXT) \
    1.50  @BUILD_SH4X86_TRUE@	x86dasm.$(OBJEXT) i386-dis.$(OBJEXT) \
    1.51  @BUILD_SH4X86_TRUE@	dis-init.$(OBJEXT) dis-buf.$(OBJEXT)
    1.52 @@ -128,7 +129,7 @@
    1.53  @GUI_GTK_TRUE@	ctrl_dlg.$(OBJEXT) path_dlg.$(OBJEXT) \
    1.54  @GUI_GTK_TRUE@	gdrom_menu.$(OBJEXT) video_gtk.$(OBJEXT)
    1.55  @GUI_COCOA_TRUE@am__objects_3 = cocoaui.$(OBJEXT) cocoa_win.$(OBJEXT) \
    1.56 -@GUI_COCOA_TRUE@	video_osx.$(OBJEXT)
    1.57 +@GUI_COCOA_TRUE@	cocoa_gd.$(OBJEXT) video_osx.$(OBJEXT)
    1.58  @VIDEO_OSMESA_TRUE@am__objects_4 = video_gdk.$(OBJEXT)
    1.59  @VIDEO_GLX_TRUE@am__objects_5 = video_glx.$(OBJEXT)
    1.60  @VIDEO_NSGL_TRUE@am__objects_6 = video_nsgl.$(OBJEXT)
    1.61 @@ -154,13 +155,13 @@
    1.62  	gl_sl.$(OBJEXT) gl_slsrc.$(OBJEXT) glutil.$(OBJEXT) \
    1.63  	glrender.$(OBJEXT) maple.$(OBJEXT) controller.$(OBJEXT) \
    1.64  	kbd.$(OBJEXT) mouse.$(OBJEXT) loader.$(OBJEXT) \
    1.65 -	bootstrap.$(OBJEXT) util.$(OBJEXT) display.$(OBJEXT) \
    1.66 -	audio_null.$(OBJEXT) video_null.$(OBJEXT) video_gl.$(OBJEXT) \
    1.67 -	gl_fbo.$(OBJEXT) $(am__objects_1) $(am__objects_2) \
    1.68 -	$(am__objects_3) $(am__objects_4) $(am__objects_5) \
    1.69 -	$(am__objects_6) $(am__objects_7) $(am__objects_8) \
    1.70 -	$(am__objects_9) $(am__objects_10) $(am__objects_11) \
    1.71 -	$(am__objects_12)
    1.72 +	bootstrap.$(OBJEXT) util.$(OBJEXT) gdlist.$(OBJEXT) \
    1.73 +	display.$(OBJEXT) audio_null.$(OBJEXT) video_null.$(OBJEXT) \
    1.74 +	video_gl.$(OBJEXT) gl_fbo.$(OBJEXT) $(am__objects_1) \
    1.75 +	$(am__objects_2) $(am__objects_3) $(am__objects_4) \
    1.76 +	$(am__objects_5) $(am__objects_6) $(am__objects_7) \
    1.77 +	$(am__objects_8) $(am__objects_9) $(am__objects_10) \
    1.78 +	$(am__objects_11) $(am__objects_12)
    1.79  lxdream_OBJECTS = $(am_lxdream_OBJECTS)
    1.80  lxdream_DEPENDENCIES = $(am__DEPENDENCIES_1)
    1.81  am__test_testsh4x86_SOURCES_DIST = test/testsh4x86.c x86dasm/x86dasm.c \
    1.82 @@ -379,13 +380,14 @@
    1.83  	pvr2/scene.h pvr2/gl_sl.c pvr2/gl_slsrc.c pvr2/glutil.c \
    1.84  	pvr2/glutil.h pvr2/glrender.c maple/maple.c maple/maple.h \
    1.85  	maple/controller.c maple/controller.h maple/kbd.c \
    1.86 -	maple/mouse.c loader.c bootstrap.c util.c display.c display.h \
    1.87 -	dckeysyms.h drivers/audio_null.c drivers/video_null.c \
    1.88 -	drivers/video_gl.c drivers/video_gl.h drivers/gl_fbo.c \
    1.89 -	$(am__append_1) $(am__append_3) $(am__append_4) \
    1.90 -	$(am__append_5) $(am__append_6) $(am__append_7) \
    1.91 -	$(am__append_8) $(am__append_9) $(am__append_10) \
    1.92 -	$(am__append_11) $(am__append_12) $(am__append_13)
    1.93 +	maple/mouse.c loader.c bootstrap.c util.c gdlist.c gdlist.h \
    1.94 +	display.c display.h dckeysyms.h drivers/audio_null.c \
    1.95 +	drivers/video_null.c drivers/video_gl.c drivers/video_gl.h \
    1.96 +	drivers/gl_fbo.c $(am__append_1) $(am__append_3) \
    1.97 +	$(am__append_4) $(am__append_5) $(am__append_6) \
    1.98 +	$(am__append_7) $(am__append_8) $(am__append_9) \
    1.99 +	$(am__append_10) $(am__append_11) $(am__append_12) \
   1.100 +	$(am__append_13)
   1.101  @BUILD_SH4X86_TRUE@test_testsh4x86_LDADD = @GLIB_LIBS@ @GTK_LIBS@ @LIBPNG_LIBS@
   1.102  @BUILD_SH4X86_TRUE@test_testsh4x86_SOURCES = test/testsh4x86.c x86dasm/x86dasm.c \
   1.103  @BUILD_SH4X86_TRUE@	x86dasm/x86dasm.h x86dasm/i386-dis.c x86dasm/dis-init.c \
   1.104 @@ -501,6 +503,7 @@
   1.105  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cd_linux.Po@am__quote@
   1.106  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cd_none.Po@am__quote@
   1.107  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdi.Po@am__quote@
   1.108 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cocoa_gd.Po@am__quote@
   1.109  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cocoa_win.Po@am__quote@
   1.110  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cocoaui.Po@am__quote@
   1.111  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/config.Po@am__quote@
   1.112 @@ -518,6 +521,7 @@
   1.113  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eventq.Po@am__quote@
   1.114  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdi.Po@am__quote@
   1.115  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdimage.Po@am__quote@
   1.116 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdlist.Po@am__quote@
   1.117  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdrom.Po@am__quote@
   1.118  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdrom_menu.Po@am__quote@
   1.119  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gendec.Po@am__quote@
   1.120 @@ -1516,6 +1520,20 @@
   1.121  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
   1.122  @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cocoa_win.obj `if test -f 'cocoaui/cocoa_win.c'; then $(CYGPATH_W) 'cocoaui/cocoa_win.c'; else $(CYGPATH_W) '$(srcdir)/cocoaui/cocoa_win.c'; fi`
   1.123  
   1.124 +cocoa_gd.o: cocoaui/cocoa_gd.c
   1.125 +@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cocoa_gd.o -MD -MP -MF "$(DEPDIR)/cocoa_gd.Tpo" -c -o cocoa_gd.o `test -f 'cocoaui/cocoa_gd.c' || echo '$(srcdir)/'`cocoaui/cocoa_gd.c; \
   1.126 +@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/cocoa_gd.Tpo" "$(DEPDIR)/cocoa_gd.Po"; else rm -f "$(DEPDIR)/cocoa_gd.Tpo"; exit 1; fi
   1.127 +@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cocoaui/cocoa_gd.c' object='cocoa_gd.o' libtool=no @AMDEPBACKSLASH@
   1.128 +@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
   1.129 +@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cocoa_gd.o `test -f 'cocoaui/cocoa_gd.c' || echo '$(srcdir)/'`cocoaui/cocoa_gd.c
   1.130 +
   1.131 +cocoa_gd.obj: cocoaui/cocoa_gd.c
   1.132 +@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cocoa_gd.obj -MD -MP -MF "$(DEPDIR)/cocoa_gd.Tpo" -c -o cocoa_gd.obj `if test -f 'cocoaui/cocoa_gd.c'; then $(CYGPATH_W) 'cocoaui/cocoa_gd.c'; else $(CYGPATH_W) '$(srcdir)/cocoaui/cocoa_gd.c'; fi`; \
   1.133 +@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/cocoa_gd.Tpo" "$(DEPDIR)/cocoa_gd.Po"; else rm -f "$(DEPDIR)/cocoa_gd.Tpo"; exit 1; fi
   1.134 +@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cocoaui/cocoa_gd.c' object='cocoa_gd.obj' libtool=no @AMDEPBACKSLASH@
   1.135 +@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
   1.136 +@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cocoa_gd.obj `if test -f 'cocoaui/cocoa_gd.c'; then $(CYGPATH_W) 'cocoaui/cocoa_gd.c'; else $(CYGPATH_W) '$(srcdir)/cocoaui/cocoa_gd.c'; fi`
   1.137 +
   1.138  video_osx.o: drivers/video_osx.c
   1.139  @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT video_osx.o -MD -MP -MF "$(DEPDIR)/video_osx.Tpo" -c -o video_osx.o `test -f 'drivers/video_osx.c' || echo '$(srcdir)/'`drivers/video_osx.c; \
   1.140  @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/video_osx.Tpo" "$(DEPDIR)/video_osx.Po"; else rm -f "$(DEPDIR)/video_osx.Tpo"; exit 1; fi