diff options
| author | Emil Velikov <emil.velikov@collabora.com> | 2016-05-16 18:55:08 +0100 |
|---|---|---|
| committer | Rob Clark <robclark@freedesktop.org> | 2016-05-17 14:22:46 -0400 |
| commit | 52addd90d1406f9b156a384fe8b98dee27aeddf6 (patch) | |
| tree | 8849803a15b2839df0b74d2212bff4390f6cb095 | |
| parent | 265487aedfabbcfb073f9d6053d1ceb510b78b27 (diff) | |
| download | external_mesa3d-52addd90d1406f9b156a384fe8b98dee27aeddf6.zip external_mesa3d-52addd90d1406f9b156a384fe8b98dee27aeddf6.tar.gz external_mesa3d-52addd90d1406f9b156a384fe8b98dee27aeddf6.tar.bz2 | |
scons: gallium: link against nir as needed
... otherwise we'll produce uncomplete binaries with introduction of NIR
as alternative IR with next commits.
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Acked-by: Jose Fonseca <jfonseca@vmware.com>
| -rw-r--r-- | src/gallium/targets/dri/SConscript | 1 | ||||
| -rw-r--r-- | src/gallium/targets/haiku-softpipe/SConscript | 1 | ||||
| -rw-r--r-- | src/gallium/targets/libgl-gdi/SConscript | 2 | ||||
| -rw-r--r-- | src/gallium/targets/libgl-xlib/SConscript | 1 | ||||
| -rw-r--r-- | src/gallium/targets/osmesa/SConscript | 1 |
5 files changed, 5 insertions, 1 deletions
diff --git a/src/gallium/targets/dri/SConscript b/src/gallium/targets/dri/SConscript index bf3baa7..d7a8cbd 100644 --- a/src/gallium/targets/dri/SConscript +++ b/src/gallium/targets/dri/SConscript @@ -44,6 +44,7 @@ env.Prepend(LIBS = [ compiler, mesa, glsl, + nir, gallium, megadrivers_stub, dri_common, diff --git a/src/gallium/targets/haiku-softpipe/SConscript b/src/gallium/targets/haiku-softpipe/SConscript index b7c1373..f80c167 100644 --- a/src/gallium/targets/haiku-softpipe/SConscript +++ b/src/gallium/targets/haiku-softpipe/SConscript @@ -9,6 +9,7 @@ env.Prepend(LIBS = [ compiler, mesa, glsl, + nir, gallium ]) diff --git a/src/gallium/targets/libgl-gdi/SConscript b/src/gallium/targets/libgl-gdi/SConscript index 3a63e3e..53284e5 100644 --- a/src/gallium/targets/libgl-gdi/SConscript +++ b/src/gallium/targets/libgl-gdi/SConscript @@ -50,7 +50,7 @@ if env['gles']: opengl32 = env.SharedLibrary( target ='opengl32', source = sources, - LIBS = wgl + ws_gdi + glapi + compiler + mesa + drivers + gallium + glsl + env['LIBS'], + LIBS = wgl + ws_gdi + glapi + compiler + mesa + drivers + gallium + glsl + nir + env['LIBS'], ) env.Alias('opengl32', opengl32) diff --git a/src/gallium/targets/libgl-xlib/SConscript b/src/gallium/targets/libgl-xlib/SConscript index 1c816ff..0a4f31b 100644 --- a/src/gallium/targets/libgl-xlib/SConscript +++ b/src/gallium/targets/libgl-xlib/SConscript @@ -32,6 +32,7 @@ env.Prepend(LIBS = [ compiler, mesa, glsl, + nir, gallium, ]) diff --git a/src/gallium/targets/osmesa/SConscript b/src/gallium/targets/osmesa/SConscript index eeaacbc..7a2a00c 100644 --- a/src/gallium/targets/osmesa/SConscript +++ b/src/gallium/targets/osmesa/SConscript @@ -17,6 +17,7 @@ env.Prepend(LIBS = [ gallium, trace, glsl, + nir, mesautil, softpipe ]) |