1.1 --- a/src/Makefile.in Sat Nov 17 06:04:19 2007 +0000
1.2 +++ b/src/Makefile.in Mon Nov 19 08:46:30 2007 +0000
1.5 @CDROM_LINUX_TRUE@am__append_2 = drivers/cd_linux.c
1.6 @CDROM_LINUX_FALSE@am__append_3 = drivers/cd_none.c
1.7 +@AUDIO_ESOUND_TRUE@am__append_4 = drivers/audio_esd.c
1.9 AMDEP_FALSE = @AMDEP_FALSE@
1.10 AMDEP_TRUE = @AMDEP_TRUE@
1.14 ARMOBJCOPY = @ARMOBJCOPY@
1.15 +AUDIO_ESOUND_FALSE = @AUDIO_ESOUND_FALSE@
1.16 +AUDIO_ESOUND_TRUE = @AUDIO_ESOUND_TRUE@
1.17 AUTOCONF = @AUTOCONF@
1.18 AUTOHEADER = @AUTOHEADER@
1.19 AUTOMAKE = @AUTOMAKE@
1.24 +ESOUND_CFLAGS = @ESOUND_CFLAGS@
1.25 +ESOUND_LIBS = @ESOUND_LIBS@
1.27 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
1.28 GMOFILES = @GMOFILES@
1.30 -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
1.31 -DPACKAGE_CONF_DIR=\""$(sysconfdir)"\" \
1.34 + @PACKAGE_CFLAGS@ @ESOUND_CFLAGS@
1.37 bin_PROGRAMS = lxdream
1.38 @@ -203,14 +208,14 @@
1.39 gui/ctrl_dlg.c gui/path_dlg.c gui/gdrom_menu.c \
1.40 loader.c bootstrap.c util.c \
1.41 display.c display.h \
1.42 - drivers/audio_null.c drivers/audio_esd.c \
1.43 + drivers/audio_null.c \
1.44 drivers/video_null.c drivers/video_gtk.c drivers/video_gtk.h \
1.45 drivers/video_x11.c drivers/video_x11.h \
1.46 drivers/gl_common.c drivers/gl_common.h drivers/gl_fbo.c \
1.47 drivers/gl_sl.c drivers/gl_slsrc.c\
1.48 -$(am__append_1) $(am__append_2) $(am__append_3)
1.49 +$(am__append_1) $(am__append_2) $(am__append_3) $(am__append_4)
1.51 -lxdream_LDADD = @PACKAGE_LIBS@ $(INTLLIBS) -lesd
1.52 +lxdream_LDADD = @PACKAGE_LIBS@ @ESOUND_LIBS@ $(INTLLIBS)
1.54 gendec_LDADD = @PACKAGE_LIBS@ $(INTLLIBS)
1.55 genglsl_LDADD = @PACKAGE_LIBS@ $(INTLLIBS)
1.56 @@ -267,18 +272,19 @@
1.57 gui/gtkcb.c gui/mmio_win.c gui/debug_win.c gui/dump_win.c \
1.58 gui/ctrl_dlg.c gui/path_dlg.c gui/gdrom_menu.c loader.c \
1.59 bootstrap.c util.c display.c display.h drivers/audio_null.c \
1.60 - drivers/audio_esd.c drivers/video_null.c drivers/video_gtk.c \
1.61 - drivers/video_gtk.h drivers/video_x11.c drivers/video_x11.h \
1.62 - drivers/gl_common.c drivers/gl_common.h drivers/gl_fbo.c \
1.63 - drivers/gl_sl.c drivers/gl_slsrc.c sh4/sh4x86.c sh4/sh4trans.c \
1.64 - sh4/sh4trans.h x86dasm/x86dasm.c x86dasm/x86dasm.h \
1.65 - x86dasm/i386-dis.c x86dasm/dis-init.c x86dasm/dis-buf.c \
1.66 - drivers/cd_linux.c drivers/cd_none.c
1.67 + drivers/video_null.c drivers/video_gtk.c drivers/video_gtk.h \
1.68 + drivers/video_x11.c drivers/video_x11.h drivers/gl_common.c \
1.69 + drivers/gl_common.h drivers/gl_fbo.c drivers/gl_sl.c \
1.70 + drivers/gl_slsrc.c sh4/sh4x86.c sh4/sh4trans.c sh4/sh4trans.h \
1.71 + x86dasm/x86dasm.c x86dasm/x86dasm.h x86dasm/i386-dis.c \
1.72 + x86dasm/dis-init.c x86dasm/dis-buf.c drivers/cd_linux.c \
1.73 + drivers/cd_none.c drivers/audio_esd.c
1.74 @BUILD_SH4X86_TRUE@am__objects_1 = sh4x86.$(OBJEXT) sh4trans.$(OBJEXT) \
1.75 @BUILD_SH4X86_TRUE@ x86dasm.$(OBJEXT) i386-dis.$(OBJEXT) \
1.76 @BUILD_SH4X86_TRUE@ dis-init.$(OBJEXT) dis-buf.$(OBJEXT)
1.77 @CDROM_LINUX_TRUE@am__objects_2 = cd_linux.$(OBJEXT)
1.78 @CDROM_LINUX_FALSE@am__objects_3 = cd_none.$(OBJEXT)
1.79 +@AUDIO_ESOUND_TRUE@am__objects_4 = audio_esd.$(OBJEXT)
1.80 am_lxdream_OBJECTS = main.$(OBJEXT) config.$(OBJEXT) mem.$(OBJEXT) \
1.81 watch.$(OBJEXT) asic.$(OBJEXT) syscall.$(OBJEXT) bios.$(OBJEXT) \
1.82 dcload.$(OBJEXT) ide.$(OBJEXT) gdimage.$(OBJEXT) \
1.83 @@ -297,10 +303,10 @@
1.84 dump_win.$(OBJEXT) ctrl_dlg.$(OBJEXT) path_dlg.$(OBJEXT) \
1.85 gdrom_menu.$(OBJEXT) loader.$(OBJEXT) bootstrap.$(OBJEXT) \
1.86 util.$(OBJEXT) display.$(OBJEXT) audio_null.$(OBJEXT) \
1.87 - audio_esd.$(OBJEXT) video_null.$(OBJEXT) video_gtk.$(OBJEXT) \
1.88 - video_x11.$(OBJEXT) gl_common.$(OBJEXT) gl_fbo.$(OBJEXT) \
1.89 - gl_sl.$(OBJEXT) gl_slsrc.$(OBJEXT) $(am__objects_1) \
1.90 - $(am__objects_2) $(am__objects_3)
1.91 + video_null.$(OBJEXT) video_gtk.$(OBJEXT) video_x11.$(OBJEXT) \
1.92 + gl_common.$(OBJEXT) gl_fbo.$(OBJEXT) gl_sl.$(OBJEXT) \
1.93 + gl_slsrc.$(OBJEXT) $(am__objects_1) $(am__objects_2) \
1.94 + $(am__objects_3) $(am__objects_4)
1.95 lxdream_OBJECTS = $(am_lxdream_OBJECTS)
1.96 lxdream_DEPENDENCIES =
1.98 @@ -1595,28 +1601,6 @@
1.99 @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1.100 @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o audio_null.obj `if test -f 'drivers/audio_null.c'; then $(CYGPATH_W) 'drivers/audio_null.c'; else $(CYGPATH_W) '$(srcdir)/drivers/audio_null.c'; fi`
1.102 -audio_esd.o: drivers/audio_esd.c
1.103 -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT audio_esd.o -MD -MP -MF "$(DEPDIR)/audio_esd.Tpo" \
1.104 -@am__fastdepCC_TRUE@ -c -o audio_esd.o `test -f 'drivers/audio_esd.c' || echo '$(srcdir)/'`drivers/audio_esd.c; \
1.105 -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/audio_esd.Tpo" "$(DEPDIR)/audio_esd.Po"; \
1.106 -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/audio_esd.Tpo"; exit 1; \
1.107 -@am__fastdepCC_TRUE@ fi
1.108 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='drivers/audio_esd.c' object='audio_esd.o' libtool=no @AMDEPBACKSLASH@
1.109 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/audio_esd.Po' tmpdepfile='$(DEPDIR)/audio_esd.TPo' @AMDEPBACKSLASH@
1.110 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1.111 -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o audio_esd.o `test -f 'drivers/audio_esd.c' || echo '$(srcdir)/'`drivers/audio_esd.c
1.113 -audio_esd.obj: drivers/audio_esd.c
1.114 -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT audio_esd.obj -MD -MP -MF "$(DEPDIR)/audio_esd.Tpo" \
1.115 -@am__fastdepCC_TRUE@ -c -o audio_esd.obj `if test -f 'drivers/audio_esd.c'; then $(CYGPATH_W) 'drivers/audio_esd.c'; else $(CYGPATH_W) '$(srcdir)/drivers/audio_esd.c'; fi`; \
1.116 -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/audio_esd.Tpo" "$(DEPDIR)/audio_esd.Po"; \
1.117 -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/audio_esd.Tpo"; exit 1; \
1.118 -@am__fastdepCC_TRUE@ fi
1.119 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='drivers/audio_esd.c' object='audio_esd.obj' libtool=no @AMDEPBACKSLASH@
1.120 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/audio_esd.Po' tmpdepfile='$(DEPDIR)/audio_esd.TPo' @AMDEPBACKSLASH@
1.121 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1.122 -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o audio_esd.obj `if test -f 'drivers/audio_esd.c'; then $(CYGPATH_W) 'drivers/audio_esd.c'; else $(CYGPATH_W) '$(srcdir)/drivers/audio_esd.c'; fi`
1.124 video_null.o: drivers/video_null.c
1.125 @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT video_null.o -MD -MP -MF "$(DEPDIR)/video_null.Tpo" \
1.126 @am__fastdepCC_TRUE@ -c -o video_null.o `test -f 'drivers/video_null.c' || echo '$(srcdir)/'`drivers/video_null.c; \
1.127 @@ -1947,6 +1931,28 @@
1.128 @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1.129 @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cd_none.obj `if test -f 'drivers/cd_none.c'; then $(CYGPATH_W) 'drivers/cd_none.c'; else $(CYGPATH_W) '$(srcdir)/drivers/cd_none.c'; fi`
1.131 +audio_esd.o: drivers/audio_esd.c
1.132 +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT audio_esd.o -MD -MP -MF "$(DEPDIR)/audio_esd.Tpo" \
1.133 +@am__fastdepCC_TRUE@ -c -o audio_esd.o `test -f 'drivers/audio_esd.c' || echo '$(srcdir)/'`drivers/audio_esd.c; \
1.134 +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/audio_esd.Tpo" "$(DEPDIR)/audio_esd.Po"; \
1.135 +@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/audio_esd.Tpo"; exit 1; \
1.136 +@am__fastdepCC_TRUE@ fi
1.137 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='drivers/audio_esd.c' object='audio_esd.o' libtool=no @AMDEPBACKSLASH@
1.138 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/audio_esd.Po' tmpdepfile='$(DEPDIR)/audio_esd.TPo' @AMDEPBACKSLASH@
1.139 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1.140 +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o audio_esd.o `test -f 'drivers/audio_esd.c' || echo '$(srcdir)/'`drivers/audio_esd.c
1.142 +audio_esd.obj: drivers/audio_esd.c
1.143 +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT audio_esd.obj -MD -MP -MF "$(DEPDIR)/audio_esd.Tpo" \
1.144 +@am__fastdepCC_TRUE@ -c -o audio_esd.obj `if test -f 'drivers/audio_esd.c'; then $(CYGPATH_W) 'drivers/audio_esd.c'; else $(CYGPATH_W) '$(srcdir)/drivers/audio_esd.c'; fi`; \
1.145 +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/audio_esd.Tpo" "$(DEPDIR)/audio_esd.Po"; \
1.146 +@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/audio_esd.Tpo"; exit 1; \
1.147 +@am__fastdepCC_TRUE@ fi
1.148 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='drivers/audio_esd.c' object='audio_esd.obj' libtool=no @AMDEPBACKSLASH@
1.149 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/audio_esd.Po' tmpdepfile='$(DEPDIR)/audio_esd.TPo' @AMDEPBACKSLASH@
1.150 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1.151 +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o audio_esd.obj `if test -f 'drivers/audio_esd.c'; then $(CYGPATH_W) 'drivers/audio_esd.c'; else $(CYGPATH_W) '$(srcdir)/drivers/audio_esd.c'; fi`
1.153 testsh4x86.o: test/testsh4x86.c
1.154 @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsh4x86.o -MD -MP -MF "$(DEPDIR)/testsh4x86.Tpo" \
1.155 @am__fastdepCC_TRUE@ -c -o testsh4x86.o `test -f 'test/testsh4x86.c' || echo '$(srcdir)/'`test/testsh4x86.c; \
lxdream 0.9.1