--- a/src/Makefile.in Sun Jul 06 03:18:55 2008 +0000 +++ b/src/Makefile.in Tue Jul 08 12:29:53 2008 +0000 @@ -43,20 +43,22 @@ @BUILD_SH4X86_TRUE@ sh4/ia32abi.h sh4/ia32mac.h sh4/ia64abi.h \ @BUILD_SH4X86_TRUE@ sh4/sh4trans.c sh4/sh4trans.h \ @BUILD_SH4X86_TRUE@ x86dasm/x86dasm.c x86dasm/x86dasm.h \ -@BUILD_SH4X86_TRUE@ x86dasm/i386-dis.c x86dasm/dis-init.c x86dasm/dis-buf.c +@BUILD_SH4X86_TRUE@ x86dasm/i386-dis.c x86dasm/dis-init.c x86dasm/dis-buf.c \ +@BUILD_SH4X86_TRUE@ x86dasm/ansidecl.h x86dasm/bfd.h x86dasm/config.h x86dasm/dis-asm.h \ +@BUILD_SH4X86_TRUE@ x86dasm/opintl.h x86dasm/symcat.h x86dasm/sysdep.h @BUILD_SH4X86_TRUE@am__append_2 = test/testsh4x86 @GUI_GTK_TRUE@am__append_3 = gtkui/gtkui.c gtkui/gtkui.h \ @GUI_GTK_TRUE@ gtkui/main_win.c gtkui/gtkcb.c \ @GUI_GTK_TRUE@ gtkui/mmio_win.c gtkui/debug_win.c gtkui/dump_win.c \ @GUI_GTK_TRUE@ gtkui/ctrl_dlg.c gtkui/path_dlg.c gtkui/gdrom_menu.c \ -@GUI_GTK_TRUE@ drivers/video_gtk.c drivers/video_gtk.h +@GUI_GTK_TRUE@ drivers/video_gtk.c @GUI_COCOA_TRUE@am__append_4 = cocoaui/cocoaui.c cocoaui/cocoaui.h \ @GUI_COCOA_TRUE@ cocoaui/cocoa_win.c cocoaui/cocoa_gd.c cocoaui/cocoa_prefs.c \ -@GUI_COCOA_TRUE@ drivers/video_osx.c drivers/mac_keymap.h +@GUI_COCOA_TRUE@ drivers/video_osx.c drivers/mac_keymap.h drivers/mac_keymap.txt -@VIDEO_OSMESA_TRUE@am__append_5 = drivers/video_gdk.c drivers/video_gdk.h +@VIDEO_OSMESA_TRUE@am__append_5 = drivers/video_gdk.c @VIDEO_GLX_TRUE@am__append_6 = drivers/video_glx.c drivers/video_glx.h @VIDEO_NSGL_TRUE@am__append_7 = drivers/video_nsgl.c drivers/video_nsgl.h @AUDIO_OSX_TRUE@am__append_8 = drivers/audio_osx.c @@ -64,7 +66,7 @@ @AUDIO_ESOUND_TRUE@am__append_10 = drivers/audio_esd.c @AUDIO_ALSA_TRUE@am__append_11 = drivers/audio_alsa.c @CDROM_LINUX_TRUE@am__append_12 = drivers/cd_linux.c -@CDROM_OSX_TRUE@am__append_13 = drivers/cd_osx.c drivers/osx_iokit.c +@CDROM_OSX_TRUE@am__append_13 = drivers/cd_osx.c drivers/osx_iokit.c drivers/osx_iokit.h @CDROM_NONE_TRUE@am__append_14 = drivers/cd_none.c @JOY_LINUX_TRUE@am__append_15 = drivers/joy_linux.c subdir = src @@ -88,43 +90,49 @@ am_genglsl_OBJECTS = genglsl.$(OBJEXT) genglsl_OBJECTS = $(am_genglsl_OBJECTS) genglsl_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__lxdream_SOURCES_DIST = main.c config.c config.h mem.c mem.h mmio.h \ - watch.c asic.c asic.h syscall.c syscall.h bios.c dcload.c \ +am__lxdream_SOURCES_DIST = main.c config.c config.h lxdream.h dream.h \ + gui.h cpu.h hook.h mem.c mem.h mmio.h watch.c asic.c asic.h \ + clock.h serial.h syscall.c syscall.h bios.c dcload.c \ gdrom/ide.c gdrom/ide.h gdrom/packet.h gdrom/gdimage.c \ gdrom/gdrom.c gdrom/gdrom.h gdrom/nrg.c gdrom/cdi.c \ gdrom/gdi.c gdrom/edc_ecc.c gdrom/ecc.h gdrom/edc_crctable.h \ - gdrom/edc_encoder.h gdrom/edc_l2sq.h gdrom/scramble.h \ - gdrom/mmc.c dreamcast.c dreamcast.h eventq.c eventq.h \ - sh4/sh4.c sh4/intc.c sh4/intc.h sh4/sh4mem.c sh4/timer.c \ - sh4/dmac.c sh4/mmu.c sh4/sh4core.c sh4/sh4core.h sh4/sh4dasm.c \ - sh4/sh4dasm.h sh4/sh4mmio.c sh4/sh4mmio.h sh4/scif.c \ - sh4/sh4stat.c sh4/sh4stat.h sh4/xltcache.c sh4/xltcache.h \ - sh4/sh4.h aica/armcore.c aica/armcore.h aica/armdasm.c \ - aica/armmem.c aica/aica.c aica/aica.h aica/audio.c \ - aica/audio.h pvr2/pvr2.c pvr2/pvr2.h pvr2/pvr2mem.c \ - pvr2/tacore.c pvr2/rendsort.c pvr2/texcache.c pvr2/yuv.c \ - pvr2/rendsave.c pvr2/scene.c pvr2/scene.h pvr2/gl_sl.c \ - pvr2/gl_slsrc.c pvr2/glutil.c pvr2/glutil.h pvr2/glrender.c \ - maple/maple.c maple/maple.h maple/controller.c \ - maple/controller.h maple/kbd.c maple/mouse.c loader.c \ - bootstrap.c util.c gdlist.c gdlist.h display.c display.h \ - dckeysyms.h drivers/audio_null.c drivers/video_null.c \ - drivers/video_gl.c drivers/video_gl.h drivers/gl_fbo.c \ - sh4/sh4x86.c sh4/x86op.h sh4/ia32abi.h sh4/ia32mac.h \ - sh4/ia64abi.h sh4/sh4trans.c sh4/sh4trans.h x86dasm/x86dasm.c \ + gdrom/edc_encoder.h gdrom/edc_l2sq.h gdrom/edc_scramble.h \ + gdrom/mmc.c gdrom/gddriver.h dreamcast.c dreamcast.h eventq.c \ + eventq.h sh4/sh4.c sh4/intc.c sh4/intc.h sh4/sh4mem.c \ + sh4/timer.c sh4/dmac.c sh4/mmu.c sh4/sh4core.c sh4/sh4core.h \ + sh4/sh4dasm.c sh4/sh4dasm.h sh4/sh4mmio.c sh4/sh4mmio.h \ + sh4/scif.c sh4/sh4stat.c sh4/sh4stat.h sh4/xltcache.c \ + sh4/xltcache.h sh4/sh4.h sh4/dmac.h aica/armcore.c \ + aica/armcore.h aica/armdasm.c aica/armdasm.h aica/armmem.c \ + aica/aica.c aica/aica.h aica/audio.c aica/audio.h pvr2/pvr2.c \ + pvr2/pvr2.h pvr2/pvr2mem.c pvr2/pvr2mmio.h pvr2/tacore.c \ + pvr2/rendsort.c pvr2/texcache.c pvr2/yuv.c pvr2/rendsave.c \ + pvr2/scene.c pvr2/scene.h pvr2/gl_sl.c pvr2/gl_slsrc.c \ + pvr2/glutil.c pvr2/glutil.h pvr2/glrender.c pvr2/vertex.glsl \ + pvr2/fragment.glsl maple/maple.c maple/maple.h \ + maple/controller.c maple/controller.h maple/kbd.c \ + maple/mouse.c loader.c loader.h elf.h bootstrap.c bootstrap.h \ + util.c gdlist.c gdlist.h display.c display.h dckeysyms.h \ + drivers/audio_null.c drivers/video_null.c drivers/video_gl.c \ + drivers/video_gl.h drivers/gl_fbo.c sh4/sh4.def sh4/sh4core.in \ + sh4/sh4x86.in sh4/sh4dasm.in sh4/sh4stat.in sh4/sh4x86.c \ + sh4/x86op.h sh4/ia32abi.h sh4/ia32mac.h sh4/ia64abi.h \ + sh4/sh4trans.c sh4/sh4trans.h x86dasm/x86dasm.c \ x86dasm/x86dasm.h x86dasm/i386-dis.c x86dasm/dis-init.c \ - x86dasm/dis-buf.c gtkui/gtkui.c gtkui/gtkui.h gtkui/main_win.c \ - gtkui/gtkcb.c gtkui/mmio_win.c gtkui/debug_win.c \ - gtkui/dump_win.c gtkui/ctrl_dlg.c gtkui/path_dlg.c \ - gtkui/gdrom_menu.c drivers/video_gtk.c drivers/video_gtk.h \ + x86dasm/dis-buf.c x86dasm/ansidecl.h x86dasm/bfd.h \ + x86dasm/config.h x86dasm/dis-asm.h x86dasm/opintl.h \ + x86dasm/symcat.h x86dasm/sysdep.h gtkui/gtkui.c gtkui/gtkui.h \ + gtkui/main_win.c gtkui/gtkcb.c gtkui/mmio_win.c \ + gtkui/debug_win.c gtkui/dump_win.c gtkui/ctrl_dlg.c \ + gtkui/path_dlg.c gtkui/gdrom_menu.c drivers/video_gtk.c \ cocoaui/cocoaui.c cocoaui/cocoaui.h cocoaui/cocoa_win.c \ cocoaui/cocoa_gd.c cocoaui/cocoa_prefs.c drivers/video_osx.c \ - drivers/mac_keymap.h drivers/video_gdk.c drivers/video_gdk.h \ - drivers/video_glx.c drivers/video_glx.h drivers/video_nsgl.c \ - drivers/video_nsgl.h drivers/audio_osx.c drivers/audio_pulse.c \ - drivers/audio_esd.c drivers/audio_alsa.c drivers/cd_linux.c \ - drivers/cd_osx.c drivers/osx_iokit.c drivers/cd_none.c \ - drivers/joy_linux.c + drivers/mac_keymap.h drivers/mac_keymap.txt \ + drivers/video_gdk.c drivers/video_glx.c drivers/video_glx.h \ + drivers/video_nsgl.c drivers/video_nsgl.h drivers/audio_osx.c \ + drivers/audio_pulse.c drivers/audio_esd.c drivers/audio_alsa.c \ + drivers/cd_linux.c drivers/cd_osx.c drivers/osx_iokit.c \ + drivers/osx_iokit.h drivers/cd_none.c drivers/joy_linux.c @BUILD_SH4X86_TRUE@am__objects_1 = sh4x86.$(OBJEXT) sh4trans.$(OBJEXT) \ @BUILD_SH4X86_TRUE@ x86dasm.$(OBJEXT) i386-dis.$(OBJEXT) \ @BUILD_SH4X86_TRUE@ dis-init.$(OBJEXT) dis-buf.$(OBJEXT) @@ -374,38 +382,43 @@ -Ish4 \ @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBPNG_CFLAGS@ @PULSE_CFLAGS@ @ESOUND_CFLAGS@ @ALSA_CFLAGS@ +EXTRA_DIST = drivers/genkeymap.pl AM_CFLAGS = -D_ISOC99_SOURCE -D_BSD_SOURCE TESTS = test/testxlt BUILT_SOURCES = sh4/sh4core.c sh4/sh4dasm.c sh4/sh4x86.c pvr2/gl_slsrc.c drivers/mac_keymap.h gendec_SOURCES = tools/gendec.c tools/gendec.h tools/insparse.c tools/actparse.c genglsl_SOURCES = tools/genglsl.c -lxdream_SOURCES = main.c config.c config.h mem.c mem.h mmio.h watch.c \ - asic.c asic.h syscall.c syscall.h bios.c dcload.c gdrom/ide.c \ +lxdream_SOURCES = main.c config.c config.h lxdream.h dream.h gui.h \ + cpu.h hook.h mem.c mem.h mmio.h watch.c asic.c asic.h clock.h \ + serial.h syscall.c syscall.h bios.c dcload.c gdrom/ide.c \ gdrom/ide.h gdrom/packet.h gdrom/gdimage.c gdrom/gdrom.c \ gdrom/gdrom.h gdrom/nrg.c gdrom/cdi.c gdrom/gdi.c \ gdrom/edc_ecc.c gdrom/ecc.h gdrom/edc_crctable.h \ - gdrom/edc_encoder.h gdrom/edc_l2sq.h gdrom/scramble.h \ - gdrom/mmc.c dreamcast.c dreamcast.h eventq.c eventq.h \ - sh4/sh4.c sh4/intc.c sh4/intc.h sh4/sh4mem.c sh4/timer.c \ - sh4/dmac.c sh4/mmu.c sh4/sh4core.c sh4/sh4core.h sh4/sh4dasm.c \ - sh4/sh4dasm.h sh4/sh4mmio.c sh4/sh4mmio.h sh4/scif.c \ - sh4/sh4stat.c sh4/sh4stat.h sh4/xltcache.c sh4/xltcache.h \ - sh4/sh4.h aica/armcore.c aica/armcore.h aica/armdasm.c \ - aica/armmem.c aica/aica.c aica/aica.h aica/audio.c \ - aica/audio.h pvr2/pvr2.c pvr2/pvr2.h pvr2/pvr2mem.c \ - pvr2/tacore.c pvr2/rendsort.c pvr2/texcache.c pvr2/yuv.c \ - pvr2/rendsave.c pvr2/scene.c pvr2/scene.h pvr2/gl_sl.c \ - pvr2/gl_slsrc.c pvr2/glutil.c pvr2/glutil.h pvr2/glrender.c \ - maple/maple.c maple/maple.h maple/controller.c \ - maple/controller.h maple/kbd.c maple/mouse.c loader.c \ - bootstrap.c util.c gdlist.c gdlist.h display.c display.h \ - dckeysyms.h drivers/audio_null.c drivers/video_null.c \ - drivers/video_gl.c drivers/video_gl.h drivers/gl_fbo.c \ - $(am__append_1) $(am__append_3) $(am__append_4) \ - $(am__append_5) $(am__append_6) $(am__append_7) \ - $(am__append_8) $(am__append_9) $(am__append_10) \ - $(am__append_11) $(am__append_12) $(am__append_13) \ - $(am__append_14) $(am__append_15) + gdrom/edc_encoder.h gdrom/edc_l2sq.h gdrom/edc_scramble.h \ + gdrom/mmc.c gdrom/gddriver.h dreamcast.c dreamcast.h eventq.c \ + eventq.h sh4/sh4.c sh4/intc.c sh4/intc.h sh4/sh4mem.c \ + sh4/timer.c sh4/dmac.c sh4/mmu.c sh4/sh4core.c sh4/sh4core.h \ + sh4/sh4dasm.c sh4/sh4dasm.h sh4/sh4mmio.c sh4/sh4mmio.h \ + sh4/scif.c sh4/sh4stat.c sh4/sh4stat.h sh4/xltcache.c \ + sh4/xltcache.h sh4/sh4.h sh4/dmac.h aica/armcore.c \ + aica/armcore.h aica/armdasm.c aica/armdasm.h aica/armmem.c \ + aica/aica.c aica/aica.h aica/audio.c aica/audio.h pvr2/pvr2.c \ + pvr2/pvr2.h pvr2/pvr2mem.c pvr2/pvr2mmio.h pvr2/tacore.c \ + pvr2/rendsort.c pvr2/texcache.c pvr2/yuv.c pvr2/rendsave.c \ + pvr2/scene.c pvr2/scene.h pvr2/gl_sl.c pvr2/gl_slsrc.c \ + pvr2/glutil.c pvr2/glutil.h pvr2/glrender.c pvr2/vertex.glsl \ + pvr2/fragment.glsl maple/maple.c maple/maple.h \ + maple/controller.c maple/controller.h maple/kbd.c \ + maple/mouse.c loader.c loader.h elf.h bootstrap.c bootstrap.h \ + util.c gdlist.c gdlist.h display.c display.h dckeysyms.h \ + drivers/audio_null.c drivers/video_null.c drivers/video_gl.c \ + drivers/video_gl.h drivers/gl_fbo.c sh4/sh4.def sh4/sh4core.in \ + sh4/sh4x86.in sh4/sh4dasm.in sh4/sh4stat.in $(am__append_1) \ + $(am__append_3) $(am__append_4) $(am__append_5) \ + $(am__append_6) $(am__append_7) $(am__append_8) \ + $(am__append_9) $(am__append_10) $(am__append_11) \ + $(am__append_12) $(am__append_13) $(am__append_14) \ + $(am__append_15) @BUILD_SH4X86_TRUE@test_testsh4x86_LDADD = @GLIB_LIBS@ @GTK_LIBS@ @LIBPNG_LIBS@ @BUILD_SH4X86_TRUE@test_testsh4x86_SOURCES = test/testsh4x86.c x86dasm/x86dasm.c \ @BUILD_SH4X86_TRUE@ x86dasm/x86dasm.h x86dasm/i386-dis.c x86dasm/dis-init.c \ @@ -1918,6 +1931,7 @@ else :; fi distdir: $(DISTFILES) + $(mkdir_p) $(distdir)/drivers @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ @@ -2045,17 +2059,22 @@ sh4/sh4core.c: gendec sh4/sh4.def sh4/sh4core.in - ./gendec sh4/sh4.def sh4/sh4core.in -o sh4/sh4core.c + mkdir -p `dirname $@` + ./gendec $(srcdir)/sh4/sh4.def $(srcdir)/sh4/sh4core.in -o $@ sh4/sh4dasm.c: gendec sh4/sh4.def sh4/sh4dasm.in - ./gendec sh4/sh4.def sh4/sh4dasm.in -o sh4/sh4dasm.c + mkdir -p `dirname $@` + ./gendec $(srcdir)/sh4/sh4.def $(srcdir)/sh4/sh4dasm.in -o $@ sh4/sh4x86.c: gendec sh4/sh4.def sh4/sh4x86.in - ./gendec sh4/sh4.def sh4/sh4x86.in -o sh4/sh4x86.c + mkdir -p `dirname $@` + ./gendec $(srcdir)/sh4/sh4.def $(srcdir)/sh4/sh4x86.in -o $@ sh4/sh4stat.c: gendec sh4/sh4.def sh4/sh4stat.in - ./gendec sh4/sh4.def sh4/sh4stat.in -o sh4/sh4stat.c + mkdir -p `dirname $@` + ./gendec $(srcdir)/sh4/sh4.def $(srcdir)/sh4/sh4stat.in -o $@ pvr2/gl_slsrc.c: genglsl pvr2/vertex.glsl pvr2/fragment.glsl - ./genglsl pvr2/vertex.glsl pvr2/fragment.glsl pvr2/gl_slsrc.c + mkdir -p `dirname $@` + ./genglsl $(srcdir)/pvr2/vertex.glsl $(srcdir)/pvr2/fragment.glsl $@ drivers/mac_keymap.h: drivers/mac_keymap.txt drivers/genkeymap.pl - drivers/genkeymap.pl mac drivers/mac_keymap.txt > drivers/mac_keymap.h + $(srcdir)/drivers/genkeymap.pl mac $(srcdir)/drivers/mac_keymap.txt > $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: