1.1 --- a/src/Makefile.in	Thu Jun 19 04:40:37 2008 +0000
     1.2 +++ b/src/Makefile.in	Sun Jun 22 04:01:27 2008 +0000
     1.3 @@ -58,12 +58,13 @@
     1.4  @VIDEO_OSMESA_TRUE@am__append_5 = drivers/video_gdk.c drivers/video_gdk.h 
     1.5  @VIDEO_GLX_TRUE@am__append_6 = drivers/video_glx.c drivers/video_glx.h
     1.6  @VIDEO_NSGL_TRUE@am__append_7 = drivers/video_nsgl.c drivers/video_nsgl.h
     1.7 -@AUDIO_PULSE_TRUE@am__append_8 = drivers/audio_pulse.c
     1.8 -@AUDIO_ESOUND_TRUE@am__append_9 = drivers/audio_esd.c
     1.9 -@AUDIO_ALSA_TRUE@am__append_10 = drivers/audio_alsa.c
    1.10 -@CDROM_LINUX_TRUE@am__append_11 = drivers/cd_linux.c
    1.11 -@CDROM_LINUX_FALSE@am__append_12 = drivers/cd_none.c
    1.12 -@JOY_LINUX_TRUE@am__append_13 = drivers/joy_linux.c
    1.13 +@AUDIO_OSX_TRUE@am__append_8 = drivers/audio_osx.c
    1.14 +@AUDIO_PULSE_TRUE@am__append_9 = drivers/audio_pulse.c
    1.15 +@AUDIO_ESOUND_TRUE@am__append_10 = drivers/audio_esd.c
    1.16 +@AUDIO_ALSA_TRUE@am__append_11 = drivers/audio_alsa.c
    1.17 +@CDROM_LINUX_TRUE@am__append_12 = drivers/cd_linux.c
    1.18 +@CDROM_LINUX_FALSE@am__append_13 = drivers/cd_none.c
    1.19 +@JOY_LINUX_TRUE@am__append_14 = drivers/joy_linux.c
    1.20  subdir = src
    1.21  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
    1.22  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    1.23 @@ -117,9 +118,9 @@
    1.24  	cocoaui/cocoa_win.c cocoaui/cocoa_gd.c drivers/video_osx.c \
    1.25  	drivers/mac_keymap.h drivers/video_gdk.c drivers/video_gdk.h \
    1.26  	drivers/video_glx.c drivers/video_glx.h drivers/video_nsgl.c \
    1.27 -	drivers/video_nsgl.h drivers/audio_pulse.c drivers/audio_esd.c \
    1.28 -	drivers/audio_alsa.c drivers/cd_linux.c drivers/cd_none.c \
    1.29 -	drivers/joy_linux.c
    1.30 +	drivers/video_nsgl.h drivers/audio_osx.c drivers/audio_pulse.c \
    1.31 +	drivers/audio_esd.c drivers/audio_alsa.c drivers/cd_linux.c \
    1.32 +	drivers/cd_none.c drivers/joy_linux.c
    1.33  @BUILD_SH4X86_TRUE@am__objects_1 = sh4x86.$(OBJEXT) sh4trans.$(OBJEXT) \
    1.34  @BUILD_SH4X86_TRUE@	x86dasm.$(OBJEXT) i386-dis.$(OBJEXT) \
    1.35  @BUILD_SH4X86_TRUE@	dis-init.$(OBJEXT) dis-buf.$(OBJEXT)
    1.36 @@ -133,12 +134,13 @@
    1.37  @VIDEO_OSMESA_TRUE@am__objects_4 = video_gdk.$(OBJEXT)
    1.38  @VIDEO_GLX_TRUE@am__objects_5 = video_glx.$(OBJEXT)
    1.39  @VIDEO_NSGL_TRUE@am__objects_6 = video_nsgl.$(OBJEXT)
    1.40 -@AUDIO_PULSE_TRUE@am__objects_7 = audio_pulse.$(OBJEXT)
    1.41 -@AUDIO_ESOUND_TRUE@am__objects_8 = audio_esd.$(OBJEXT)
    1.42 -@AUDIO_ALSA_TRUE@am__objects_9 = audio_alsa.$(OBJEXT)
    1.43 -@CDROM_LINUX_TRUE@am__objects_10 = cd_linux.$(OBJEXT)
    1.44 -@CDROM_LINUX_FALSE@am__objects_11 = cd_none.$(OBJEXT)
    1.45 -@JOY_LINUX_TRUE@am__objects_12 = joy_linux.$(OBJEXT)
    1.46 +@AUDIO_OSX_TRUE@am__objects_7 = audio_osx.$(OBJEXT)
    1.47 +@AUDIO_PULSE_TRUE@am__objects_8 = audio_pulse.$(OBJEXT)
    1.48 +@AUDIO_ESOUND_TRUE@am__objects_9 = audio_esd.$(OBJEXT)
    1.49 +@AUDIO_ALSA_TRUE@am__objects_10 = audio_alsa.$(OBJEXT)
    1.50 +@CDROM_LINUX_TRUE@am__objects_11 = cd_linux.$(OBJEXT)
    1.51 +@CDROM_LINUX_FALSE@am__objects_12 = cd_none.$(OBJEXT)
    1.52 +@JOY_LINUX_TRUE@am__objects_13 = joy_linux.$(OBJEXT)
    1.53  am_lxdream_OBJECTS = main.$(OBJEXT) config.$(OBJEXT) mem.$(OBJEXT) \
    1.54  	watch.$(OBJEXT) asic.$(OBJEXT) syscall.$(OBJEXT) \
    1.55  	bios.$(OBJEXT) dcload.$(OBJEXT) ide.$(OBJEXT) \
    1.56 @@ -161,7 +163,7 @@
    1.57  	$(am__objects_2) $(am__objects_3) $(am__objects_4) \
    1.58  	$(am__objects_5) $(am__objects_6) $(am__objects_7) \
    1.59  	$(am__objects_8) $(am__objects_9) $(am__objects_10) \
    1.60 -	$(am__objects_11) $(am__objects_12)
    1.61 +	$(am__objects_11) $(am__objects_12) $(am__objects_13)
    1.62  lxdream_OBJECTS = $(am_lxdream_OBJECTS)
    1.63  lxdream_DEPENDENCIES = $(am__DEPENDENCIES_1)
    1.64  am__test_testsh4x86_SOURCES_DIST = test/testsh4x86.c x86dasm/x86dasm.c \
    1.65 @@ -208,6 +210,8 @@
    1.66  AUDIO_ALSA_TRUE = @AUDIO_ALSA_TRUE@
    1.67  AUDIO_ESOUND_FALSE = @AUDIO_ESOUND_FALSE@
    1.68  AUDIO_ESOUND_TRUE = @AUDIO_ESOUND_TRUE@
    1.69 +AUDIO_OSX_FALSE = @AUDIO_OSX_FALSE@
    1.70 +AUDIO_OSX_TRUE = @AUDIO_OSX_TRUE@
    1.71  AUDIO_PULSE_FALSE = @AUDIO_PULSE_FALSE@
    1.72  AUDIO_PULSE_TRUE = @AUDIO_PULSE_TRUE@
    1.73  AUTOCONF = @AUTOCONF@
    1.74 @@ -387,7 +391,7 @@
    1.75  	$(am__append_4) $(am__append_5) $(am__append_6) \
    1.76  	$(am__append_7) $(am__append_8) $(am__append_9) \
    1.77  	$(am__append_10) $(am__append_11) $(am__append_12) \
    1.78 -	$(am__append_13)
    1.79 +	$(am__append_13) $(am__append_14)
    1.80  @BUILD_SH4X86_TRUE@test_testsh4x86_LDADD = @GLIB_LIBS@ @GTK_LIBS@ @LIBPNG_LIBS@
    1.81  @BUILD_SH4X86_TRUE@test_testsh4x86_SOURCES = test/testsh4x86.c x86dasm/x86dasm.c \
    1.82  @BUILD_SH4X86_TRUE@	x86dasm/x86dasm.h x86dasm/i386-dis.c x86dasm/dis-init.c \
    1.83 @@ -497,6 +501,7 @@
    1.84  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_alsa.Po@am__quote@
    1.85  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_esd.Po@am__quote@
    1.86  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_null.Po@am__quote@
    1.87 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_osx.Po@am__quote@
    1.88  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_pulse.Po@am__quote@
    1.89  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bios.Po@am__quote@
    1.90  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bootstrap.Po@am__quote@
    1.91 @@ -1590,6 +1595,20 @@
    1.92  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1.93  @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o video_nsgl.obj `if test -f 'drivers/video_nsgl.c'; then $(CYGPATH_W) 'drivers/video_nsgl.c'; else $(CYGPATH_W) '$(srcdir)/drivers/video_nsgl.c'; fi`
    1.94  
    1.95 +audio_osx.o: drivers/audio_osx.c
    1.96 +@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT audio_osx.o -MD -MP -MF "$(DEPDIR)/audio_osx.Tpo" -c -o audio_osx.o `test -f 'drivers/audio_osx.c' || echo '$(srcdir)/'`drivers/audio_osx.c; \
    1.97 +@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/audio_osx.Tpo" "$(DEPDIR)/audio_osx.Po"; else rm -f "$(DEPDIR)/audio_osx.Tpo"; exit 1; fi
    1.98 +@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='drivers/audio_osx.c' object='audio_osx.o' libtool=no @AMDEPBACKSLASH@
    1.99 +@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
   1.100 +@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o audio_osx.o `test -f 'drivers/audio_osx.c' || echo '$(srcdir)/'`drivers/audio_osx.c
   1.101 +
   1.102 +audio_osx.obj: drivers/audio_osx.c
   1.103 +@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT audio_osx.obj -MD -MP -MF "$(DEPDIR)/audio_osx.Tpo" -c -o audio_osx.obj `if test -f 'drivers/audio_osx.c'; then $(CYGPATH_W) 'drivers/audio_osx.c'; else $(CYGPATH_W) '$(srcdir)/drivers/audio_osx.c'; fi`; \
   1.104 +@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/audio_osx.Tpo" "$(DEPDIR)/audio_osx.Po"; else rm -f "$(DEPDIR)/audio_osx.Tpo"; exit 1; fi
   1.105 +@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='drivers/audio_osx.c' object='audio_osx.obj' libtool=no @AMDEPBACKSLASH@
   1.106 +@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
   1.107 +@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o audio_osx.obj `if test -f 'drivers/audio_osx.c'; then $(CYGPATH_W) 'drivers/audio_osx.c'; else $(CYGPATH_W) '$(srcdir)/drivers/audio_osx.c'; fi`
   1.108 +
   1.109  audio_pulse.o: drivers/audio_pulse.c
   1.110  @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT audio_pulse.o -MD -MP -MF "$(DEPDIR)/audio_pulse.Tpo" -c -o audio_pulse.o `test -f 'drivers/audio_pulse.c' || echo '$(srcdir)/'`drivers/audio_pulse.c; \
   1.111  @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/audio_pulse.Tpo" "$(DEPDIR)/audio_pulse.Po"; else rm -f "$(DEPDIR)/audio_pulse.Tpo"; exit 1; fi