Search
lxdream.org :: lxdream/src/Makefile.in :: diff
lxdream 0.9.1
released Jun 29
Download Now
filename src/Makefile.in
changeset 931:430048ea8b71
prev894:1ddd5616c5af
next939:6f2302afeb89
author nkeynes
date Tue Dec 23 05:48:05 2008 +0000 (11 years ago)
branchlxdream-mem
permissions -rw-r--r--
last change More refactoring and general cleanup. Most things should be working again now.
Split off cache and start real implementation, breaking save states in the process
file annotate diff log raw
1.1 --- a/src/Makefile.in Fri Oct 24 03:48:40 2008 +0000
1.2 +++ b/src/Makefile.in Tue Dec 23 05:48:05 2008 +0000
1.3 @@ -73,7 +73,8 @@
1.4 subdir = src
1.5 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
1.6 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
1.7 -am__aclocal_m4_deps = $(top_srcdir)/configure.in
1.8 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
1.9 + $(top_srcdir)/configure.in
1.10 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
1.11 $(ACLOCAL_M4)
1.12 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
1.13 @@ -104,38 +105,38 @@
1.14 sh4/dmac.c sh4/mmu.c sh4/sh4core.c sh4/sh4core.h sh4/sh4dasm.c \
1.15 sh4/sh4dasm.h sh4/sh4mmio.c sh4/sh4mmio.h sh4/scif.c \
1.16 sh4/sh4stat.c sh4/sh4stat.h sh4/xltcache.c sh4/xltcache.h \
1.17 - sh4/sh4.h sh4/dmac.h sh4/pmm.c aica/armcore.c aica/armcore.h \
1.18 - aica/armdasm.c aica/armdasm.h aica/armmem.c aica/aica.c \
1.19 - aica/aica.h aica/audio.c aica/audio.h pvr2/pvr2.c pvr2/pvr2.h \
1.20 - pvr2/pvr2mem.c pvr2/pvr2mmio.h pvr2/tacore.c pvr2/rendsort.c \
1.21 - pvr2/texcache.c pvr2/yuv.c pvr2/rendsave.c pvr2/scene.c \
1.22 - pvr2/scene.h pvr2/gl_sl.c pvr2/gl_slsrc.c pvr2/glutil.c \
1.23 - pvr2/glutil.h pvr2/glrender.c pvr2/vertex.glsl \
1.24 - pvr2/fragment.glsl maple/maple.c maple/maple.h \
1.25 - maple/controller.c maple/kbd.c maple/mouse.c maple/lightgun.c \
1.26 - loader.c loader.h elf.h bootstrap.c bootstrap.h util.c \
1.27 - gdlist.c gdlist.h display.c display.h dckeysyms.h \
1.28 - drivers/audio_null.c drivers/video_null.c drivers/video_gl.c \
1.29 - drivers/video_gl.h drivers/gl_fbo.c sh4/sh4.def sh4/sh4core.in \
1.30 - sh4/sh4x86.in sh4/sh4dasm.in sh4/sh4stat.in sh4/sh4x86.c \
1.31 - sh4/x86op.h sh4/ia32abi.h sh4/ia32mac.h sh4/ia64abi.h \
1.32 - sh4/sh4trans.c sh4/sh4trans.h x86dasm/x86dasm.c \
1.33 - x86dasm/x86dasm.h x86dasm/i386-dis.c x86dasm/dis-init.c \
1.34 - x86dasm/dis-buf.c x86dasm/ansidecl.h x86dasm/bfd.h \
1.35 - x86dasm/dis-asm.h x86dasm/symcat.h x86dasm/sysdep.h \
1.36 - gtkui/gtkui.c gtkui/gtkui.h gtkui/gtk_win.c gtkui/gtkcb.c \
1.37 - gtkui/gtk_mmio.c gtkui/gtk_debug.c gtkui/gtk_dump.c \
1.38 - gtkui/gtk_ctrl.c gtkui/gtk_path.c gtkui/gtk_gd.c \
1.39 - drivers/video_gtk.c cocoaui/cocoaui.c cocoaui/cocoaui.h \
1.40 - cocoaui/cocoa_win.c cocoaui/cocoa_gd.c cocoaui/cocoa_prefs.c \
1.41 - cocoaui/cocoa_path.c cocoaui/cocoa_ctrl.c drivers/video_osx.c \
1.42 - drivers/mac_keymap.h drivers/mac_keymap.txt \
1.43 - drivers/video_gdk.c drivers/video_glx.c drivers/video_glx.h \
1.44 - drivers/video_nsgl.c drivers/video_nsgl.h drivers/audio_osx.c \
1.45 - drivers/audio_pulse.c drivers/audio_esd.c drivers/audio_alsa.c \
1.46 - drivers/cd_linux.c drivers/cd_osx.c drivers/osx_iokit.c \
1.47 - drivers/osx_iokit.h drivers/cd_none.c drivers/joy_linux.c \
1.48 - drivers/joy_linux.h
1.49 + sh4/sh4.h sh4/dmac.h sh4/pmm.c sh4/cache.c sh4/mmu.h \
1.50 + aica/armcore.c aica/armcore.h aica/armdasm.c aica/armdasm.h \
1.51 + aica/armmem.c aica/aica.c aica/aica.h aica/audio.c \
1.52 + aica/audio.h pvr2/pvr2.c pvr2/pvr2.h pvr2/pvr2mem.c \
1.53 + pvr2/pvr2mmio.h pvr2/tacore.c pvr2/rendsort.c pvr2/texcache.c \
1.54 + pvr2/yuv.c pvr2/rendsave.c pvr2/scene.c pvr2/scene.h \
1.55 + pvr2/gl_sl.c pvr2/gl_slsrc.c pvr2/glutil.c pvr2/glutil.h \
1.56 + pvr2/glrender.c pvr2/vertex.glsl pvr2/fragment.glsl \
1.57 + maple/maple.c maple/maple.h maple/controller.c maple/kbd.c \
1.58 + maple/mouse.c maple/lightgun.c loader.c loader.h elf.h \
1.59 + bootstrap.c bootstrap.h util.c gdlist.c gdlist.h display.c \
1.60 + display.h dckeysyms.h drivers/audio_null.c \
1.61 + drivers/video_null.c drivers/video_gl.c drivers/video_gl.h \
1.62 + drivers/gl_fbo.c sh4/sh4.def sh4/sh4core.in sh4/sh4x86.in \
1.63 + sh4/sh4dasm.in sh4/sh4stat.in sh4/sh4x86.c sh4/x86op.h \
1.64 + sh4/ia32abi.h sh4/ia32mac.h sh4/ia64abi.h sh4/sh4trans.c \
1.65 + sh4/sh4trans.h x86dasm/x86dasm.c x86dasm/x86dasm.h \
1.66 + x86dasm/i386-dis.c x86dasm/dis-init.c x86dasm/dis-buf.c \
1.67 + x86dasm/ansidecl.h x86dasm/bfd.h x86dasm/dis-asm.h \
1.68 + x86dasm/symcat.h x86dasm/sysdep.h gtkui/gtkui.c gtkui/gtkui.h \
1.69 + gtkui/gtk_win.c gtkui/gtkcb.c gtkui/gtk_mmio.c \
1.70 + gtkui/gtk_debug.c gtkui/gtk_dump.c gtkui/gtk_ctrl.c \
1.71 + gtkui/gtk_path.c gtkui/gtk_gd.c drivers/video_gtk.c \
1.72 + cocoaui/cocoaui.c cocoaui/cocoaui.h cocoaui/cocoa_win.c \
1.73 + cocoaui/cocoa_gd.c cocoaui/cocoa_prefs.c cocoaui/cocoa_path.c \
1.74 + cocoaui/cocoa_ctrl.c drivers/video_osx.c drivers/mac_keymap.h \
1.75 + drivers/mac_keymap.txt drivers/video_gdk.c drivers/video_glx.c \
1.76 + drivers/video_glx.h drivers/video_nsgl.c drivers/video_nsgl.h \
1.77 + drivers/audio_osx.c drivers/audio_pulse.c drivers/audio_esd.c \
1.78 + drivers/audio_alsa.c drivers/cd_linux.c drivers/cd_osx.c \
1.79 + drivers/osx_iokit.c drivers/osx_iokit.h drivers/cd_none.c \
1.80 + drivers/joy_linux.c drivers/joy_linux.h
1.81 @BUILD_SH4X86_TRUE@am__objects_1 = sh4x86.$(OBJEXT) sh4trans.$(OBJEXT) \
1.82 @BUILD_SH4X86_TRUE@ x86dasm.$(OBJEXT) i386-dis.$(OBJEXT) \
1.83 @BUILD_SH4X86_TRUE@ dis-init.$(OBJEXT) dis-buf.$(OBJEXT)
1.84 @@ -168,22 +169,22 @@
1.85 intc.$(OBJEXT) sh4mem.$(OBJEXT) timer.$(OBJEXT) dmac.$(OBJEXT) \
1.86 mmu.$(OBJEXT) sh4core.$(OBJEXT) sh4dasm.$(OBJEXT) \
1.87 sh4mmio.$(OBJEXT) scif.$(OBJEXT) sh4stat.$(OBJEXT) \
1.88 - xltcache.$(OBJEXT) pmm.$(OBJEXT) armcore.$(OBJEXT) \
1.89 - armdasm.$(OBJEXT) armmem.$(OBJEXT) aica.$(OBJEXT) \
1.90 - audio.$(OBJEXT) pvr2.$(OBJEXT) pvr2mem.$(OBJEXT) \
1.91 - tacore.$(OBJEXT) rendsort.$(OBJEXT) texcache.$(OBJEXT) \
1.92 - yuv.$(OBJEXT) rendsave.$(OBJEXT) scene.$(OBJEXT) \
1.93 - gl_sl.$(OBJEXT) gl_slsrc.$(OBJEXT) glutil.$(OBJEXT) \
1.94 - glrender.$(OBJEXT) maple.$(OBJEXT) controller.$(OBJEXT) \
1.95 - kbd.$(OBJEXT) mouse.$(OBJEXT) lightgun.$(OBJEXT) \
1.96 - loader.$(OBJEXT) bootstrap.$(OBJEXT) util.$(OBJEXT) \
1.97 - gdlist.$(OBJEXT) display.$(OBJEXT) audio_null.$(OBJEXT) \
1.98 - video_null.$(OBJEXT) video_gl.$(OBJEXT) gl_fbo.$(OBJEXT) \
1.99 - $(am__objects_1) $(am__objects_2) $(am__objects_3) \
1.100 - $(am__objects_4) $(am__objects_5) $(am__objects_6) \
1.101 - $(am__objects_7) $(am__objects_8) $(am__objects_9) \
1.102 - $(am__objects_10) $(am__objects_11) $(am__objects_12) \
1.103 - $(am__objects_13) $(am__objects_14)
1.104 + xltcache.$(OBJEXT) pmm.$(OBJEXT) cache.$(OBJEXT) \
1.105 + armcore.$(OBJEXT) armdasm.$(OBJEXT) armmem.$(OBJEXT) \
1.106 + aica.$(OBJEXT) audio.$(OBJEXT) pvr2.$(OBJEXT) \
1.107 + pvr2mem.$(OBJEXT) tacore.$(OBJEXT) rendsort.$(OBJEXT) \
1.108 + texcache.$(OBJEXT) yuv.$(OBJEXT) rendsave.$(OBJEXT) \
1.109 + scene.$(OBJEXT) gl_sl.$(OBJEXT) gl_slsrc.$(OBJEXT) \
1.110 + glutil.$(OBJEXT) glrender.$(OBJEXT) maple.$(OBJEXT) \
1.111 + controller.$(OBJEXT) kbd.$(OBJEXT) mouse.$(OBJEXT) \
1.112 + lightgun.$(OBJEXT) loader.$(OBJEXT) bootstrap.$(OBJEXT) \
1.113 + util.$(OBJEXT) gdlist.$(OBJEXT) display.$(OBJEXT) \
1.114 + audio_null.$(OBJEXT) video_null.$(OBJEXT) video_gl.$(OBJEXT) \
1.115 + gl_fbo.$(OBJEXT) $(am__objects_1) $(am__objects_2) \
1.116 + $(am__objects_3) $(am__objects_4) $(am__objects_5) \
1.117 + $(am__objects_6) $(am__objects_7) $(am__objects_8) \
1.118 + $(am__objects_9) $(am__objects_10) $(am__objects_11) \
1.119 + $(am__objects_12) $(am__objects_13) $(am__objects_14)
1.120 lxdream_OBJECTS = $(am_lxdream_OBJECTS)
1.121 lxdream_DEPENDENCIES = $(am__DEPENDENCIES_1)
1.122 am__test_testsh4x86_SOURCES_DIST = test/testsh4x86.c x86dasm/x86dasm.c \
1.123 @@ -412,24 +413,25 @@
1.124 sh4/sh4core.h sh4/sh4dasm.c sh4/sh4dasm.h sh4/sh4mmio.c \
1.125 sh4/sh4mmio.h sh4/scif.c sh4/sh4stat.c sh4/sh4stat.h \
1.126 sh4/xltcache.c sh4/xltcache.h sh4/sh4.h sh4/dmac.h sh4/pmm.c \
1.127 - aica/armcore.c aica/armcore.h aica/armdasm.c aica/armdasm.h \
1.128 - aica/armmem.c aica/aica.c aica/aica.h aica/audio.c \
1.129 - aica/audio.h pvr2/pvr2.c pvr2/pvr2.h pvr2/pvr2mem.c \
1.130 - pvr2/pvr2mmio.h pvr2/tacore.c pvr2/rendsort.c pvr2/texcache.c \
1.131 - pvr2/yuv.c pvr2/rendsave.c pvr2/scene.c pvr2/scene.h \
1.132 - pvr2/gl_sl.c pvr2/gl_slsrc.c pvr2/glutil.c pvr2/glutil.h \
1.133 - pvr2/glrender.c pvr2/vertex.glsl pvr2/fragment.glsl \
1.134 - maple/maple.c maple/maple.h maple/controller.c maple/kbd.c \
1.135 - maple/mouse.c maple/lightgun.c loader.c loader.h elf.h \
1.136 - bootstrap.c bootstrap.h util.c gdlist.c gdlist.h display.c \
1.137 - display.h dckeysyms.h drivers/audio_null.c \
1.138 - drivers/video_null.c drivers/video_gl.c drivers/video_gl.h \
1.139 - drivers/gl_fbo.c sh4/sh4.def sh4/sh4core.in sh4/sh4x86.in \
1.140 - sh4/sh4dasm.in sh4/sh4stat.in $(am__append_1) $(am__append_3) \
1.141 - $(am__append_4) $(am__append_5) $(am__append_6) \
1.142 - $(am__append_7) $(am__append_8) $(am__append_9) \
1.143 - $(am__append_10) $(am__append_11) $(am__append_12) \
1.144 - $(am__append_13) $(am__append_14) $(am__append_15)
1.145 + sh4/cache.c sh4/mmu.h aica/armcore.c aica/armcore.h \
1.146 + aica/armdasm.c aica/armdasm.h aica/armmem.c aica/aica.c \
1.147 + aica/aica.h aica/audio.c aica/audio.h pvr2/pvr2.c pvr2/pvr2.h \
1.148 + pvr2/pvr2mem.c pvr2/pvr2mmio.h pvr2/tacore.c pvr2/rendsort.c \
1.149 + pvr2/texcache.c pvr2/yuv.c pvr2/rendsave.c pvr2/scene.c \
1.150 + pvr2/scene.h pvr2/gl_sl.c pvr2/gl_slsrc.c pvr2/glutil.c \
1.151 + pvr2/glutil.h pvr2/glrender.c pvr2/vertex.glsl \
1.152 + pvr2/fragment.glsl maple/maple.c maple/maple.h \
1.153 + maple/controller.c maple/kbd.c maple/mouse.c maple/lightgun.c \
1.154 + loader.c loader.h elf.h bootstrap.c bootstrap.h util.c \
1.155 + gdlist.c gdlist.h display.c display.h dckeysyms.h \
1.156 + drivers/audio_null.c drivers/video_null.c drivers/video_gl.c \
1.157 + drivers/video_gl.h drivers/gl_fbo.c sh4/sh4.def sh4/sh4core.in \
1.158 + sh4/sh4x86.in sh4/sh4dasm.in sh4/sh4stat.in $(am__append_1) \
1.159 + $(am__append_3) $(am__append_4) $(am__append_5) \
1.160 + $(am__append_6) $(am__append_7) $(am__append_8) \
1.161 + $(am__append_9) $(am__append_10) $(am__append_11) \
1.162 + $(am__append_12) $(am__append_13) $(am__append_14) \
1.163 + $(am__append_15)
1.164 @BUILD_SH4X86_TRUE@test_testsh4x86_LDADD = @GLIB_LIBS@ @GTK_LIBS@ @LIBPNG_LIBS@
1.165 @BUILD_SH4X86_TRUE@test_testsh4x86_SOURCES = test/testsh4x86.c x86dasm/x86dasm.c \
1.166 @BUILD_SH4X86_TRUE@ x86dasm/x86dasm.h x86dasm/i386-dis.c x86dasm/dis-init.c \
1.167 @@ -543,6 +545,7 @@
1.168 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_pulse.Po@am__quote@
1.169 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bios.Po@am__quote@
1.170 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bootstrap.Po@am__quote@
1.171 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cache.Po@am__quote@
1.172 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cd_linux.Po@am__quote@
1.173 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cd_none.Po@am__quote@
1.174 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cd_osx.Po@am__quote@
1.175 @@ -999,6 +1002,20 @@
1.176 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1.177 @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pmm.obj `if test -f 'sh4/pmm.c'; then $(CYGPATH_W) 'sh4/pmm.c'; else $(CYGPATH_W) '$(srcdir)/sh4/pmm.c'; fi`
1.178
1.179 +cache.o: sh4/cache.c
1.180 +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cache.o -MD -MP -MF "$(DEPDIR)/cache.Tpo" -c -o cache.o `test -f 'sh4/cache.c' || echo '$(srcdir)/'`sh4/cache.c; \
1.181 +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/cache.Tpo" "$(DEPDIR)/cache.Po"; else rm -f "$(DEPDIR)/cache.Tpo"; exit 1; fi
1.182 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sh4/cache.c' object='cache.o' libtool=no @AMDEPBACKSLASH@
1.183 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1.184 +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cache.o `test -f 'sh4/cache.c' || echo '$(srcdir)/'`sh4/cache.c
1.185 +
1.186 +cache.obj: sh4/cache.c
1.187 +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cache.obj -MD -MP -MF "$(DEPDIR)/cache.Tpo" -c -o cache.obj `if test -f 'sh4/cache.c'; then $(CYGPATH_W) 'sh4/cache.c'; else $(CYGPATH_W) '$(srcdir)/sh4/cache.c'; fi`; \
1.188 +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/cache.Tpo" "$(DEPDIR)/cache.Po"; else rm -f "$(DEPDIR)/cache.Tpo"; exit 1; fi
1.189 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sh4/cache.c' object='cache.obj' libtool=no @AMDEPBACKSLASH@
1.190 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1.191 +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cache.obj `if test -f 'sh4/cache.c'; then $(CYGPATH_W) 'sh4/cache.c'; else $(CYGPATH_W) '$(srcdir)/sh4/cache.c'; fi`
1.192 +
1.193 armcore.o: aica/armcore.c
1.194 @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT armcore.o -MD -MP -MF "$(DEPDIR)/armcore.Tpo" -c -o armcore.o `test -f 'aica/armcore.c' || echo '$(srcdir)/'`aica/armcore.c; \
1.195 @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/armcore.Tpo" "$(DEPDIR)/armcore.Po"; else rm -f "$(DEPDIR)/armcore.Tpo"; exit 1; fi
.