From 66d77cd71c6359cddfd21c128afe95bad860e231 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Wed, 8 Jul 2015 01:44:31 +0100 Subject: scons: don't build the kms-dri winsys Same as previous commit - unused (gbm is not a thing outside the autotools build). v2: Remove trailing HAVE_LIBDRM. Signed-off-by: Emil Velikov --- src/gallium/targets/dri/SConscript | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/gallium/targets/dri/SConscript') diff --git a/src/gallium/targets/dri/SConscript b/src/gallium/targets/dri/SConscript index a51ed564344..8d29f3beb18 100644 --- a/src/gallium/targets/dri/SConscript +++ b/src/gallium/targets/dri/SConscript @@ -29,7 +29,6 @@ env.Append(CPPDEFINES = [ 'GALLIUM_VMWGFX', 'GALLIUM_SOFTPIPE', 'DRI_TARGET', - 'HAVE_LIBDRM', ]) env.Prepend(LIBS = [ @@ -37,7 +36,6 @@ env.Prepend(LIBS = [ svgadrm, svga, ws_dri, - ws_kms_dri, softpipe, libloader, mesautil, @@ -58,9 +56,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) -- cgit v1.2.3 From c0731a1b14dc7385f4238b4508b88bfca2ef43cf Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Wed, 22 Jul 2015 16:04:28 +0100 Subject: targets/dri: scons: add missing link against libdrm Otherwise the final dri module will have (additional) unresolved symbols. Cc: Brian Paul Signed-off-by: Emil Velikov Reviwed-by: Jose Fonseca --- src/gallium/targets/dri/SConscript | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/gallium/targets/dri/SConscript') diff --git a/src/gallium/targets/dri/SConscript b/src/gallium/targets/dri/SConscript index 8d29f3beb18..2fb0da09200 100644 --- a/src/gallium/targets/dri/SConscript +++ b/src/gallium/targets/dri/SConscript @@ -25,6 +25,8 @@ if env['llvm']: env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE') env.Prepend(LIBS = [llvmpipe]) +env.PkgUseModules('DRM') + env.Append(CPPDEFINES = [ 'GALLIUM_VMWGFX', 'GALLIUM_SOFTPIPE', -- cgit v1.2.3