lxdream 0.9.1revision 731:ee2e929cca3a
summary |
tree |
shortlog |
changelog |
graph |
changeset |
raw | bz2 | zip | gz | changeset | 731:ee2e929cca3a |
| parent | 730:a0f02e769c2e |
| child | 732:f05753bbe723 |
| author | nkeynes |
| date | Tue Jul 08 12:29:53 2008 +0000 (15 years ago) |
Fixup out-of-tree builds to work properly, mostly fix dist target
 | Makefile.am | view | annotate | diff | log | |
| Makefile.in | view | annotate | diff | log | |
| po/POTFILES.in | view | annotate | diff | log | |
| src/Makefile.am | view | annotate | diff | log | |
| src/Makefile.in | view | annotate | diff | log | |
| test/Makefile.in | view | annotate | diff | log | |
| test/timer.c | view | annotate | diff | log |
1.1 --- a/Makefile.am Tue Jul 08 12:28:10 2008 +00001.2 +++ b/Makefile.am Tue Jul 08 12:29:53 2008 +00001.3 @@ -8,7 +8,7 @@1.4 endif1.5 SUBDIRS = src po $(TEST_SUBDIR)1.7 -EXTRA_DIST = autogen.sh1.8 +EXTRA_DIST = autogen.sh lxdream.pod bundlelibs.pl1.10 man_MANS = lxdream.11.12 @@ -29,9 +29,9 @@1.13 $(INSTALL_DATA) lxdreamrc $(DESTDIR)$(sysconfdir)1.15 dist-hook:1.16 - if test -d pixmaps; then \1.17 + if test -d $(srcdir)/pixmaps; then \1.18 mkdir $(distdir)/pixmaps; \1.19 - for pixmap in pixmaps/*; do \1.20 + for pixmap in $(srcdir)/pixmaps/*; do \1.21 if test -f $$pixmap; then \1.22 cp -p $$pixmap $(distdir)/pixmaps; \1.23 fi \1.24 @@ -46,7 +46,7 @@1.25 mkdir -p $(BUNDLE)/Contents/MacOS1.26 mkdir -p $(BUNDLE)/Contents/Resources1.27 cp src/lxdream $(BUNDLE)/Contents/MacOS1.28 - cp -R pixmaps/* $(BUNDLE)/Contents/Resources1.29 + cp -R $(srcdir)/pixmaps/* $(BUNDLE)/Contents/Resources1.30 $(srcdir)/bundlelibs.pl $(BUNDLE)/Contents/MacOS/lxdream $(BUNDLE)/Contents/Frameworks1.31 for cat in $(CATALOGS); do \1.32 catname=`basename "$$cat"`; \
2.1 --- a/Makefile.in Tue Jul 08 12:28:10 2008 +00002.2 +++ b/Makefile.in Tue Jul 08 12:29:53 2008 +00002.3 @@ -242,7 +242,7 @@2.4 BUNDLE = lxdream.app2.5 @BUILD_SYSTEST_TRUE@TEST_SUBDIR = test2.6 SUBDIRS = src po $(TEST_SUBDIR)2.7 -EXTRA_DIST = autogen.sh2.8 +EXTRA_DIST = autogen.sh lxdream.pod bundlelibs.pl2.9 man_MANS = lxdream.12.10 all: config.h2.11 $(MAKE) $(AM_MAKEFLAGS) all-recursive2.12 @@ -744,9 +744,9 @@2.13 $(INSTALL_DATA) lxdreamrc $(DESTDIR)$(sysconfdir)2.15 dist-hook:2.16 - if test -d pixmaps; then \2.17 + if test -d $(srcdir)/pixmaps; then \2.18 mkdir $(distdir)/pixmaps; \2.19 - for pixmap in pixmaps/*; do \2.20 + for pixmap in $(srcdir)/pixmaps/*; do \2.21 if test -f $$pixmap; then \2.22 cp -p $$pixmap $(distdir)/pixmaps; \2.23 fi \2.24 @@ -760,7 +760,7 @@2.25 @GUI_COCOA_TRUE@ mkdir -p $(BUNDLE)/Contents/MacOS2.26 @GUI_COCOA_TRUE@ mkdir -p $(BUNDLE)/Contents/Resources2.27 @GUI_COCOA_TRUE@ cp src/lxdream $(BUNDLE)/Contents/MacOS2.28 -@GUI_COCOA_TRUE@ cp -R pixmaps/* $(BUNDLE)/Contents/Resources2.29 +@GUI_COCOA_TRUE@ cp -R $(srcdir)/pixmaps/* $(BUNDLE)/Contents/Resources2.30 @GUI_COCOA_TRUE@ $(srcdir)/bundlelibs.pl $(BUNDLE)/Contents/MacOS/lxdream $(BUNDLE)/Contents/Frameworks2.31 @GUI_COCOA_TRUE@ for cat in $(CATALOGS); do \2.32 @GUI_COCOA_TRUE@ catname=`basename "$$cat"`; \
3.1 --- a/po/POTFILES.in Tue Jul 08 12:28:10 2008 +00003.2 +++ b/po/POTFILES.in Tue Jul 08 12:29:53 2008 +00003.3 @@ -1,11 +1,170 @@3.4 -# List of source files containing translatable strings.3.5 -3.6 +src/aica/aica.c3.7 +src/aica/aica.h3.8 +src/aica/armcore.c3.9 +src/aica/armcore.h3.10 +src/aica/armdasm.c3.11 +src/aica/armdasm.h3.12 +src/aica/armmem.c3.13 +src/aica/audio.c3.14 +src/aica/audio.h3.15 +src/asic.c3.16 +src/asic.h3.17 +src/bios.c3.18 +src/bootstrap.c3.19 +src/bootstrap.h3.20 +src/clock.h3.21 +src/cocoaui/cocoa_gd.c3.22 +src/cocoaui/cocoa_prefs.c3.23 +src/cocoaui/cocoa_win.c3.24 +src/cocoaui/cocoaui.c3.25 +src/cocoaui/cocoaui.h3.26 +src/config.c3.27 +src/config.h3.28 +src/cpu.h3.29 +src/dckeysyms.h3.30 +src/dcload.c3.31 +src/display.c3.32 +src/display.h3.33 +src/dream.h3.34 +src/dreamcast.c3.35 +src/dreamcast.h3.36 +src/drivers/audio_alsa.c3.37 +src/drivers/audio_esd.c3.38 +src/drivers/audio_null.c3.39 +src/drivers/audio_osx.c3.40 +src/drivers/audio_pulse.c3.41 +src/drivers/cd_linux.c3.42 +src/drivers/cd_none.c3.43 +src/drivers/cd_osx.c3.44 +src/drivers/gl_fbo.c3.45 +src/drivers/joy_linux.c3.46 +src/drivers/joy_linux.h3.47 +src/drivers/mac_keymap.h3.48 +src/drivers/osx_iokit.c3.49 +src/drivers/osx_iokit.h3.50 +src/drivers/video_gdk.c3.51 +src/drivers/video_gl.c3.52 +src/drivers/video_gl.h3.53 +src/drivers/video_glx.c3.54 +src/drivers/video_glx.h3.55 +src/drivers/video_gtk.c3.56 +src/drivers/video_nsgl.c3.57 +src/drivers/video_nsgl.h3.58 +src/drivers/video_null.c3.59 +src/drivers/video_osx.c3.60 +src/elf.h3.61 +src/eventq.c3.62 +src/eventq.h3.63 +src/gdlist.c3.64 +src/gdlist.h3.65 +src/gdrom/cdi.c3.66 +src/gdrom/cdi.h3.67 +src/gdrom/ecc.h3.68 +src/gdrom/edc_crctable.h3.69 +src/gdrom/edc_ecc.c3.70 +src/gdrom/edc_encoder.h3.71 +src/gdrom/edc_l2sq.h3.72 +src/gdrom/edc_scramble.h3.73 +src/gdrom/gddriver.h3.74 +src/gdrom/gdi.c3.75 +src/gdrom/gdimage.c3.76 +src/gdrom/gdrom.c3.77 +src/gdrom/gdrom.h3.78 +src/gdrom/ide.c3.79 +src/gdrom/ide.h3.80 +src/gdrom/mmc.c3.81 +src/gdrom/nrg.c3.82 +src/gdrom/packet.h3.83 +src/gtkui/ctrl_dlg.c3.84 +src/gtkui/debug_win.c3.85 +src/gtkui/dump_win.c3.86 +src/gtkui/gdrom_menu.c3.87 +src/gtkui/gtkcb.c3.88 +src/gtkui/gtkui.c3.89 +src/gtkui/gtkui.h3.90 +src/gtkui/main_win.c3.91 +src/gtkui/mmio_win.c3.92 +src/gtkui/path_dlg.c3.93 +src/gui.h3.94 +src/hook.h3.95 +src/loader.c3.96 +src/loader.h3.97 +src/lxdream.h3.98 src/main.c3.99 -src/gui/gtkui.c3.100 -src/gui/gtkcb.c3.101 -src/gui/gdrom_menu.c3.102 -src/gui/debug_win.c3.103 -src/gui/mmio_win.c3.104 -src/gui/dump_win.c3.105 -src/gui/path_dlg.c3.106 -src/gui/ctrl_dlg.c3.107 +src/maple/controller.c3.108 +src/maple/controller.h3.109 +src/maple/kbd.c3.110 +src/maple/maple.c3.111 +src/maple/maple.h3.112 +src/maple/mouse.c3.113 +src/mem.c3.114 +src/mem.h3.115 +src/mmio.h3.116 +src/pvr2/gl_sl.c3.117 +src/pvr2/gl_slsrc.c3.118 +src/pvr2/glrender.c3.119 +src/pvr2/glutil.c3.120 +src/pvr2/glutil.h3.121 +src/pvr2/pvr2.c3.122 +src/pvr2/pvr2.h3.123 +src/pvr2/pvr2mem.c3.124 +src/pvr2/pvr2mmio.h3.125 +src/pvr2/rendbkg.c3.126 +src/pvr2/rendsave.c3.127 +src/pvr2/rendsort.c3.128 +src/pvr2/scene.c3.129 +src/pvr2/scene.h3.130 +src/pvr2/tacore.c3.131 +src/pvr2/texcache.c3.132 +src/pvr2/yuv.c3.133 +src/serial.h3.134 +src/sh4/dmac.c3.135 +src/sh4/dmac.h3.136 +src/sh4/ia32abi.h3.137 +src/sh4/ia32mac.h3.138 +src/sh4/ia64abi.h3.139 +src/sh4/intc.c3.140 +src/sh4/intc.h3.141 +src/sh4/mmu.c3.142 +src/sh4/scif.c3.143 +src/sh4/sh4.c3.144 +src/sh4/sh4.h3.145 +src/sh4/sh4core.c3.146 +src/sh4/sh4core.h3.147 +src/sh4/sh4dasm.c3.148 +src/sh4/sh4dasm.h3.149 +src/sh4/sh4mem.c3.150 +src/sh4/sh4mmio.c3.151 +src/sh4/sh4mmio.h3.152 +src/sh4/sh4stat.c3.153 +src/sh4/sh4stat.h3.154 +src/sh4/sh4trans.c3.155 +src/sh4/sh4trans.h3.156 +src/sh4/sh4x86.c3.157 +src/sh4/timer.c3.158 +src/sh4/x86op.h3.159 +src/sh4/xltcache.c3.160 +src/sh4/xltcache.h3.161 +src/syscall.c3.162 +src/syscall.h3.163 +src/test/testsh4x86.c3.164 +src/test/testxlt.c3.165 +src/tools/actparse.c3.166 +src/tools/gendec.c3.167 +src/tools/gendec.h3.168 +src/tools/genglsl.c3.169 +src/tools/insparse.c3.170 +src/util.c3.171 +src/watch.c3.172 +src/x86dasm/ansidecl.h3.173 +src/x86dasm/bfd.h3.174 +src/x86dasm/config.h3.175 +src/x86dasm/dis-asm.h3.176 +src/x86dasm/dis-buf.c3.177 +src/x86dasm/dis-init.c3.178 +src/x86dasm/i386-dis.c3.179 +src/x86dasm/opintl.h3.180 +src/x86dasm/symcat.h3.181 +src/x86dasm/sysdep.h3.182 +src/x86dasm/x86dasm.c3.183 +src/x86dasm/x86dasm.h
4.1 --- a/src/Makefile.am Tue Jul 08 12:28:10 2008 +00004.2 +++ b/src/Makefile.am Tue Jul 08 12:29:53 2008 +00004.3 @@ -11,6 +11,7 @@4.4 noinst_PROGRAMS = gendec genglsl4.5 check_PROGRAMS = test/testxlt4.7 +EXTRA_DIST=drivers/genkeymap.pl4.8 AM_CFLAGS = -D_ISOC99_SOURCE -D_BSD_SOURCE4.9 TESTS = test/testxlt4.10 BUILT_SOURCES = sh4/sh4core.c sh4/sh4dasm.c sh4/sh4x86.c pvr2/gl_slsrc.c drivers/mac_keymap.h4.11 @@ -19,38 +20,43 @@4.12 genglsl_SOURCES = tools/genglsl.c4.14 lxdream_SOURCES = \4.15 - main.c config.c config.h \4.16 + main.c config.c config.h lxdream.h dream.h gui.h cpu.h hook.h \4.17 mem.c mem.h mmio.h watch.c \4.18 - asic.c asic.h \4.19 + asic.c asic.h clock.h serial.h \4.20 syscall.c syscall.h bios.c dcload.c \4.21 gdrom/ide.c gdrom/ide.h gdrom/packet.h gdrom/gdimage.c \4.22 gdrom/gdrom.c gdrom/gdrom.h gdrom/nrg.c gdrom/cdi.c gdrom/gdi.c \4.23 gdrom/edc_ecc.c gdrom/ecc.h gdrom/edc_crctable.h gdrom/edc_encoder.h \4.24 - gdrom/edc_l2sq.h gdrom/scramble.h gdrom/mmc.c \4.25 + gdrom/edc_l2sq.h gdrom/edc_scramble.h gdrom/mmc.c gdrom/gddriver.h \4.26 dreamcast.c dreamcast.h eventq.c eventq.h \4.27 sh4/sh4.c sh4/intc.c sh4/intc.h sh4/sh4mem.c sh4/timer.c sh4/dmac.c \4.28 sh4/mmu.c sh4/sh4core.c sh4/sh4core.h sh4/sh4dasm.c sh4/sh4dasm.h \4.29 sh4/sh4mmio.c sh4/sh4mmio.h sh4/scif.c sh4/sh4stat.c sh4/sh4stat.h \4.30 - sh4/xltcache.c sh4/xltcache.h sh4/sh4.h \4.31 - aica/armcore.c aica/armcore.h aica/armdasm.c aica/armmem.c \4.32 + sh4/xltcache.c sh4/xltcache.h sh4/sh4.h sh4/dmac.h \4.33 + aica/armcore.c aica/armcore.h aica/armdasm.c aica/armdasm.h aica/armmem.c \4.34 aica/aica.c aica/aica.h aica/audio.c aica/audio.h \4.35 - pvr2/pvr2.c pvr2/pvr2.h pvr2/pvr2mem.c \4.36 + pvr2/pvr2.c pvr2/pvr2.h pvr2/pvr2mem.c pvr2/pvr2mmio.h \4.37 pvr2/tacore.c pvr2/rendsort.c \4.38 pvr2/texcache.c pvr2/yuv.c pvr2/rendsave.c pvr2/scene.c pvr2/scene.h \4.39 pvr2/gl_sl.c pvr2/gl_slsrc.c pvr2/glutil.c pvr2/glutil.h pvr2/glrender.c \4.40 + pvr2/vertex.glsl pvr2/fragment.glsl \4.41 maple/maple.c maple/maple.h \4.42 maple/controller.c maple/controller.h maple/kbd.c maple/mouse.c \4.43 - loader.c bootstrap.c util.c gdlist.c gdlist.h \4.44 + loader.c loader.h elf.h bootstrap.c bootstrap.h util.c gdlist.c gdlist.h \4.45 display.c display.h dckeysyms.h \4.46 drivers/audio_null.c drivers/video_null.c \4.47 - drivers/video_gl.c drivers/video_gl.h drivers/gl_fbo.c4.48 + drivers/video_gl.c drivers/video_gl.h drivers/gl_fbo.c \4.49 + sh4/sh4.def sh4/sh4core.in sh4/sh4x86.in sh4/sh4dasm.in sh4/sh4stat.in4.50 +4.52 if BUILD_SH4X864.53 lxdream_SOURCES += sh4/sh4x86.c sh4/x86op.h \4.54 sh4/ia32abi.h sh4/ia32mac.h sh4/ia64abi.h \4.55 sh4/sh4trans.c sh4/sh4trans.h \4.56 x86dasm/x86dasm.c x86dasm/x86dasm.h \4.57 - x86dasm/i386-dis.c x86dasm/dis-init.c x86dasm/dis-buf.c4.58 + x86dasm/i386-dis.c x86dasm/dis-init.c x86dasm/dis-buf.c \4.59 + x86dasm/ansidecl.h x86dasm/bfd.h x86dasm/config.h x86dasm/dis-asm.h \4.60 + x86dasm/opintl.h x86dasm/symcat.h x86dasm/sysdep.h4.62 test_testsh4x86_LDADD = @GLIB_LIBS@ @GTK_LIBS@ @LIBPNG_LIBS@4.63 test_testsh4x86_SOURCES = test/testsh4x86.c x86dasm/x86dasm.c \4.64 @@ -67,17 +73,17 @@4.65 gtkui/main_win.c gtkui/gtkcb.c \4.66 gtkui/mmio_win.c gtkui/debug_win.c gtkui/dump_win.c \4.67 gtkui/ctrl_dlg.c gtkui/path_dlg.c gtkui/gdrom_menu.c \4.68 - drivers/video_gtk.c drivers/video_gtk.h4.69 + drivers/video_gtk.c4.70 endif4.72 if GUI_COCOA4.73 lxdream_SOURCES += cocoaui/cocoaui.c cocoaui/cocoaui.h \4.74 cocoaui/cocoa_win.c cocoaui/cocoa_gd.c cocoaui/cocoa_prefs.c \4.75 - drivers/video_osx.c drivers/mac_keymap.h4.76 + drivers/video_osx.c drivers/mac_keymap.h drivers/mac_keymap.txt4.77 endif4.79 if VIDEO_OSMESA4.80 -lxdream_SOURCES += drivers/video_gdk.c drivers/video_gdk.h4.81 +lxdream_SOURCES += drivers/video_gdk.c4.82 endif4.84 if VIDEO_GLX4.85 @@ -110,7 +116,7 @@4.86 endif4.88 if CDROM_OSX4.89 -lxdream_SOURCES += drivers/cd_osx.c drivers/osx_iokit.c4.90 +lxdream_SOURCES += drivers/cd_osx.c drivers/osx_iokit.c drivers/osx_iokit.h4.91 endif4.93 if CDROM_NONE4.94 @@ -131,15 +137,20 @@4.95 test_testxlt_SOURCES = test/testxlt.c sh4/xltcache.c sh4/xltcache.h4.97 sh4/sh4core.c: gendec sh4/sh4.def sh4/sh4core.in4.98 - ./gendec sh4/sh4.def sh4/sh4core.in -o sh4/sh4core.c4.99 + mkdir -p `dirname $@`4.100 + ./gendec $(srcdir)/sh4/sh4.def $(srcdir)/sh4/sh4core.in -o $@4.101 sh4/sh4dasm.c: gendec sh4/sh4.def sh4/sh4dasm.in4.102 - ./gendec sh4/sh4.def sh4/sh4dasm.in -o sh4/sh4dasm.c4.103 + mkdir -p `dirname $@`4.104 + ./gendec $(srcdir)/sh4/sh4.def $(srcdir)/sh4/sh4dasm.in -o $@4.105 sh4/sh4x86.c: gendec sh4/sh4.def sh4/sh4x86.in4.106 - ./gendec sh4/sh4.def sh4/sh4x86.in -o sh4/sh4x86.c4.107 + mkdir -p `dirname $@`4.108 + ./gendec $(srcdir)/sh4/sh4.def $(srcdir)/sh4/sh4x86.in -o $@4.109 sh4/sh4stat.c: gendec sh4/sh4.def sh4/sh4stat.in4.110 - ./gendec sh4/sh4.def sh4/sh4stat.in -o sh4/sh4stat.c4.111 + mkdir -p `dirname $@`4.112 + ./gendec $(srcdir)/sh4/sh4.def $(srcdir)/sh4/sh4stat.in -o $@4.113 pvr2/gl_slsrc.c: genglsl pvr2/vertex.glsl pvr2/fragment.glsl4.114 - ./genglsl pvr2/vertex.glsl pvr2/fragment.glsl pvr2/gl_slsrc.c4.115 + mkdir -p `dirname $@`4.116 + ./genglsl $(srcdir)/pvr2/vertex.glsl $(srcdir)/pvr2/fragment.glsl $@4.117 drivers/mac_keymap.h: drivers/mac_keymap.txt drivers/genkeymap.pl4.118 - drivers/genkeymap.pl mac drivers/mac_keymap.txt > drivers/mac_keymap.h4.119 + $(srcdir)/drivers/genkeymap.pl mac $(srcdir)/drivers/mac_keymap.txt > $@4.121 \ No newline at end of file
5.1 --- a/src/Makefile.in Tue Jul 08 12:28:10 2008 +00005.2 +++ b/src/Makefile.in Tue Jul 08 12:29:53 2008 +00005.3 @@ -43,20 +43,22 @@5.4 @BUILD_SH4X86_TRUE@ sh4/ia32abi.h sh4/ia32mac.h sh4/ia64abi.h \5.5 @BUILD_SH4X86_TRUE@ sh4/sh4trans.c sh4/sh4trans.h \5.6 @BUILD_SH4X86_TRUE@ x86dasm/x86dasm.c x86dasm/x86dasm.h \5.7 -@BUILD_SH4X86_TRUE@ x86dasm/i386-dis.c x86dasm/dis-init.c x86dasm/dis-buf.c5.8 +@BUILD_SH4X86_TRUE@ x86dasm/i386-dis.c x86dasm/dis-init.c x86dasm/dis-buf.c \5.9 +@BUILD_SH4X86_TRUE@ x86dasm/ansidecl.h x86dasm/bfd.h x86dasm/config.h x86dasm/dis-asm.h \5.10 +@BUILD_SH4X86_TRUE@ x86dasm/opintl.h x86dasm/symcat.h x86dasm/sysdep.h5.12 @BUILD_SH4X86_TRUE@am__append_2 = test/testsh4x865.13 @GUI_GTK_TRUE@am__append_3 = gtkui/gtkui.c gtkui/gtkui.h \5.14 @GUI_GTK_TRUE@ gtkui/main_win.c gtkui/gtkcb.c \5.15 @GUI_GTK_TRUE@ gtkui/mmio_win.c gtkui/debug_win.c gtkui/dump_win.c \5.16 @GUI_GTK_TRUE@ gtkui/ctrl_dlg.c gtkui/path_dlg.c gtkui/gdrom_menu.c \5.17 -@GUI_GTK_TRUE@ drivers/video_gtk.c drivers/video_gtk.h5.18 +@GUI_GTK_TRUE@ drivers/video_gtk.c5.20 @GUI_COCOA_TRUE@am__append_4 = cocoaui/cocoaui.c cocoaui/cocoaui.h \5.21 @GUI_COCOA_TRUE@ cocoaui/cocoa_win.c cocoaui/cocoa_gd.c cocoaui/cocoa_prefs.c \5.22 -@GUI_COCOA_TRUE@ drivers/video_osx.c drivers/mac_keymap.h5.23 +@GUI_COCOA_TRUE@ drivers/video_osx.c drivers/mac_keymap.h drivers/mac_keymap.txt5.25 -@VIDEO_OSMESA_TRUE@am__append_5 = drivers/video_gdk.c drivers/video_gdk.h5.26 +@VIDEO_OSMESA_TRUE@am__append_5 = drivers/video_gdk.c5.27 @VIDEO_GLX_TRUE@am__append_6 = drivers/video_glx.c drivers/video_glx.h5.28 @VIDEO_NSGL_TRUE@am__append_7 = drivers/video_nsgl.c drivers/video_nsgl.h5.29 @AUDIO_OSX_TRUE@am__append_8 = drivers/audio_osx.c5.30 @@ -64,7 +66,7 @@5.31 @AUDIO_ESOUND_TRUE@am__append_10 = drivers/audio_esd.c5.32 @AUDIO_ALSA_TRUE@am__append_11 = drivers/audio_alsa.c5.33 @CDROM_LINUX_TRUE@am__append_12 = drivers/cd_linux.c5.34 -@CDROM_OSX_TRUE@am__append_13 = drivers/cd_osx.c drivers/osx_iokit.c5.35 +@CDROM_OSX_TRUE@am__append_13 = drivers/cd_osx.c drivers/osx_iokit.c drivers/osx_iokit.h5.36 @CDROM_NONE_TRUE@am__append_14 = drivers/cd_none.c5.37 @JOY_LINUX_TRUE@am__append_15 = drivers/joy_linux.c5.38 subdir = src5.39 @@ -88,43 +90,49 @@5.40 am_genglsl_OBJECTS = genglsl.$(OBJEXT)5.41 genglsl_OBJECTS = $(am_genglsl_OBJECTS)5.42 genglsl_DEPENDENCIES = $(am__DEPENDENCIES_1)5.43 -am__lxdream_SOURCES_DIST = main.c config.c config.h mem.c mem.h mmio.h \5.44 - watch.c asic.c asic.h syscall.c syscall.h bios.c dcload.c \5.45 +am__lxdream_SOURCES_DIST = main.c config.c config.h lxdream.h dream.h \5.46 + gui.h cpu.h hook.h mem.c mem.h mmio.h watch.c asic.c asic.h \5.47 + clock.h serial.h syscall.c syscall.h bios.c dcload.c \5.48 gdrom/ide.c gdrom/ide.h gdrom/packet.h gdrom/gdimage.c \5.49 gdrom/gdrom.c gdrom/gdrom.h gdrom/nrg.c gdrom/cdi.c \5.50 gdrom/gdi.c gdrom/edc_ecc.c gdrom/ecc.h gdrom/edc_crctable.h \5.51 - gdrom/edc_encoder.h gdrom/edc_l2sq.h gdrom/scramble.h \5.52 - gdrom/mmc.c dreamcast.c dreamcast.h eventq.c eventq.h \5.53 - sh4/sh4.c sh4/intc.c sh4/intc.h sh4/sh4mem.c sh4/timer.c \5.54 - sh4/dmac.c sh4/mmu.c sh4/sh4core.c sh4/sh4core.h sh4/sh4dasm.c \5.55 - sh4/sh4dasm.h sh4/sh4mmio.c sh4/sh4mmio.h sh4/scif.c \5.56 - sh4/sh4stat.c sh4/sh4stat.h sh4/xltcache.c sh4/xltcache.h \5.57 - sh4/sh4.h aica/armcore.c aica/armcore.h aica/armdasm.c \5.58 - aica/armmem.c aica/aica.c aica/aica.h aica/audio.c \5.59 - aica/audio.h pvr2/pvr2.c pvr2/pvr2.h pvr2/pvr2mem.c \5.60 - pvr2/tacore.c pvr2/rendsort.c pvr2/texcache.c pvr2/yuv.c \5.61 - pvr2/rendsave.c pvr2/scene.c pvr2/scene.h pvr2/gl_sl.c \5.62 - pvr2/gl_slsrc.c pvr2/glutil.c pvr2/glutil.h pvr2/glrender.c \5.63 - maple/maple.c maple/maple.h maple/controller.c \5.64 - maple/controller.h maple/kbd.c maple/mouse.c loader.c \5.65 - bootstrap.c util.c gdlist.c gdlist.h display.c display.h \5.66 - dckeysyms.h drivers/audio_null.c drivers/video_null.c \5.67 - drivers/video_gl.c drivers/video_gl.h drivers/gl_fbo.c \5.68 - sh4/sh4x86.c sh4/x86op.h sh4/ia32abi.h sh4/ia32mac.h \5.69 - sh4/ia64abi.h sh4/sh4trans.c sh4/sh4trans.h x86dasm/x86dasm.c \5.70 + gdrom/edc_encoder.h gdrom/edc_l2sq.h gdrom/edc_scramble.h \5.71 + gdrom/mmc.c gdrom/gddriver.h dreamcast.c dreamcast.h eventq.c \5.72 + eventq.h sh4/sh4.c sh4/intc.c sh4/intc.h sh4/sh4mem.c \5.73 + sh4/timer.c sh4/dmac.c sh4/mmu.c sh4/sh4core.c sh4/sh4core.h \5.74 + sh4/sh4dasm.c sh4/sh4dasm.h sh4/sh4mmio.c sh4/sh4mmio.h \5.75 + sh4/scif.c sh4/sh4stat.c sh4/sh4stat.h sh4/xltcache.c \5.76 + sh4/xltcache.h sh4/sh4.h sh4/dmac.h aica/armcore.c \5.77 + aica/armcore.h aica/armdasm.c aica/armdasm.h aica/armmem.c \5.78 + aica/aica.c aica/aica.h aica/audio.c aica/audio.h pvr2/pvr2.c \5.79 + pvr2/pvr2.h pvr2/pvr2mem.c pvr2/pvr2mmio.h pvr2/tacore.c \5.80 + pvr2/rendsort.c pvr2/texcache.c pvr2/yuv.c pvr2/rendsave.c \5.81 + pvr2/scene.c pvr2/scene.h pvr2/gl_sl.c pvr2/gl_slsrc.c \5.82 + pvr2/glutil.c pvr2/glutil.h pvr2/glrender.c pvr2/vertex.glsl \5.83 + pvr2/fragment.glsl maple/maple.c maple/maple.h \5.84 + maple/controller.c maple/controller.h maple/kbd.c \5.85 + maple/mouse.c loader.c loader.h elf.h bootstrap.c bootstrap.h \5.86 + util.c gdlist.c gdlist.h display.c display.h dckeysyms.h \5.87 + drivers/audio_null.c drivers/video_null.c drivers/video_gl.c \5.88 + drivers/video_gl.h drivers/gl_fbo.c sh4/sh4.def sh4/sh4core.in \5.89 + sh4/sh4x86.in sh4/sh4dasm.in sh4/sh4stat.in sh4/sh4x86.c \5.90 + sh4/x86op.h sh4/ia32abi.h sh4/ia32mac.h sh4/ia64abi.h \5.91 + sh4/sh4trans.c sh4/sh4trans.h x86dasm/x86dasm.c \5.92 x86dasm/x86dasm.h x86dasm/i386-dis.c x86dasm/dis-init.c \5.93 - x86dasm/dis-buf.c gtkui/gtkui.c gtkui/gtkui.h gtkui/main_win.c \5.94 - gtkui/gtkcb.c gtkui/mmio_win.c gtkui/debug_win.c \5.95 - gtkui/dump_win.c gtkui/ctrl_dlg.c gtkui/path_dlg.c \5.96 - gtkui/gdrom_menu.c drivers/video_gtk.c drivers/video_gtk.h \5.97 + x86dasm/dis-buf.c x86dasm/ansidecl.h x86dasm/bfd.h \5.98 + x86dasm/config.h x86dasm/dis-asm.h x86dasm/opintl.h \5.99 + x86dasm/symcat.h x86dasm/sysdep.h gtkui/gtkui.c gtkui/gtkui.h \5.100 + gtkui/main_win.c gtkui/gtkcb.c gtkui/mmio_win.c \5.101 + gtkui/debug_win.c gtkui/dump_win.c gtkui/ctrl_dlg.c \5.102 + gtkui/path_dlg.c gtkui/gdrom_menu.c drivers/video_gtk.c \5.103 cocoaui/cocoaui.c cocoaui/cocoaui.h cocoaui/cocoa_win.c \5.104 cocoaui/cocoa_gd.c cocoaui/cocoa_prefs.c drivers/video_osx.c \5.105 - drivers/mac_keymap.h drivers/video_gdk.c drivers/video_gdk.h \5.106 - drivers/video_glx.c drivers/video_glx.h drivers/video_nsgl.c \5.107 - drivers/video_nsgl.h drivers/audio_osx.c drivers/audio_pulse.c \5.108 - drivers/audio_esd.c drivers/audio_alsa.c drivers/cd_linux.c \5.109 - drivers/cd_osx.c drivers/osx_iokit.c drivers/cd_none.c \5.110 - drivers/joy_linux.c5.111 + drivers/mac_keymap.h drivers/mac_keymap.txt \5.112 + drivers/video_gdk.c drivers/video_glx.c drivers/video_glx.h \5.113 + drivers/video_nsgl.c drivers/video_nsgl.h drivers/audio_osx.c \5.114 + drivers/audio_pulse.c drivers/audio_esd.c drivers/audio_alsa.c \5.115 + drivers/cd_linux.c drivers/cd_osx.c drivers/osx_iokit.c \5.116 + drivers/osx_iokit.h drivers/cd_none.c drivers/joy_linux.c5.117 @BUILD_SH4X86_TRUE@am__objects_1 = sh4x86.$(OBJEXT) sh4trans.$(OBJEXT) \5.118 @BUILD_SH4X86_TRUE@ x86dasm.$(OBJEXT) i386-dis.$(OBJEXT) \5.119 @BUILD_SH4X86_TRUE@ dis-init.$(OBJEXT) dis-buf.$(OBJEXT)5.120 @@ -374,38 +382,43 @@5.121 -Ish4 \5.122 @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBPNG_CFLAGS@ @PULSE_CFLAGS@ @ESOUND_CFLAGS@ @ALSA_CFLAGS@5.124 +EXTRA_DIST = drivers/genkeymap.pl5.125 AM_CFLAGS = -D_ISOC99_SOURCE -D_BSD_SOURCE5.126 TESTS = test/testxlt5.127 BUILT_SOURCES = sh4/sh4core.c sh4/sh4dasm.c sh4/sh4x86.c pvr2/gl_slsrc.c drivers/mac_keymap.h5.128 gendec_SOURCES = tools/gendec.c tools/gendec.h tools/insparse.c tools/actparse.c5.129 genglsl_SOURCES = tools/genglsl.c5.130 -lxdream_SOURCES = main.c config.c config.h mem.c mem.h mmio.h watch.c \5.131 - asic.c asic.h syscall.c syscall.h bios.c dcload.c gdrom/ide.c \5.132 +lxdream_SOURCES = main.c config.c config.h lxdream.h dream.h gui.h \5.133 + cpu.h hook.h mem.c mem.h mmio.h watch.c asic.c asic.h clock.h \5.134 + serial.h syscall.c syscall.h bios.c dcload.c gdrom/ide.c \5.135 gdrom/ide.h gdrom/packet.h gdrom/gdimage.c gdrom/gdrom.c \5.136 gdrom/gdrom.h gdrom/nrg.c gdrom/cdi.c gdrom/gdi.c \5.137 gdrom/edc_ecc.c gdrom/ecc.h gdrom/edc_crctable.h \5.138 - gdrom/edc_encoder.h gdrom/edc_l2sq.h gdrom/scramble.h \5.139 - gdrom/mmc.c dreamcast.c dreamcast.h eventq.c eventq.h \5.140 - sh4/sh4.c sh4/intc.c sh4/intc.h sh4/sh4mem.c sh4/timer.c \5.141 - sh4/dmac.c sh4/mmu.c sh4/sh4core.c sh4/sh4core.h sh4/sh4dasm.c \5.142 - sh4/sh4dasm.h sh4/sh4mmio.c sh4/sh4mmio.h sh4/scif.c \5.143 - sh4/sh4stat.c sh4/sh4stat.h sh4/xltcache.c sh4/xltcache.h \5.144 - sh4/sh4.h aica/armcore.c aica/armcore.h aica/armdasm.c \5.145 - aica/armmem.c aica/aica.c aica/aica.h aica/audio.c \5.146 - aica/audio.h pvr2/pvr2.c pvr2/pvr2.h pvr2/pvr2mem.c \5.147 - pvr2/tacore.c pvr2/rendsort.c pvr2/texcache.c pvr2/yuv.c \5.148 - pvr2/rendsave.c pvr2/scene.c pvr2/scene.h pvr2/gl_sl.c \5.149 - pvr2/gl_slsrc.c pvr2/glutil.c pvr2/glutil.h pvr2/glrender.c \5.150 - maple/maple.c maple/maple.h maple/controller.c \5.151 - maple/controller.h maple/kbd.c maple/mouse.c loader.c \5.152 - bootstrap.c util.c gdlist.c gdlist.h display.c display.h \5.153 - dckeysyms.h drivers/audio_null.c drivers/video_null.c \5.154 - drivers/video_gl.c drivers/video_gl.h drivers/gl_fbo.c \5.155 - $(am__append_1) $(am__append_3) $(am__append_4) \5.156 - $(am__append_5) $(am__append_6) $(am__append_7) \5.157 - $(am__append_8) $(am__append_9) $(am__append_10) \5.158 - $(am__append_11) $(am__append_12) $(am__append_13) \5.159 - $(am__append_14) $(am__append_15)5.160 + gdrom/edc_encoder.h gdrom/edc_l2sq.h gdrom/edc_scramble.h \5.161 + gdrom/mmc.c gdrom/gddriver.h dreamcast.c dreamcast.h eventq.c \5.162 + eventq.h sh4/sh4.c sh4/intc.c sh4/intc.h sh4/sh4mem.c \5.163 + sh4/timer.c sh4/dmac.c sh4/mmu.c sh4/sh4core.c sh4/sh4core.h \5.164 + sh4/sh4dasm.c sh4/sh4dasm.h sh4/sh4mmio.c sh4/sh4mmio.h \5.165 + sh4/scif.c sh4/sh4stat.c sh4/sh4stat.h sh4/xltcache.c \5.166 + sh4/xltcache.h sh4/sh4.h sh4/dmac.h aica/armcore.c \5.167 + aica/armcore.h aica/armdasm.c aica/armdasm.h aica/armmem.c \5.168 + aica/aica.c aica/aica.h aica/audio.c aica/audio.h pvr2/pvr2.c \5.169 + pvr2/pvr2.h pvr2/pvr2mem.c pvr2/pvr2mmio.h pvr2/tacore.c \5.170 + pvr2/rendsort.c pvr2/texcache.c pvr2/yuv.c pvr2/rendsave.c \5.171 + pvr2/scene.c pvr2/scene.h pvr2/gl_sl.c pvr2/gl_slsrc.c \5.172 + pvr2/glutil.c pvr2/glutil.h pvr2/glrender.c pvr2/vertex.glsl \5.173 + pvr2/fragment.glsl maple/maple.c maple/maple.h \5.174 + maple/controller.c maple/controller.h maple/kbd.c \5.175 + maple/mouse.c loader.c loader.h elf.h bootstrap.c bootstrap.h \5.176 + util.c gdlist.c gdlist.h display.c display.h dckeysyms.h \5.177 + drivers/audio_null.c drivers/video_null.c drivers/video_gl.c \5.178 + drivers/video_gl.h drivers/gl_fbo.c sh4/sh4.def sh4/sh4core.in \5.179 + sh4/sh4x86.in sh4/sh4dasm.in sh4/sh4stat.in $(am__append_1) \5.180 + $(am__append_3) $(am__append_4) $(am__append_5) \5.181 + $(am__append_6) $(am__append_7) $(am__append_8) \5.182 + $(am__append_9) $(am__append_10) $(am__append_11) \5.183 + $(am__append_12) $(am__append_13) $(am__append_14) \5.184 + $(am__append_15)5.185 @BUILD_SH4X86_TRUE@test_testsh4x86_LDADD = @GLIB_LIBS@ @GTK_LIBS@ @LIBPNG_LIBS@5.186 @BUILD_SH4X86_TRUE@test_testsh4x86_SOURCES = test/testsh4x86.c x86dasm/x86dasm.c \5.187 @BUILD_SH4X86_TRUE@ x86dasm/x86dasm.h x86dasm/i386-dis.c x86dasm/dis-init.c \5.188 @@ -1918,6 +1931,7 @@5.189 else :; fi5.191 distdir: $(DISTFILES)5.192 + $(mkdir_p) $(distdir)/drivers5.193 @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \5.194 topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \5.195 list='$(DISTFILES)'; for file in $$list; do \5.196 @@ -2045,17 +2059,22 @@5.199 sh4/sh4core.c: gendec sh4/sh4.def sh4/sh4core.in5.200 - ./gendec sh4/sh4.def sh4/sh4core.in -o sh4/sh4core.c5.201 + mkdir -p `dirname $@`5.202 + ./gendec $(srcdir)/sh4/sh4.def $(srcdir)/sh4/sh4core.in -o $@5.203 sh4/sh4dasm.c: gendec sh4/sh4.def sh4/sh4dasm.in5.204 - ./gendec sh4/sh4.def sh4/sh4dasm.in -o sh4/sh4dasm.c5.205 + mkdir -p `dirname $@`5.206 + ./gendec $(srcdir)/sh4/sh4.def $(srcdir)/sh4/sh4dasm.in -o $@5.207 sh4/sh4x86.c: gendec sh4/sh4.def sh4/sh4x86.in5.208 - ./gendec sh4/sh4.def sh4/sh4x86.in -o sh4/sh4x86.c5.209 + mkdir -p `dirname $@`5.210 + ./gendec $(srcdir)/sh4/sh4.def $(srcdir)/sh4/sh4x86.in -o $@5.211 sh4/sh4stat.c: gendec sh4/sh4.def sh4/sh4stat.in5.212 - ./gendec sh4/sh4.def sh4/sh4stat.in -o sh4/sh4stat.c5.213 + mkdir -p `dirname $@`5.214 + ./gendec $(srcdir)/sh4/sh4.def $(srcdir)/sh4/sh4stat.in -o $@5.215 pvr2/gl_slsrc.c: genglsl pvr2/vertex.glsl pvr2/fragment.glsl5.216 - ./genglsl pvr2/vertex.glsl pvr2/fragment.glsl pvr2/gl_slsrc.c5.217 + mkdir -p `dirname $@`5.218 + ./genglsl $(srcdir)/pvr2/vertex.glsl $(srcdir)/pvr2/fragment.glsl $@5.219 drivers/mac_keymap.h: drivers/mac_keymap.txt drivers/genkeymap.pl5.220 - drivers/genkeymap.pl mac drivers/mac_keymap.txt > drivers/mac_keymap.h5.221 + $(srcdir)/drivers/genkeymap.pl mac $(srcdir)/drivers/mac_keymap.txt > $@5.222 # Tell versions [3.59,3.63) of GNU make to not export all variables.5.223 # Otherwise a system limit (for SysV at least) may be exceeded.5.224 .NOEXPORT:
6.1 --- a/test/Makefile.in Tue Jul 08 12:28:10 2008 +00006.2 +++ b/test/Makefile.in Tue Jul 08 12:29:53 2008 +00006.3 @@ -1,32 +1,29 @@6.4 +srcdir = @srcdir@6.5 +top_srcdir = @top_srcdir@6.6 +VPATH = @srcdir@6.7 +6.8 # host compiler and flags6.9 HOSTCC = @CC@6.10 HOSTCFLAGS = @CFLAGS@6.11 +6.12 SH4CC = @SHCC@6.13 -SH4INC = -Iinclude6.14 +SH4INC = -I$(srcdir)/include6.15 SH4CFLAGS = $(SH4INC) -D_arch_dreamcast -D_arch_sub_pristine \6.16 -O2 -fno-builtin -fno-strict-aliasing -ml -m4-single-only \6.17 -fno-optimize-sibling-calls6.18 SH4LD = @SHLD@6.19 SH4LDFLAGS = -fno-builtin -fno-strict-aliasing -ml -m4-single-only \6.20 - -Wl,-Tdc.x -nostartfiles -nostdlib -Llib6.21 + -Wl,-T$(srcdir)/dc.x -nostartfiles -nostdlib -L$(srcdir)/lib6.22 SH4LIBS = -Wl,--start-group -lc -lgcc -lm -Wl,--end-group6.23 SH4OBJCOPY = @SHOBJCOPY@ -O binary6.24 +6.25 ARMCC = @ARMCC@6.26 ARMCFLAGS = -O26.27 ARMLD = @ARMLD@6.28 ARMOBJCOPY = @ARMOBJCOPY@6.30 -RUNTEST = ../src/lxdream -c ./lxdream.rc -puH -A null6.31 -RUNTESTX = ../src/lxdream -c ./lxdream.rc -xpuH -A null6.32 -6.33 -6.34 -# cygwin6.35 -# these must point to your sh-elf bfd, not the system one6.36 -#BFDLIB = -L/usr/local/lib -lbfd -liberty -lintl6.37 -#BFDINCLUDE = /usr/local/include6.38 -6.39 -#SHARED_OBJECTS = crt0.so dcload-syscall.so dcload-syscalls.so memcpy.so lib.so6.40 -SHARED_OBJECTS =6.41 +RUNTEST = ../src/lxdream -c $(srcdir)/lxdream.rc -puH -A null6.42 +RUNTESTX = ../src/lxdream -c $(srcdir)/lxdream.rc -xpuH -A null6.44 %.ao: %.c6.45 $(ARMCC) $(ARMCFLAGS) -o $@ -c $<6.46 @@ -77,7 +74,7 @@6.47 sh4/add.so sh4/addc.so sh4/addv.so sh4/and.so sh4/andi.so \6.48 sh4/bf.so sh4/bsr.so sh4/bt.so sh4/cmp.so sh4/cmpstr.so \6.49 sh4/div0.so sh4/div1.so sh4/float.so sh4/fmov.so sh4/ftrc.so \6.50 - sh4/mac.s \6.51 + sh4/mac.so \6.52 sh4/rot.so sh4/shl.so sh4/shld.so sh4/sub.so sh4/subc.so \6.53 sh4/trapa.so sh4/tas.so sh4/xtrct.so \6.54 sh4/excslot.so sh4/undef.so sh4/tlb.so
.