summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Fonseca <jfonseca@vmware.com>2011-03-11 16:33:18 -0700
committerJosé Fonseca <jfonseca@vmware.com>2011-03-15 15:32:00 +0000
commita946e840715b481065db2347696eea6bae0c9dd6 (patch)
tree2ca472b1f0d9a2e1bad3de3b44042e734354ba7c
parentd0e805ebd8fd492241e77c015ae7b2a0b7840869 (diff)
scons: copy hash_table.c, symbol_table.c to glsl directory
This fixes an issue where the .obj files wound up in the src/ directory rather than the build/ directory. That prevented combined 32-bit and 64-bit builds from working. Signed-off-by: Brian Paul <brianp@vmware.com>
-rw-r--r--src/glsl/SConscript9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/glsl/SConscript b/src/glsl/SConscript
index 9ecc155c9c..c3255835fb 100644
--- a/src/glsl/SConscript
+++ b/src/glsl/SConscript
@@ -105,11 +105,16 @@ if env['msvc']:
if env['crosscompile'] and env['platform'] != 'embedded':
Import('builtin_glsl_function')
else:
+ # Copy these files to avoid generation object files into src/mesa/program
+ env.Prepend(CPPPATH = ['#src/mesa/program'])
+ env.Command('hash_table.c', '#src/mesa/program/hash_table.c', Copy('$TARGET', '$SOURCE'))
+ env.Command('symbol_table.c', '#src/mesa/program/symbol_table.c', Copy('$TARGET', '$SOURCE'))
+
main_obj = env.StaticObject('main.cpp')
mesa_objs = env.StaticObject([
- '#src/mesa/program/hash_table.c',
- '#src/mesa/program/symbol_table.c',
+ 'hash_table.c',
+ 'symbol_table.c',
])
builtin_compiler = env.Program(