1.1 --- a/src/Makefile.in Mon Sep 13 10:13:42 2010 +1000
1.2 +++ b/src/Makefile.in Sun Oct 24 13:10:53 2010 +1000
1.3 @@ -157,45 +157,46 @@
1.4 aica/aica.c aica/aica.h aica/audio.c aica/audio.h pvr2/pvr2.c \
1.5 pvr2/pvr2.h pvr2/pvr2mem.c pvr2/pvr2mmio.h pvr2/tacore.c \
1.6 pvr2/rendsort.c pvr2/texcache.c pvr2/yuv.c pvr2/rendsave.c \
1.7 - pvr2/scene.c pvr2/scene.h pvr2/gl_sl.c pvr2/gl_slsrc.c \
1.8 - pvr2/glutil.c pvr2/glutil.h pvr2/glrender.c pvr2/vertex.glsl \
1.9 - pvr2/fragment.glsl maple/maple.c maple/maple.h \
1.10 - maple/controller.c maple/kbd.c maple/mouse.c maple/lightgun.c \
1.11 - maple/vmu.c loader.c loader.h elf.h bootstrap.c bootstrap.h \
1.12 - util.c gdlist.c gdlist.h vmu/vmuvol.c vmu/vmuvol.h \
1.13 - vmu/vmulist.c vmu/vmulist.h display.c display.h dckeysyms.h \
1.14 - drivers/audio_null.c drivers/video_null.c drivers/video_gl.c \
1.15 - drivers/video_gl.h drivers/gl_fbo.c drivers/serial_unix.c \
1.16 - drivers/cdrom/cdrom.h drivers/cdrom/cdrom.c \
1.17 - drivers/cdrom/drive.h drivers/cdrom/sector.h \
1.18 - drivers/cdrom/sector.c drivers/cdrom/defs.h \
1.19 - drivers/cdrom/cd_nrg.c drivers/cdrom/cd_cdi.c \
1.20 - drivers/cdrom/cd_gdi.c drivers/cdrom/edc_ecc.c \
1.21 - drivers/cdrom/ecc.h drivers/cdrom/drive.c \
1.22 - drivers/cdrom/edc_crctable.h drivers/cdrom/edc_encoder.h \
1.23 - drivers/cdrom/edc_l2sq.h drivers/cdrom/edc_scramble.h \
1.24 - drivers/cdrom/cd_mmc.c drivers/cdrom/isofs.h \
1.25 - drivers/cdrom/isofs.c sh4/sh4.def sh4/sh4core.in sh4/sh4x86.in \
1.26 - sh4/sh4dasm.in sh4/sh4stat.in hotkeys.c hotkeys.h plugin.c \
1.27 - plugin.h sh4/sh4x86.c xlat/x86/x86op.h xlat/x86/ia32abi.h \
1.28 - xlat/x86/amd64abi.h sh4/sh4trans.c sh4/sh4trans.h sh4/mmux86.c \
1.29 - x86dasm/x86dasm.c x86dasm/x86dasm.h x86dasm/i386-dis.c \
1.30 - x86dasm/dis-init.c x86dasm/dis-buf.c x86dasm/ansidecl.h \
1.31 - x86dasm/bfd.h x86dasm/dis-asm.h x86dasm/symcat.h \
1.32 - x86dasm/sysdep.h gtkui/gtkui.c gtkui/gtkui.h gtkui/gtk_win.c \
1.33 - gtkui/gtkcb.c gtkui/gtk_cfg.c gtkui/gtk_mmio.c \
1.34 - gtkui/gtk_debug.c gtkui/gtk_dump.c gtkui/gtk_ctrl.c \
1.35 - gtkui/gtk_gd.c drivers/io_glib.c drivers/video_gtk.c \
1.36 - cocoaui/cocoaui.m cocoaui/cocoaui.h cocoaui/cocoa_cfg.m \
1.37 - cocoaui/cocoa_win.m cocoaui/cocoa_gd.m cocoaui/cocoa_prefs.m \
1.38 - cocoaui/cocoa_ctrl.m cocoaui/paths_osx.m drivers/io_osx.m \
1.39 - drivers/video_osx.m drivers/mac_keymap.h \
1.40 - drivers/mac_keymap.txt paths_unix.c drivers/video_gdk.c \
1.41 - drivers/video_glx.c drivers/video_glx.h drivers/video_nsgl.m \
1.42 - drivers/video_nsgl.h drivers/audio_osx.m drivers/audio_sdl.c \
1.43 - drivers/audio_pulse.c drivers/audio_esd.c drivers/audio_alsa.c \
1.44 - drivers/input_lirc.c drivers/cdrom/cd_linux.c \
1.45 - drivers/cdrom/cd_osx.c drivers/osx_iokit.m drivers/osx_iokit.h \
1.46 + pvr2/scene.c pvr2/scene.h pvr2/gl_sl.c pvr2/shaders.h \
1.47 + pvr2/shaders.def pvr2/glutil.c pvr2/glutil.h pvr2/glrender.c \
1.48 + pvr2/vertex.glsl pvr2/fragment.glsl maple/maple.c \
1.49 + maple/maple.h maple/controller.c maple/kbd.c maple/mouse.c \
1.50 + maple/lightgun.c maple/vmu.c loader.c loader.h elf.h \
1.51 + bootstrap.c bootstrap.h util.c gdlist.c gdlist.h vmu/vmuvol.c \
1.52 + vmu/vmuvol.h vmu/vmulist.c vmu/vmulist.h display.c display.h \
1.53 + dckeysyms.h drivers/audio_null.c drivers/video_null.c \
1.54 + drivers/video_gl.c drivers/video_gl.h drivers/gl_fbo.c \
1.55 + drivers/serial_unix.c drivers/cdrom/cdrom.h \
1.56 + drivers/cdrom/cdrom.c drivers/cdrom/drive.h \
1.57 + drivers/cdrom/sector.h drivers/cdrom/sector.c \
1.58 + drivers/cdrom/defs.h drivers/cdrom/cd_nrg.c \
1.59 + drivers/cdrom/cd_cdi.c drivers/cdrom/cd_gdi.c \
1.60 + drivers/cdrom/edc_ecc.c drivers/cdrom/ecc.h \
1.61 + drivers/cdrom/drive.c drivers/cdrom/edc_crctable.h \
1.62 + drivers/cdrom/edc_encoder.h drivers/cdrom/edc_l2sq.h \
1.63 + drivers/cdrom/edc_scramble.h drivers/cdrom/cd_mmc.c \
1.64 + drivers/cdrom/isofs.h drivers/cdrom/isofs.c sh4/sh4.def \
1.65 + sh4/sh4core.in sh4/sh4x86.in sh4/sh4dasm.in sh4/sh4stat.in \
1.66 + hotkeys.c hotkeys.h plugin.c plugin.h sh4/sh4x86.c \
1.67 + xlat/x86/x86op.h xlat/x86/ia32abi.h xlat/x86/amd64abi.h \
1.68 + sh4/sh4trans.c sh4/sh4trans.h sh4/mmux86.c x86dasm/x86dasm.c \
1.69 + x86dasm/x86dasm.h x86dasm/i386-dis.c x86dasm/dis-init.c \
1.70 + x86dasm/dis-buf.c x86dasm/ansidecl.h x86dasm/bfd.h \
1.71 + x86dasm/dis-asm.h x86dasm/symcat.h x86dasm/sysdep.h \
1.72 + gtkui/gtkui.c gtkui/gtkui.h gtkui/gtk_win.c gtkui/gtkcb.c \
1.73 + gtkui/gtk_cfg.c gtkui/gtk_mmio.c gtkui/gtk_debug.c \
1.74 + gtkui/gtk_dump.c gtkui/gtk_ctrl.c gtkui/gtk_gd.c \
1.75 + drivers/io_glib.c drivers/video_gtk.c cocoaui/cocoaui.m \
1.76 + cocoaui/cocoaui.h cocoaui/cocoa_cfg.m cocoaui/cocoa_win.m \
1.77 + cocoaui/cocoa_gd.m cocoaui/cocoa_prefs.m cocoaui/cocoa_ctrl.m \
1.78 + cocoaui/paths_osx.m drivers/io_osx.m drivers/video_osx.m \
1.79 + drivers/mac_keymap.h drivers/mac_keymap.txt paths_unix.c \
1.80 + drivers/video_gdk.c drivers/video_glx.c drivers/video_glx.h \
1.81 + drivers/video_nsgl.m drivers/video_nsgl.h drivers/audio_osx.m \
1.82 + drivers/audio_sdl.c drivers/audio_pulse.c drivers/audio_esd.c \
1.83 + drivers/audio_alsa.c drivers/input_lirc.c \
1.84 + drivers/cdrom/cd_linux.c drivers/cdrom/cd_osx.c \
1.85 + drivers/osx_iokit.m drivers/osx_iokit.h \
1.86 drivers/cdrom/cd_none.c drivers/joy_linux.c \
1.88 @BUILD_SHARED_TRUE@am__objects_1 = lxdream-plugin.$(OBJEXT)
1.89 @@ -264,28 +265,28 @@
1.90 lxdream-tacore.$(OBJEXT) lxdream-rendsort.$(OBJEXT) \
1.91 lxdream-texcache.$(OBJEXT) lxdream-yuv.$(OBJEXT) \
1.92 lxdream-rendsave.$(OBJEXT) lxdream-scene.$(OBJEXT) \
1.93 - lxdream-gl_sl.$(OBJEXT) lxdream-gl_slsrc.$(OBJEXT) \
1.94 - lxdream-glutil.$(OBJEXT) lxdream-glrender.$(OBJEXT) \
1.95 - lxdream-maple.$(OBJEXT) lxdream-controller.$(OBJEXT) \
1.96 - lxdream-kbd.$(OBJEXT) lxdream-mouse.$(OBJEXT) \
1.97 - lxdream-lightgun.$(OBJEXT) lxdream-vmu.$(OBJEXT) \
1.98 - lxdream-loader.$(OBJEXT) lxdream-bootstrap.$(OBJEXT) \
1.99 - lxdream-util.$(OBJEXT) lxdream-gdlist.$(OBJEXT) \
1.100 - lxdream-vmuvol.$(OBJEXT) lxdream-vmulist.$(OBJEXT) \
1.101 - lxdream-display.$(OBJEXT) lxdream-audio_null.$(OBJEXT) \
1.102 - lxdream-video_null.$(OBJEXT) lxdream-video_gl.$(OBJEXT) \
1.103 - lxdream-gl_fbo.$(OBJEXT) lxdream-serial_unix.$(OBJEXT) \
1.104 - lxdream-cdrom.$(OBJEXT) lxdream-sector.$(OBJEXT) \
1.105 - lxdream-cd_nrg.$(OBJEXT) lxdream-cd_cdi.$(OBJEXT) \
1.106 - lxdream-cd_gdi.$(OBJEXT) lxdream-edc_ecc.$(OBJEXT) \
1.107 - lxdream-drive.$(OBJEXT) lxdream-cd_mmc.$(OBJEXT) \
1.108 - lxdream-isofs.$(OBJEXT) lxdream-hotkeys.$(OBJEXT) \
1.109 - $(am__objects_1) $(am__objects_2) $(am__objects_3) \
1.110 - $(am__objects_4) $(am__objects_5) $(am__objects_6) \
1.111 - $(am__objects_7) $(am__objects_8) $(am__objects_9) \
1.112 - $(am__objects_10) $(am__objects_11) $(am__objects_12) \
1.113 - $(am__objects_13) $(am__objects_14) $(am__objects_15) \
1.114 - $(am__objects_16) $(am__objects_17) $(am__objects_18)
1.115 + lxdream-gl_sl.$(OBJEXT) lxdream-glutil.$(OBJEXT) \
1.116 + lxdream-glrender.$(OBJEXT) lxdream-maple.$(OBJEXT) \
1.117 + lxdream-controller.$(OBJEXT) lxdream-kbd.$(OBJEXT) \
1.118 + lxdream-mouse.$(OBJEXT) lxdream-lightgun.$(OBJEXT) \
1.119 + lxdream-vmu.$(OBJEXT) lxdream-loader.$(OBJEXT) \
1.120 + lxdream-bootstrap.$(OBJEXT) lxdream-util.$(OBJEXT) \
1.121 + lxdream-gdlist.$(OBJEXT) lxdream-vmuvol.$(OBJEXT) \
1.122 + lxdream-vmulist.$(OBJEXT) lxdream-display.$(OBJEXT) \
1.123 + lxdream-audio_null.$(OBJEXT) lxdream-video_null.$(OBJEXT) \
1.124 + lxdream-video_gl.$(OBJEXT) lxdream-gl_fbo.$(OBJEXT) \
1.125 + lxdream-serial_unix.$(OBJEXT) lxdream-cdrom.$(OBJEXT) \
1.126 + lxdream-sector.$(OBJEXT) lxdream-cd_nrg.$(OBJEXT) \
1.127 + lxdream-cd_cdi.$(OBJEXT) lxdream-cd_gdi.$(OBJEXT) \
1.128 + lxdream-edc_ecc.$(OBJEXT) lxdream-drive.$(OBJEXT) \
1.129 + lxdream-cd_mmc.$(OBJEXT) lxdream-isofs.$(OBJEXT) \
1.130 + lxdream-hotkeys.$(OBJEXT) $(am__objects_1) $(am__objects_2) \
1.131 + $(am__objects_3) $(am__objects_4) $(am__objects_5) \
1.132 + $(am__objects_6) $(am__objects_7) $(am__objects_8) \
1.133 + $(am__objects_9) $(am__objects_10) $(am__objects_11) \
1.134 + $(am__objects_12) $(am__objects_13) $(am__objects_14) \
1.135 + $(am__objects_15) $(am__objects_16) $(am__objects_17) \
1.136 + $(am__objects_18)
1.137 lxdream_OBJECTS = $(am_lxdream_OBJECTS)
1.138 lxdream_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
1.139 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
1.140 @@ -544,10 +545,10 @@
1.141 AM_CFLAGS = -D__EXTENSIONS__ -D_BSD_SOURCE -D_GNU_SOURCE
1.142 TESTS = test/testxlt
1.143 BUILT_SOURCES = sh4/sh4core.c sh4/sh4dasm.c sh4/sh4x86.c sh4/sh4stat.c \
1.144 - pvr2/gl_slsrc.c drivers/mac_keymap.h version.c
1.145 + pvr2/shaders.def pvr2/shaders.h drivers/mac_keymap.h version.c
1.147 CLEANFILES = sh4/sh4core.c sh4/sh4dasm.c sh4/sh4x86.c sh4/sh4stat.c \
1.148 - pvr2/gl_slsrc.c drivers/mac_keymap.h version.c \
1.149 + pvr2/shaders.def pvr2/shaders.h drivers/mac_keymap.h version.c \
1.150 audio_alsa.lo audio_sdl.lo audio_esd.lo audio_pulse.lo input_lirc.lo \
1.153 @@ -576,8 +577,8 @@
1.154 aica/audio.c aica/audio.h pvr2/pvr2.c pvr2/pvr2.h \
1.155 pvr2/pvr2mem.c pvr2/pvr2mmio.h pvr2/tacore.c pvr2/rendsort.c \
1.156 pvr2/texcache.c pvr2/yuv.c pvr2/rendsave.c pvr2/scene.c \
1.157 - pvr2/scene.h pvr2/gl_sl.c pvr2/gl_slsrc.c pvr2/glutil.c \
1.158 - pvr2/glutil.h pvr2/glrender.c pvr2/vertex.glsl \
1.159 + pvr2/scene.h pvr2/gl_sl.c pvr2/shaders.h pvr2/shaders.def \
1.160 + pvr2/glutil.c pvr2/glutil.h pvr2/glrender.c pvr2/vertex.glsl \
1.161 pvr2/fragment.glsl maple/maple.c maple/maple.h \
1.162 maple/controller.c maple/kbd.c maple/mouse.c maple/lightgun.c \
1.163 maple/vmu.c loader.c loader.h elf.h bootstrap.c bootstrap.h \
1.164 @@ -816,7 +817,6 @@
1.165 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lxdream-gdrom.Po@am__quote@
1.166 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lxdream-gl_fbo.Po@am__quote@
1.167 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lxdream-gl_sl.Po@am__quote@
1.168 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lxdream-gl_slsrc.Po@am__quote@
1.169 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lxdream-glrender.Po@am__quote@
1.170 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lxdream-glutil.Po@am__quote@
1.171 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lxdream-gtk_cfg.Po@am__quote@
1.172 @@ -1663,20 +1663,6 @@
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-gl_sl.obj `if test -f 'pvr2/gl_sl.c'; then $(CYGPATH_W) 'pvr2/gl_sl.c'; else $(CYGPATH_W) '$(srcdir)/pvr2/gl_sl.c'; fi`
1.176 -lxdream-gl_slsrc.o: pvr2/gl_slsrc.c
1.177 -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lxdream_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lxdream-gl_slsrc.o -MD -MP -MF "$(DEPDIR)/lxdream-gl_slsrc.Tpo" -c -o lxdream-gl_slsrc.o `test -f 'pvr2/gl_slsrc.c' || echo '$(srcdir)/'`pvr2/gl_slsrc.c; \
1.178 -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/lxdream-gl_slsrc.Tpo" "$(DEPDIR)/lxdream-gl_slsrc.Po"; else rm -f "$(DEPDIR)/lxdream-gl_slsrc.Tpo"; exit 1; fi
1.179 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pvr2/gl_slsrc.c' object='lxdream-gl_slsrc.o' 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-gl_slsrc.o `test -f 'pvr2/gl_slsrc.c' || echo '$(srcdir)/'`pvr2/gl_slsrc.c
1.183 -lxdream-gl_slsrc.obj: pvr2/gl_slsrc.c
1.184 -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lxdream_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lxdream-gl_slsrc.obj -MD -MP -MF "$(DEPDIR)/lxdream-gl_slsrc.Tpo" -c -o lxdream-gl_slsrc.obj `if test -f 'pvr2/gl_slsrc.c'; then $(CYGPATH_W) 'pvr2/gl_slsrc.c'; else $(CYGPATH_W) '$(srcdir)/pvr2/gl_slsrc.c'; fi`; \
1.185 -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/lxdream-gl_slsrc.Tpo" "$(DEPDIR)/lxdream-gl_slsrc.Po"; else rm -f "$(DEPDIR)/lxdream-gl_slsrc.Tpo"; exit 1; fi
1.186 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pvr2/gl_slsrc.c' object='lxdream-gl_slsrc.obj' libtool=no @AMDEPBACKSLASH@
1.187 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1.188 -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lxdream_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lxdream-gl_slsrc.obj `if test -f 'pvr2/gl_slsrc.c'; then $(CYGPATH_W) 'pvr2/gl_slsrc.c'; else $(CYGPATH_W) '$(srcdir)/pvr2/gl_slsrc.c'; fi`
1.190 lxdream-glutil.o: pvr2/glutil.c
1.191 @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lxdream_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lxdream-glutil.o -MD -MP -MF "$(DEPDIR)/lxdream-glutil.Tpo" -c -o lxdream-glutil.o `test -f 'pvr2/glutil.c' || echo '$(srcdir)/'`pvr2/glutil.c; \
1.192 @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/lxdream-glutil.Tpo" "$(DEPDIR)/lxdream-glutil.Po"; else rm -f "$(DEPDIR)/lxdream-glutil.Tpo"; exit 1; fi
1.193 @@ -3193,9 +3179,10 @@
1.194 sh4/sh4stat.c: gendec sh4/sh4.def sh4/sh4stat.in
1.195 $(mkdir_p) `dirname $@`
1.196 ./gendec $(srcdir)/sh4/sh4.def $(srcdir)/sh4/sh4stat.in -o $@
1.197 -pvr2/gl_slsrc.c: genglsl pvr2/vertex.glsl pvr2/fragment.glsl
1.198 +pvr2/shaders.def: genglsl pvr2/shaders.glsl
1.199 $(mkdir_p) `dirname $@`
1.200 - ./genglsl $(srcdir)/pvr2/vertex.glsl $(srcdir)/pvr2/fragment.glsl $@
1.201 + ./genglsl $(srcdir)/pvr2/shaders.glsl $@
1.202 +pvr2/shaders.h: pvr2/shaders.def
1.203 drivers/mac_keymap.h: drivers/mac_keymap.txt drivers/genkeymap.pl
1.204 $(mkdir_p) `dirname $@`
1.205 $(srcdir)/drivers/genkeymap.pl mac $(srcdir)/drivers/mac_keymap.txt > $@
lxdream 0.9.1