Mesa (master): scons: copy hash_table.c, symbol_table.c to glsl directory
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Tue Mar 15 15:32:24 UTC 2011
Module: Mesa
Branch: master
Commit: a946e840715b481065db2347696eea6bae0c9dd6
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a946e840715b481065db2347696eea6bae0c9dd6
Author: Jose Fonseca <jfonseca at vmware.com>
Date: Fri Mar 11 16:33:18 2011 -0700
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 at vmware.com>
---
src/glsl/SConscript | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/glsl/SConscript b/src/glsl/SConscript
index 9ecc155..c325583 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(
More information about the mesa-commit
mailing list