diff options
| author | Jose Fonseca <[email protected]> | 2015-10-19 14:29:28 +0100 |
|---|---|---|
| committer | Jose Fonseca <[email protected]> | 2015-10-19 15:59:59 +0100 |
| commit | b23a4859f4dbbcca7d6a637010167d470211e45b (patch) | |
| tree | 6e47c0a14c1766befc7c051a1e69a5d2700e4a92 /src/glsl | |
| parent | 530eb39c71d2f42ef5d6c556aff77c322434f4e2 (diff) | |
scons: Build nir/glsl_types.cpp once.
Undoes early hacks, and ensures nir/glsl_types.cpp is built once, and
only once.
The root problem is that SCons doesn't know about NIR nor any source
file in the NIR_FILES source list.
Tested with libgl-gdi and libgl-xlib scons targets.
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/glsl')
| -rw-r--r-- | src/glsl/SConscript | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/glsl/SConscript b/src/glsl/SConscript index 927cbdcdb78..70bf5b09c3c 100644 --- a/src/glsl/SConscript +++ b/src/glsl/SConscript @@ -61,6 +61,12 @@ source_lists = env.ParseSourceList('Makefile.sources') for l in ('LIBGLCPP_FILES', 'LIBGLSL_FILES'): glsl_sources += source_lists[l] +# add nir/glsl_types.cpp manually, because SCons still doesn't know about NIR. +# XXX: Remove this once we build NIR and NIR_FILES. +glsl_sources += [ + 'nir/glsl_types.cpp', +] + if env['msvc']: env.Prepend(CPPPATH = ['#/src/getopt']) env.PrependUnique(LIBS = [getopt]) @@ -81,7 +87,6 @@ mesa_objs = env.StaticObject([ 'prog_hash_table.c', 'symbol_table.c', 'dummy_errors.c', - 'nir/glsl_types.cpp', ]) compiler_objs += mesa_objs |