diff options
author | Joakim Sindholt <opensource@zhasha.com> | 2009-10-05 19:25:04 +0200 |
---|---|---|
committer | Joakim Sindholt <opensource@zhasha.com> | 2009-10-05 19:25:04 +0200 |
commit | 1f39d59a2996e2acf6893a8dd1a0293bd8790cc2 (patch) | |
tree | e675586dd2c3be3fa72bd22a7a8c12fea7059b85 /src/gallium/drivers/r300/SConscript | |
parent | 6971be783b970f882e873fa40e2dccde4137201f (diff) |
r300g: fix scons build
So I didn't touch r300compiler, but r300g now compiles after having
declarations and code untangled. As nha so gently points out, we shouldn't
have to do this just to comply with MSVC compilers.
Diffstat (limited to 'src/gallium/drivers/r300/SConscript')
-rw-r--r-- | src/gallium/drivers/r300/SConscript | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/gallium/drivers/r300/SConscript b/src/gallium/drivers/r300/SConscript index 493d7b28bc..b4c8ba2015 100644 --- a/src/gallium/drivers/r300/SConscript +++ b/src/gallium/drivers/r300/SConscript @@ -1,6 +1,10 @@ Import('*') +r300compiler = SConscript('#/src/mesa/drivers/dri/r300/compiler/SConscript') + env = env.Clone() +# add the paths for r300compiler +env.Append(CPPPATH = ['#/src/mesa/drivers/dri/r300/compiler', '#/include', '#/src/mesa']) r300 = env.ConvenienceLibrary( target = 'r300', @@ -23,7 +27,8 @@ r300 = env.ConvenienceLibrary( 'r300_vs.c', 'r300_surface.c', 'r300_texture.c', - ]) + 'r300_tgsi_to_rc.c', + ] + r300compiler) + r300compiler Export('r300') |