diff options
| author | Jordan Justen <jordan.l.justen@intel.com> | 2012-11-30 16:32:11 -0800 |
|---|---|---|
| committer | Jordan Justen <jordan.l.justen@intel.com> | 2012-12-07 14:46:18 -0800 |
| commit | 59284bc44a3f30ec18192098a4e1e43b6c6d392a (patch) | |
| tree | 3b329722485258ba74640f31bdbe8830b51d4488 /src/glsl/SConscript | |
| parent | 970ec8dbc3491615964808ce1563d34d08e806cb (diff) | |
| download | external_mesa3d-59284bc44a3f30ec18192098a4e1e43b6c6d392a.zip external_mesa3d-59284bc44a3f30ec18192098a4e1e43b6c6d392a.tar.gz external_mesa3d-59284bc44a3f30ec18192098a4e1e43b6c6d392a.tar.bz2 | |
program/hash_table.c: rename to program/prog_hash_table.c
Removes a collision of the object file name for main/hash_table
and program/hash_table.
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (limited to 'src/glsl/SConscript')
| -rw-r--r-- | src/glsl/SConscript | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/glsl/SConscript b/src/glsl/SConscript index 0cf25c0..38de60d 100644 --- a/src/glsl/SConscript +++ b/src/glsl/SConscript @@ -58,13 +58,13 @@ if env['crosscompile'] and not env['embedded']: 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('prog_hash_table.c', '#src/mesa/program/prog_hash_table.c', Copy('$TARGET', '$SOURCE')) env.Command('symbol_table.c', '#src/mesa/program/symbol_table.c', Copy('$TARGET', '$SOURCE')) compiler_objs = env.StaticObject(source_lists['GLSL_COMPILER_CXX_FILES']) mesa_objs = env.StaticObject([ - 'hash_table.c', + 'prog_hash_table.c', 'symbol_table.c', ]) |