31d91f019b
The SCons build broke with commit ba975140d3 because a SPIR-V
function is called from Mesa main. This adds a convenience library for
SPIR-V and adds it to everything that was including nir. It also adds
both nir and spirv to drivers/x11/SConscript.
Also add nir/spirv modules to osmesa and libgl-gdi targets. (Brian Paul)
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105817
Reviewed-by: Brian Paul <brianp@vmware.com>
Tested-by: Brian Paul <brianp@vmware.com>
31 lines
651 B
Python
31 lines
651 B
Python
Import('*')
|
|
|
|
env = env.Clone()
|
|
|
|
env.MSVC2013Compat()
|
|
|
|
env.Prepend(CPPPATH = [
|
|
'#include',
|
|
'#src',
|
|
'#src/mapi',
|
|
'#src/mesa',
|
|
'#src/gallium/include',
|
|
'#src/gallium/auxiliary',
|
|
])
|
|
|
|
# Make generated headers reachable from the include path.
|
|
env.Prepend(CPPPATH = [Dir('.').abspath, Dir('glsl').abspath])
|
|
env.Prepend(CPPPATH = [Dir('.').abspath, Dir('nir').abspath])
|
|
|
|
sources = env.ParseSourceList('Makefile.sources', 'LIBCOMPILER_FILES')
|
|
|
|
compiler = env.ConvenienceLibrary(
|
|
target = 'compiler',
|
|
source = sources
|
|
)
|
|
Export('compiler')
|
|
|
|
SConscript('SConscript.glsl')
|
|
SConscript('SConscript.nir')
|
|
SConscript('SConscript.spirv')
|