From: Jose Fonseca <jfonseca@vmware.com>
Date: Fri, 11 Mar 2011 23:33:18 +0000 (-0700)
Subject: scons: copy hash_table.c, symbol_table.c to glsl directory
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a946e840715b481065db2347696eea6bae0c9dd6;p=mesa.git

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>
---

diff --git a/src/glsl/SConscript b/src/glsl/SConscript
index 9ecc155c9c9..c3255835fb4 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(