Search
lxdream.org :: lxdream/src/Makefile.am :: diff
lxdream 0.9.1
released Jun 29
Download Now
filename src/Makefile.am
changeset 1130:5f56fc931112
prev1125:9dd5dee45db9
next1145:45674791c6ad
author nkeynes
date Fri Sep 17 20:08:50 2010 +1000 (9 years ago)
permissions -rw-r--r--
last change Refactor shader management to support multiple programs, which are all
defined in the shaders.glsl, rather than split up into one file per
fragment.
file annotate diff log raw
1.1 --- a/src/Makefile.am Mon Sep 13 10:13:42 2010 +1000
1.2 +++ b/src/Makefile.am Fri Sep 17 20:08:50 2010 +1000
1.3 @@ -27,9 +27,9 @@
1.4
1.5 TESTS = test/testxlt
1.6 BUILT_SOURCES = sh4/sh4core.c sh4/sh4dasm.c sh4/sh4x86.c sh4/sh4stat.c \
1.7 - pvr2/gl_slsrc.c drivers/mac_keymap.h version.c
1.8 + pvr2/shaders.def pvr2/shaders.h drivers/mac_keymap.h version.c
1.9 CLEANFILES = sh4/sh4core.c sh4/sh4dasm.c sh4/sh4x86.c sh4/sh4stat.c \
1.10 - pvr2/gl_slsrc.c drivers/mac_keymap.h version.c \
1.11 + pvr2/shaders.def pvr2/shaders.h drivers/mac_keymap.h version.c \
1.12 audio_alsa.lo audio_sdl.lo audio_esd.lo audio_pulse.lo input_lirc.lo \
1.13 lxdream_dummy.lo
1.14
1.15 @@ -58,7 +58,7 @@
1.16 pvr2/pvr2.c pvr2/pvr2.h pvr2/pvr2mem.c pvr2/pvr2mmio.h \
1.17 pvr2/tacore.c pvr2/rendsort.c \
1.18 pvr2/texcache.c pvr2/yuv.c pvr2/rendsave.c pvr2/scene.c pvr2/scene.h \
1.19 - pvr2/gl_sl.c pvr2/gl_slsrc.c pvr2/glutil.c pvr2/glutil.h pvr2/glrender.c \
1.20 + pvr2/gl_sl.c pvr2/shaders.h pvr2/shaders.def pvr2/glutil.c pvr2/glutil.h pvr2/glrender.c \
1.21 pvr2/vertex.glsl pvr2/fragment.glsl \
1.22 maple/maple.c maple/maple.h \
1.23 maple/controller.c maple/kbd.c maple/mouse.c maple/lightgun.c maple/vmu.c \
1.24 @@ -254,9 +254,10 @@
1.25 sh4/sh4stat.c: gendec sh4/sh4.def sh4/sh4stat.in
1.26 $(mkdir_p) `dirname $@`
1.27 ./gendec $(srcdir)/sh4/sh4.def $(srcdir)/sh4/sh4stat.in -o $@
1.28 -pvr2/gl_slsrc.c: genglsl pvr2/vertex.glsl pvr2/fragment.glsl
1.29 +pvr2/shaders.def: genglsl pvr2/shaders.glsl
1.30 $(mkdir_p) `dirname $@`
1.31 - ./genglsl $(srcdir)/pvr2/vertex.glsl $(srcdir)/pvr2/fragment.glsl $@
1.32 + ./genglsl $(srcdir)/pvr2/shaders.glsl $@
1.33 +pvr2/shaders.h: pvr2/shaders.def
1.34 drivers/mac_keymap.h: drivers/mac_keymap.txt drivers/genkeymap.pl
1.35 $(mkdir_p) `dirname $@`
1.36 $(srcdir)/drivers/genkeymap.pl mac $(srcdir)/drivers/mac_keymap.txt > $@
.