diff options
| author | Jason Ekstrand <[email protected]> | 2015-08-14 17:25:04 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2015-08-17 11:25:03 -0700 |
| commit | 6a7ca4ef2cd3f39d3b5e77051cb3f3175e9e60df (patch) | |
| tree | d5413781ac9e9ecfc22cf403fa7465d6a7cadb34 /src/gallium/targets/dri/SConscript | |
| parent | b4c02253c4e1a7bc5a7a6369045210932f5de605 (diff) | |
| parent | d3e23f1ff915c01541f8df375b50b93b3da565a8 (diff) | |
Merge remote-tracking branch 'mesa-public/master' into vulkan
Diffstat (limited to 'src/gallium/targets/dri/SConscript')
| -rw-r--r-- | src/gallium/targets/dri/SConscript | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/gallium/targets/dri/SConscript b/src/gallium/targets/dri/SConscript index a51ed564344..2fb0da09200 100644 --- a/src/gallium/targets/dri/SConscript +++ b/src/gallium/targets/dri/SConscript @@ -25,11 +25,12 @@ if env['llvm']: env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE') env.Prepend(LIBS = [llvmpipe]) +env.PkgUseModules('DRM') + env.Append(CPPDEFINES = [ 'GALLIUM_VMWGFX', 'GALLIUM_SOFTPIPE', 'DRI_TARGET', - 'HAVE_LIBDRM', ]) env.Prepend(LIBS = [ @@ -37,7 +38,6 @@ env.Prepend(LIBS = [ svgadrm, svga, ws_dri, - ws_kms_dri, softpipe, libloader, mesautil, @@ -58,9 +58,6 @@ module = env.LoadableModule( env.Command('vmwgfx_dri.so', 'gallium_dri.so', "ln -f ${SOURCE} ${TARGET}") # swrast_dri.so env.Command('swrast_dri.so', 'gallium_dri.so', "ln -f ${SOURCE} ${TARGET}") -# kms_swrast_dri.so -env.Command('kms_swrast_dri.so', 'gallium_dri.so', "ln -f ${SOURCE} ${TARGET}") env.Alias('dri-vmwgfx', module) env.Alias('dri-swrast', module) -env.Alias('dri-kms-swrast', module) |