1.1 --- a/src/Makefile.in Wed Feb 25 09:00:05 2009 +0000
1.2 +++ b/src/Makefile.in Sat Feb 28 06:26:48 2009 +0000
1.4 @VIDEO_GLX_TRUE@am__append_7 = drivers/video_glx.c drivers/video_glx.h
1.5 @VIDEO_NSGL_TRUE@am__append_8 = drivers/video_nsgl.m drivers/video_nsgl.h
1.6 @AUDIO_OSX_TRUE@am__append_9 = drivers/audio_osx.m
1.7 -@AUDIO_PULSE_TRUE@am__append_10 = drivers/audio_pulse.c
1.8 -@AUDIO_ESOUND_TRUE@am__append_11 = drivers/audio_esd.c
1.9 -@AUDIO_ALSA_TRUE@am__append_12 = drivers/audio_alsa.c
1.10 -@CDROM_LINUX_TRUE@am__append_13 = drivers/cd_linux.c
1.11 -@CDROM_OSX_TRUE@am__append_14 = drivers/cd_osx.c drivers/osx_iokit.m drivers/osx_iokit.h
1.12 -@CDROM_NONE_TRUE@am__append_15 = drivers/cd_none.c
1.13 -@JOY_LINUX_TRUE@am__append_16 = drivers/joy_linux.c drivers/joy_linux.h
1.14 +@AUDIO_SDL_TRUE@am__append_10 = drivers/audio_sdl.c
1.15 +@AUDIO_PULSE_TRUE@am__append_11 = drivers/audio_pulse.c
1.16 +@AUDIO_ESOUND_TRUE@am__append_12 = drivers/audio_esd.c
1.17 +@AUDIO_ALSA_TRUE@am__append_13 = drivers/audio_alsa.c
1.18 +@CDROM_LINUX_TRUE@am__append_14 = drivers/cd_linux.c
1.19 +@CDROM_OSX_TRUE@am__append_15 = drivers/cd_osx.c drivers/osx_iokit.m drivers/osx_iokit.h
1.20 +@CDROM_NONE_TRUE@am__append_16 = drivers/cd_none.c
1.21 +@JOY_LINUX_TRUE@am__append_17 = drivers/joy_linux.c drivers/joy_linux.h
1.23 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
1.24 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
1.25 @@ -135,10 +136,11 @@
1.26 drivers/video_osx.m drivers/mac_keymap.h \
1.27 drivers/mac_keymap.txt paths_unix.c drivers/video_gdk.c \
1.28 drivers/video_glx.c drivers/video_glx.h drivers/video_nsgl.m \
1.29 - drivers/video_nsgl.h drivers/audio_osx.m drivers/audio_pulse.c \
1.30 - drivers/audio_esd.c drivers/audio_alsa.c drivers/cd_linux.c \
1.31 - drivers/cd_osx.c drivers/osx_iokit.m drivers/osx_iokit.h \
1.32 - drivers/cd_none.c drivers/joy_linux.c drivers/joy_linux.h
1.33 + drivers/video_nsgl.h drivers/audio_osx.m drivers/audio_sdl.c \
1.34 + drivers/audio_pulse.c drivers/audio_esd.c drivers/audio_alsa.c \
1.35 + drivers/cd_linux.c drivers/cd_osx.c drivers/osx_iokit.m \
1.36 + drivers/osx_iokit.h drivers/cd_none.c drivers/joy_linux.c \
1.37 + drivers/joy_linux.h
1.38 @BUILD_SH4X86_TRUE@am__objects_1 = sh4x86.$(OBJEXT) sh4trans.$(OBJEXT) \
1.39 @BUILD_SH4X86_TRUE@ mmux86.$(OBJEXT) x86dasm.$(OBJEXT) \
1.40 @BUILD_SH4X86_TRUE@ i386-dis.$(OBJEXT) dis-init.$(OBJEXT) \
1.41 @@ -157,13 +159,14 @@
1.42 @VIDEO_GLX_TRUE@am__objects_6 = video_glx.$(OBJEXT)
1.43 @VIDEO_NSGL_TRUE@am__objects_7 = video_nsgl.$(OBJEXT)
1.44 @AUDIO_OSX_TRUE@am__objects_8 = audio_osx.$(OBJEXT)
1.45 -@AUDIO_PULSE_TRUE@am__objects_9 = audio_pulse.$(OBJEXT)
1.46 -@AUDIO_ESOUND_TRUE@am__objects_10 = audio_esd.$(OBJEXT)
1.47 -@AUDIO_ALSA_TRUE@am__objects_11 = audio_alsa.$(OBJEXT)
1.48 -@CDROM_LINUX_TRUE@am__objects_12 = cd_linux.$(OBJEXT)
1.49 -@CDROM_OSX_TRUE@am__objects_13 = cd_osx.$(OBJEXT) osx_iokit.$(OBJEXT)
1.50 -@CDROM_NONE_TRUE@am__objects_14 = cd_none.$(OBJEXT)
1.51 -@JOY_LINUX_TRUE@am__objects_15 = joy_linux.$(OBJEXT)
1.52 +@AUDIO_SDL_TRUE@am__objects_9 = audio_sdl.$(OBJEXT)
1.53 +@AUDIO_PULSE_TRUE@am__objects_10 = audio_pulse.$(OBJEXT)
1.54 +@AUDIO_ESOUND_TRUE@am__objects_11 = audio_esd.$(OBJEXT)
1.55 +@AUDIO_ALSA_TRUE@am__objects_12 = audio_alsa.$(OBJEXT)
1.56 +@CDROM_LINUX_TRUE@am__objects_13 = cd_linux.$(OBJEXT)
1.57 +@CDROM_OSX_TRUE@am__objects_14 = cd_osx.$(OBJEXT) osx_iokit.$(OBJEXT)
1.58 +@CDROM_NONE_TRUE@am__objects_15 = cd_none.$(OBJEXT)
1.59 +@JOY_LINUX_TRUE@am__objects_16 = joy_linux.$(OBJEXT)
1.60 am_lxdream_OBJECTS = main.$(OBJEXT) version.$(OBJEXT) config.$(OBJEXT) \
1.61 mem.$(OBJEXT) sdram.$(OBJEXT) watch.$(OBJEXT) asic.$(OBJEXT) \
1.62 syscall.$(OBJEXT) bios.$(OBJEXT) dcload.$(OBJEXT) \
1.64 $(am__objects_6) $(am__objects_7) $(am__objects_8) \
1.65 $(am__objects_9) $(am__objects_10) $(am__objects_11) \
1.66 $(am__objects_12) $(am__objects_13) $(am__objects_14) \
1.68 + $(am__objects_15) $(am__objects_16)
1.69 lxdream_OBJECTS = $(am_lxdream_OBJECTS)
1.70 lxdream_DEPENDENCIES = $(am__DEPENDENCIES_1)
1.71 am__test_testsh4x86_SOURCES_DIST = test/testsh4x86.c x86dasm/x86dasm.c \
1.73 AUDIO_OSX_TRUE = @AUDIO_OSX_TRUE@
1.74 AUDIO_PULSE_FALSE = @AUDIO_PULSE_FALSE@
1.75 AUDIO_PULSE_TRUE = @AUDIO_PULSE_TRUE@
1.76 +AUDIO_SDL_FALSE = @AUDIO_SDL_FALSE@
1.77 +AUDIO_SDL_TRUE = @AUDIO_SDL_TRUE@
1.78 AUTOCONF = @AUTOCONF@
1.79 AUTOHEADER = @AUTOHEADER@
1.80 AUTOMAKE = @AUTOMAKE@
1.82 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
1.83 PULSE_CFLAGS = @PULSE_CFLAGS@
1.84 PULSE_LIBS = @PULSE_LIBS@
1.85 +SDL_CFLAGS = @SDL_CFLAGS@
1.86 +SDL_LIBS = @SDL_LIBS@
1.88 SET_MAKE = @SET_MAKE@
1.91 -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
1.92 -DPACKAGE_CONF_DIR=\""$(sysconfdir)"\" \
1.94 - @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBPNG_CFLAGS@ @PULSE_CFLAGS@ @ESOUND_CFLAGS@ @ALSA_CFLAGS@
1.95 + @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBPNG_CFLAGS@ @PULSE_CFLAGS@ @ESOUND_CFLAGS@ @ALSA_CFLAGS@ @SDL_CFLAGS@
1.97 EXTRA_DIST = drivers/genkeymap.pl checkver.pl
1.98 AM_CFLAGS = -D__EXTENSIONS__ -D_BSD_SOURCE -D_GNU_SOURCE
1.100 $(am__append_6) $(am__append_7) $(am__append_8) \
1.101 $(am__append_9) $(am__append_10) $(am__append_11) \
1.102 $(am__append_12) $(am__append_13) $(am__append_14) \
1.103 - $(am__append_15) $(am__append_16)
1.104 + $(am__append_15) $(am__append_16) $(am__append_17)
1.105 @BUILD_SH4X86_TRUE@test_testsh4x86_LDADD = @GLIB_LIBS@ @GTK_LIBS@ @LIBPNG_LIBS@
1.106 @BUILD_SH4X86_TRUE@test_testsh4x86_SOURCES = test/testsh4x86.c x86dasm/x86dasm.c \
1.107 @BUILD_SH4X86_TRUE@ x86dasm/x86dasm.h x86dasm/i386-dis.c x86dasm/dis-init.c \
1.108 @@ -457,7 +464,7 @@
1.109 @BUILD_SH4X86_TRUE@ sh4/sh4trans.c sh4/sh4x86.c sh4/xltcache.c \
1.110 @BUILD_SH4X86_TRUE@ sh4/xltcache.h mem.c util.c
1.112 -lxdream_LDADD = @GLIB_LIBS@ @GTK_LIBS@ @LIBPNG_LIBS@ @PULSE_LIBS@ @ESOUND_LIBS@ @ALSA_LIBS@ $(INTLLIBS)
1.113 +lxdream_LDADD = @GLIB_LIBS@ @GTK_LIBS@ @LIBPNG_LIBS@ @PULSE_LIBS@ @ESOUND_LIBS@ @ALSA_LIBS@ @SDL_LIBS@ $(INTLLIBS)
1.114 gendec_LDADD = @GLIB_LIBS@ @GTK_LIBS@ $(INTLLIBS)
1.115 genglsl_LDADD = @GLIB_LIBS@ @GTK_LIBS@ $(INTLLIBS)
1.116 test_testxlt_SOURCES = test/testxlt.c sh4/xltcache.c sh4/xltcache.h
1.117 @@ -561,6 +568,7 @@
1.118 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_null.Po@am__quote@
1.119 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_osx.Po@am__quote@
1.120 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_pulse.Po@am__quote@
1.121 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_sdl.Po@am__quote@
1.122 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bios.Po@am__quote@
1.123 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bootstrap.Po@am__quote@
1.124 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cache.Po@am__quote@
1.125 @@ -1667,6 +1675,20 @@
1.126 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1.127 @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o video_glx.obj `if test -f 'drivers/video_glx.c'; then $(CYGPATH_W) 'drivers/video_glx.c'; else $(CYGPATH_W) '$(srcdir)/drivers/video_glx.c'; fi`
1.129 +audio_sdl.o: drivers/audio_sdl.c
1.130 +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT audio_sdl.o -MD -MP -MF "$(DEPDIR)/audio_sdl.Tpo" -c -o audio_sdl.o `test -f 'drivers/audio_sdl.c' || echo '$(srcdir)/'`drivers/audio_sdl.c; \
1.131 +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/audio_sdl.Tpo" "$(DEPDIR)/audio_sdl.Po"; else rm -f "$(DEPDIR)/audio_sdl.Tpo"; exit 1; fi
1.132 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='drivers/audio_sdl.c' object='audio_sdl.o' libtool=no @AMDEPBACKSLASH@
1.133 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1.134 +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o audio_sdl.o `test -f 'drivers/audio_sdl.c' || echo '$(srcdir)/'`drivers/audio_sdl.c
1.136 +audio_sdl.obj: drivers/audio_sdl.c
1.137 +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT audio_sdl.obj -MD -MP -MF "$(DEPDIR)/audio_sdl.Tpo" -c -o audio_sdl.obj `if test -f 'drivers/audio_sdl.c'; then $(CYGPATH_W) 'drivers/audio_sdl.c'; else $(CYGPATH_W) '$(srcdir)/drivers/audio_sdl.c'; fi`; \
1.138 +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/audio_sdl.Tpo" "$(DEPDIR)/audio_sdl.Po"; else rm -f "$(DEPDIR)/audio_sdl.Tpo"; exit 1; fi
1.139 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='drivers/audio_sdl.c' object='audio_sdl.obj' libtool=no @AMDEPBACKSLASH@
1.140 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1.141 +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o audio_sdl.obj `if test -f 'drivers/audio_sdl.c'; then $(CYGPATH_W) 'drivers/audio_sdl.c'; else $(CYGPATH_W) '$(srcdir)/drivers/audio_sdl.c'; fi`
1.143 audio_pulse.o: drivers/audio_pulse.c
1.144 @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.145 @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/audio_pulse.Tpo" "$(DEPDIR)/audio_pulse.Po"; else rm -f "$(DEPDIR)/audio_pulse.Tpo"; exit 1; fi