diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2015-07-08 01:44:31 +0100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2015-07-22 16:35:25 +0100 |
| commit | 66d77cd71c6359cddfd21c128afe95bad860e231 (patch) | |
| tree | 3569697090befe4e0117b6db18b07a5183045e33 /src/gallium | |
| parent | a29a8b92ff05f3a63dd3b6ae8c7d0e07f039c0ad (diff) | |
| download | external_mesa3d-66d77cd71c6359cddfd21c128afe95bad860e231.zip external_mesa3d-66d77cd71c6359cddfd21c128afe95bad860e231.tar.gz external_mesa3d-66d77cd71c6359cddfd21c128afe95bad860e231.tar.bz2 | |
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 <emil.l.velikov@gmail.com>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/SConscript | 1 | ||||
| -rw-r--r-- | src/gallium/state_trackers/dri/SConscript | 1 | ||||
| -rw-r--r-- | src/gallium/targets/dri/SConscript | 5 | ||||
| -rw-r--r-- | src/gallium/winsys/sw/kms-dri/SConscript | 23 |
4 files changed, 0 insertions, 30 deletions
diff --git a/src/gallium/SConscript b/src/gallium/SConscript index eeb1c78..fa5fa6e 100644 --- a/src/gallium/SConscript +++ b/src/gallium/SConscript @@ -46,7 +46,6 @@ if env['platform'] == 'haiku': if env['dri']: SConscript([ 'winsys/sw/dri/SConscript', - 'winsys/sw/kms-dri/SConscript', 'winsys/svga/drm/SConscript', ]) diff --git a/src/gallium/state_trackers/dri/SConscript b/src/gallium/state_trackers/dri/SConscript index 7a7060c..657300b 100644 --- a/src/gallium/state_trackers/dri/SConscript +++ b/src/gallium/state_trackers/dri/SConscript @@ -17,7 +17,6 @@ env.Append(CPPPATH = [ env.Append(CPPDEFINES = [ ('GALLIUM_STATIC_TARGETS', '1'), - 'GALLIUM_SOFTPIPE', ]) sources = env.ParseSourceList('Makefile.sources', 'common_SOURCES') diff --git a/src/gallium/targets/dri/SConscript b/src/gallium/targets/dri/SConscript index a51ed56..8d29f3b 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) diff --git a/src/gallium/winsys/sw/kms-dri/SConscript b/src/gallium/winsys/sw/kms-dri/SConscript deleted file mode 100644 index e7dd721..0000000 --- a/src/gallium/winsys/sw/kms-dri/SConscript +++ /dev/null @@ -1,23 +0,0 @@ -####################################################################### -# SConscript for kms-dri winsys - - -Import('*') - -if env['platform'] not in ('linux'): - Return() - -env = env.Clone() - -env.PkgUseModules('DRM') - -env.Append(CPPPATH = [ - '#/src/gallium/include', - '#/src/gallium/auxiliary', -]) - -ws_kms_dri = env.ConvenienceLibrary( - target = 'ws_kms_dri', - source = env.ParseSourceList('Makefile.sources', 'C_SOURCES'), -) -Export('ws_kms_dri') |