filename | src/Makefile.in |
changeset | 1153:00e507e4025c |
prev | 1152:6464d890cc9e |
next | 1159:580436b01b6c |
author | nkeynes |
date | Thu Dec 23 18:14:29 2010 +1000 (11 years ago) |
permissions | -rw-r--r-- |
last change | Revert changes from r1151 that went in by accident (not ready from prime-time yet) |
file | annotate | diff | log | raw |
1.1 --- a/src/Makefile.in Thu Dec 23 17:50:10 2010 +10001.2 +++ b/src/Makefile.in Thu Dec 23 18:14:29 2010 +10001.3 @@ -155,18 +155,18 @@1.4 sh4/cache.c sh4/mmu.h sh4/shadow.c aica/armcore.c \1.5 aica/armcore.h aica/armdasm.c aica/armdasm.h aica/armmem.c \1.6 aica/aica.c aica/aica.h aica/audio.c aica/audio.h pvr2/pvr2.c \1.7 - pvr2/pvr2.h pvr2/pvr2mem.c pvr2/pvr2mmio.h pvr2/untile.c \1.8 - pvr2/tacore.c pvr2/rendsort.c pvr2/tileiter.h \1.9 - pvr2/shaders.glsl pvr2/texcache.c pvr2/yuv.c pvr2/rendsave.c \1.10 - pvr2/scene.c pvr2/scene.h pvr2/gl_sl.c pvr2/shaders.h \1.11 - pvr2/shaders.def pvr2/glutil.c pvr2/glutil.h pvr2/glrender.c \1.12 - maple/maple.c maple/maple.h maple/controller.c maple/kbd.c \1.13 - maple/mouse.c maple/lightgun.c maple/vmu.c loader.c loader.h \1.14 - elf.h bootstrap.c bootstrap.h util.c gdlist.c gdlist.h \1.15 - vmu/vmuvol.c vmu/vmuvol.h vmu/vmulist.c vmu/vmulist.h \1.16 - display.c display.h dckeysyms.h drivers/audio_null.c \1.17 - drivers/video_null.c drivers/video_gl.c drivers/video_gl.h \1.18 - drivers/gl_fbo.c drivers/serial_unix.c drivers/cdrom/cdrom.h \1.19 + pvr2/pvr2.h pvr2/pvr2mem.c pvr2/pvr2mmio.h pvr2/tacore.c \1.20 + pvr2/rendsort.c pvr2/tileiter.h pvr2/shaders.glsl \1.21 + pvr2/texcache.c pvr2/yuv.c pvr2/rendsave.c pvr2/scene.c \1.22 + pvr2/scene.h pvr2/gl_sl.c pvr2/shaders.h pvr2/shaders.def \1.23 + pvr2/glutil.c pvr2/glutil.h pvr2/glrender.c maple/maple.c \1.24 + maple/maple.h maple/controller.c maple/kbd.c maple/mouse.c \1.25 + maple/lightgun.c maple/vmu.c loader.c loader.h elf.h \1.26 + bootstrap.c bootstrap.h util.c gdlist.c gdlist.h vmu/vmuvol.c \1.27 + vmu/vmuvol.h vmu/vmulist.c vmu/vmulist.h display.c display.h \1.28 + dckeysyms.h drivers/audio_null.c drivers/video_null.c \1.29 + drivers/video_gl.c drivers/video_gl.h drivers/gl_fbo.c \1.30 + drivers/serial_unix.c drivers/cdrom/cdrom.h \1.31 drivers/cdrom/cdrom.c drivers/cdrom/drive.h \1.32 drivers/cdrom/sector.h drivers/cdrom/sector.c \1.33 drivers/cdrom/defs.h drivers/cdrom/cd_nrg.c \1.34 @@ -263,32 +263,31 @@1.35 lxdream-armdasm.$(OBJEXT) lxdream-armmem.$(OBJEXT) \1.36 lxdream-aica.$(OBJEXT) lxdream-audio.$(OBJEXT) \1.37 lxdream-pvr2.$(OBJEXT) lxdream-pvr2mem.$(OBJEXT) \1.38 - lxdream-untile.$(OBJEXT) lxdream-tacore.$(OBJEXT) \1.39 - lxdream-rendsort.$(OBJEXT) lxdream-texcache.$(OBJEXT) \1.40 - lxdream-yuv.$(OBJEXT) lxdream-rendsave.$(OBJEXT) \1.41 - lxdream-scene.$(OBJEXT) lxdream-gl_sl.$(OBJEXT) \1.42 - lxdream-glutil.$(OBJEXT) lxdream-glrender.$(OBJEXT) \1.43 - lxdream-maple.$(OBJEXT) lxdream-controller.$(OBJEXT) \1.44 - lxdream-kbd.$(OBJEXT) lxdream-mouse.$(OBJEXT) \1.45 - lxdream-lightgun.$(OBJEXT) lxdream-vmu.$(OBJEXT) \1.46 - lxdream-loader.$(OBJEXT) lxdream-bootstrap.$(OBJEXT) \1.47 - lxdream-util.$(OBJEXT) lxdream-gdlist.$(OBJEXT) \1.48 - lxdream-vmuvol.$(OBJEXT) lxdream-vmulist.$(OBJEXT) \1.49 - lxdream-display.$(OBJEXT) lxdream-audio_null.$(OBJEXT) \1.50 - lxdream-video_null.$(OBJEXT) lxdream-video_gl.$(OBJEXT) \1.51 - lxdream-gl_fbo.$(OBJEXT) lxdream-serial_unix.$(OBJEXT) \1.52 - lxdream-cdrom.$(OBJEXT) lxdream-sector.$(OBJEXT) \1.53 - lxdream-cd_nrg.$(OBJEXT) lxdream-cd_cdi.$(OBJEXT) \1.54 - lxdream-cd_gdi.$(OBJEXT) lxdream-edc_ecc.$(OBJEXT) \1.55 - lxdream-drive.$(OBJEXT) lxdream-cd_mmc.$(OBJEXT) \1.56 - lxdream-isofs.$(OBJEXT) lxdream-isomem.$(OBJEXT) \1.57 - lxdream-hotkeys.$(OBJEXT) $(am__objects_1) $(am__objects_2) \1.58 - $(am__objects_3) $(am__objects_4) $(am__objects_5) \1.59 - $(am__objects_6) $(am__objects_7) $(am__objects_8) \1.60 - $(am__objects_9) $(am__objects_10) $(am__objects_11) \1.61 - $(am__objects_12) $(am__objects_13) $(am__objects_14) \1.62 - $(am__objects_15) $(am__objects_16) $(am__objects_17) \1.63 - $(am__objects_18)1.64 + lxdream-tacore.$(OBJEXT) lxdream-rendsort.$(OBJEXT) \1.65 + lxdream-texcache.$(OBJEXT) lxdream-yuv.$(OBJEXT) \1.66 + lxdream-rendsave.$(OBJEXT) lxdream-scene.$(OBJEXT) \1.67 + lxdream-gl_sl.$(OBJEXT) lxdream-glutil.$(OBJEXT) \1.68 + lxdream-glrender.$(OBJEXT) lxdream-maple.$(OBJEXT) \1.69 + lxdream-controller.$(OBJEXT) lxdream-kbd.$(OBJEXT) \1.70 + lxdream-mouse.$(OBJEXT) lxdream-lightgun.$(OBJEXT) \1.71 + lxdream-vmu.$(OBJEXT) lxdream-loader.$(OBJEXT) \1.72 + lxdream-bootstrap.$(OBJEXT) lxdream-util.$(OBJEXT) \1.73 + lxdream-gdlist.$(OBJEXT) lxdream-vmuvol.$(OBJEXT) \1.74 + lxdream-vmulist.$(OBJEXT) lxdream-display.$(OBJEXT) \1.75 + lxdream-audio_null.$(OBJEXT) lxdream-video_null.$(OBJEXT) \1.76 + lxdream-video_gl.$(OBJEXT) lxdream-gl_fbo.$(OBJEXT) \1.77 + lxdream-serial_unix.$(OBJEXT) lxdream-cdrom.$(OBJEXT) \1.78 + lxdream-sector.$(OBJEXT) lxdream-cd_nrg.$(OBJEXT) \1.79 + lxdream-cd_cdi.$(OBJEXT) lxdream-cd_gdi.$(OBJEXT) \1.80 + lxdream-edc_ecc.$(OBJEXT) lxdream-drive.$(OBJEXT) \1.81 + lxdream-cd_mmc.$(OBJEXT) lxdream-isofs.$(OBJEXT) \1.82 + lxdream-isomem.$(OBJEXT) lxdream-hotkeys.$(OBJEXT) \1.83 + $(am__objects_1) $(am__objects_2) $(am__objects_3) \1.84 + $(am__objects_4) $(am__objects_5) $(am__objects_6) \1.85 + $(am__objects_7) $(am__objects_8) $(am__objects_9) \1.86 + $(am__objects_10) $(am__objects_11) $(am__objects_12) \1.87 + $(am__objects_13) $(am__objects_14) $(am__objects_15) \1.88 + $(am__objects_16) $(am__objects_17) $(am__objects_18)1.89 lxdream_OBJECTS = $(am_lxdream_OBJECTS)1.90 lxdream_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \1.91 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \1.92 @@ -577,35 +576,35 @@1.93 sh4/shadow.c aica/armcore.c aica/armcore.h aica/armdasm.c \1.94 aica/armdasm.h aica/armmem.c aica/aica.c aica/aica.h \1.95 aica/audio.c aica/audio.h pvr2/pvr2.c pvr2/pvr2.h \1.96 - pvr2/pvr2mem.c pvr2/pvr2mmio.h pvr2/untile.c pvr2/tacore.c \1.97 - pvr2/rendsort.c pvr2/tileiter.h pvr2/shaders.glsl \1.98 - pvr2/texcache.c pvr2/yuv.c pvr2/rendsave.c pvr2/scene.c \1.99 - pvr2/scene.h pvr2/gl_sl.c pvr2/shaders.h pvr2/shaders.def \1.100 - pvr2/glutil.c pvr2/glutil.h pvr2/glrender.c maple/maple.c \1.101 - maple/maple.h maple/controller.c maple/kbd.c maple/mouse.c \1.102 - maple/lightgun.c maple/vmu.c loader.c loader.h elf.h \1.103 - bootstrap.c bootstrap.h util.c gdlist.c gdlist.h vmu/vmuvol.c \1.104 - vmu/vmuvol.h vmu/vmulist.c vmu/vmulist.h display.c display.h \1.105 - dckeysyms.h drivers/audio_null.c drivers/video_null.c \1.106 - drivers/video_gl.c drivers/video_gl.h drivers/gl_fbo.c \1.107 - drivers/serial_unix.c drivers/cdrom/cdrom.h \1.108 - drivers/cdrom/cdrom.c drivers/cdrom/drive.h \1.109 - drivers/cdrom/sector.h drivers/cdrom/sector.c \1.110 - drivers/cdrom/defs.h drivers/cdrom/cd_nrg.c \1.111 - drivers/cdrom/cd_cdi.c drivers/cdrom/cd_gdi.c \1.112 - drivers/cdrom/edc_ecc.c drivers/cdrom/ecc.h \1.113 - drivers/cdrom/drive.c drivers/cdrom/edc_crctable.h \1.114 - drivers/cdrom/edc_encoder.h drivers/cdrom/edc_l2sq.h \1.115 - drivers/cdrom/edc_scramble.h drivers/cdrom/cd_mmc.c \1.116 - drivers/cdrom/isofs.h drivers/cdrom/isofs.c \1.117 - drivers/cdrom/isomem.c sh4/sh4.def sh4/sh4core.in \1.118 - sh4/sh4x86.in sh4/sh4dasm.in sh4/sh4stat.in hotkeys.c \1.119 - hotkeys.h $(am__append_1) $(am__append_2) $(am__append_4) \1.120 - $(am__append_5) $(am__append_6) $(am__append_7) \1.121 - $(am__append_8) $(am__append_9) $(am__append_10) \1.122 - $(am__append_17) $(am__append_19) $(am__append_21) \1.123 - $(am__append_23) $(am__append_25) $(am__append_27) \1.124 - $(am__append_28) $(am__append_29) $(am__append_30)1.125 + pvr2/pvr2mem.c pvr2/pvr2mmio.h pvr2/tacore.c pvr2/rendsort.c \1.126 + pvr2/tileiter.h pvr2/shaders.glsl pvr2/texcache.c pvr2/yuv.c \1.127 + pvr2/rendsave.c pvr2/scene.c pvr2/scene.h pvr2/gl_sl.c \1.128 + pvr2/shaders.h pvr2/shaders.def pvr2/glutil.c pvr2/glutil.h \1.129 + pvr2/glrender.c maple/maple.c maple/maple.h maple/controller.c \1.130 + maple/kbd.c maple/mouse.c maple/lightgun.c maple/vmu.c \1.131 + loader.c loader.h elf.h bootstrap.c bootstrap.h util.c \1.132 + gdlist.c gdlist.h vmu/vmuvol.c vmu/vmuvol.h vmu/vmulist.c \1.133 + vmu/vmulist.h display.c display.h dckeysyms.h \1.134 + drivers/audio_null.c drivers/video_null.c drivers/video_gl.c \1.135 + drivers/video_gl.h drivers/gl_fbo.c drivers/serial_unix.c \1.136 + drivers/cdrom/cdrom.h drivers/cdrom/cdrom.c \1.137 + drivers/cdrom/drive.h drivers/cdrom/sector.h \1.138 + drivers/cdrom/sector.c drivers/cdrom/defs.h \1.139 + drivers/cdrom/cd_nrg.c drivers/cdrom/cd_cdi.c \1.140 + drivers/cdrom/cd_gdi.c drivers/cdrom/edc_ecc.c \1.141 + drivers/cdrom/ecc.h drivers/cdrom/drive.c \1.142 + drivers/cdrom/edc_crctable.h drivers/cdrom/edc_encoder.h \1.143 + drivers/cdrom/edc_l2sq.h drivers/cdrom/edc_scramble.h \1.144 + drivers/cdrom/cd_mmc.c drivers/cdrom/isofs.h \1.145 + drivers/cdrom/isofs.c drivers/cdrom/isomem.c sh4/sh4.def \1.146 + sh4/sh4core.in sh4/sh4x86.in sh4/sh4dasm.in sh4/sh4stat.in \1.147 + hotkeys.c hotkeys.h $(am__append_1) $(am__append_2) \1.148 + $(am__append_4) $(am__append_5) $(am__append_6) \1.149 + $(am__append_7) $(am__append_8) $(am__append_9) \1.150 + $(am__append_10) $(am__append_17) $(am__append_19) \1.151 + $(am__append_21) $(am__append_23) $(am__append_25) \1.152 + $(am__append_27) $(am__append_28) $(am__append_29) \1.153 + $(am__append_30)1.154 lxdream_CPPFLAGS = @LXDREAMCPPFLAGS@1.155 @BUILD_SH4X86_TRUE@test_testsh4x86_LDADD = @LXDREAM_LIBS@ @GLIB_LIBS@ @GTK_LIBS@ @LIBPNG_LIBS@1.156 @BUILD_SH4X86_TRUE@test_testsh4x86_CPPFLAGS = @LXDREAMCPPFLAGS@1.157 @@ -879,7 +878,6 @@1.158 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lxdream-tacore.Po@am__quote@1.159 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lxdream-texcache.Po@am__quote@1.160 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lxdream-timer.Po@am__quote@1.161 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lxdream-untile.Po@am__quote@1.162 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lxdream-util.Po@am__quote@1.163 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lxdream-version.Po@am__quote@1.164 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lxdream-video_gdk.Po@am__quote@1.165 @@ -1570,20 +1568,6 @@1.166 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@1.167 @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lxdream_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lxdream-pvr2mem.obj `if test -f 'pvr2/pvr2mem.c'; then $(CYGPATH_W) 'pvr2/pvr2mem.c'; else $(CYGPATH_W) '$(srcdir)/pvr2/pvr2mem.c'; fi`1.169 -lxdream-untile.o: pvr2/untile.c1.170 -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lxdream_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lxdream-untile.o -MD -MP -MF "$(DEPDIR)/lxdream-untile.Tpo" -c -o lxdream-untile.o `test -f 'pvr2/untile.c' || echo '$(srcdir)/'`pvr2/untile.c; \1.171 -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/lxdream-untile.Tpo" "$(DEPDIR)/lxdream-untile.Po"; else rm -f "$(DEPDIR)/lxdream-untile.Tpo"; exit 1; fi1.172 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pvr2/untile.c' object='lxdream-untile.o' libtool=no @AMDEPBACKSLASH@1.173 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@1.174 -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lxdream_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lxdream-untile.o `test -f 'pvr2/untile.c' || echo '$(srcdir)/'`pvr2/untile.c1.175 -1.176 -lxdream-untile.obj: pvr2/untile.c1.177 -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lxdream_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lxdream-untile.obj -MD -MP -MF "$(DEPDIR)/lxdream-untile.Tpo" -c -o lxdream-untile.obj `if test -f 'pvr2/untile.c'; then $(CYGPATH_W) 'pvr2/untile.c'; else $(CYGPATH_W) '$(srcdir)/pvr2/untile.c'; fi`; \1.178 -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/lxdream-untile.Tpo" "$(DEPDIR)/lxdream-untile.Po"; else rm -f "$(DEPDIR)/lxdream-untile.Tpo"; exit 1; fi1.179 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pvr2/untile.c' object='lxdream-untile.obj' libtool=no @AMDEPBACKSLASH@1.180 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@1.181 -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lxdream_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lxdream-untile.obj `if test -f 'pvr2/untile.c'; then $(CYGPATH_W) 'pvr2/untile.c'; else $(CYGPATH_W) '$(srcdir)/pvr2/untile.c'; fi`1.182 -1.183 lxdream-tacore.o: pvr2/tacore.c1.184 @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lxdream_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lxdream-tacore.o -MD -MP -MF "$(DEPDIR)/lxdream-tacore.Tpo" -c -o lxdream-tacore.o `test -f 'pvr2/tacore.c' || echo '$(srcdir)/'`pvr2/tacore.c; \1.185 @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/lxdream-tacore.Tpo" "$(DEPDIR)/lxdream-tacore.Po"; else rm -f "$(DEPDIR)/lxdream-tacore.Tpo"; exit 1; fi
.