From 24f984f64ae58c274f79eaf9148aea37df67131c Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Mon, 18 Jan 2016 11:35:29 +0200 Subject: nir: move glsl_types.{cpp,h} to compiler Allows us to remove the SCons workaround :-) Signed-off-by: Emil Velikov Acked-by: Matt Turner Acked-by: Jose Fonseca --- src/glsl/SConscript | 7 ------- 1 file changed, 7 deletions(-) (limited to 'src/glsl/SConscript') diff --git a/src/glsl/SConscript b/src/glsl/SConscript index e89d4e0eb01..ef82a9d317a 100644 --- a/src/glsl/SConscript +++ b/src/glsl/SConscript @@ -16,7 +16,6 @@ env.Prepend(CPPPATH = [ '#src/gallium/include', '#src/gallium/auxiliary', '#src/glsl', - '#src/glsl/nir', '#src/glsl/glcpp', ]) @@ -61,12 +60,6 @@ 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]) -- cgit v1.2.3