summaryrefslogtreecommitdiff
path: root/src/gallium
diff options
context:
space:
mode:
authorJose Fonseca <jose.r.fonseca@gmail.com>2021-03-19 20:08:54 +0000
committerMarge Bot <eric+marge@anholt.net>2021-03-20 10:38:55 +0000
commit6e6cd7d93cc54fc8c279377c2d552761f4457174 (patch)
tree9a4aeaca6cb9effd78d5ce36807fe7feaba27ee2 /src/gallium
parent85c1770044830fe2fcfb93c84df342706b7a8f38 (diff)
scons: Remove.
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9720>
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/SConscript56
-rw-r--r--src/gallium/auxiliary/SConscript64
-rw-r--r--src/gallium/auxiliary/pipe-loader/SConscript32
-rw-r--r--src/gallium/drivers/llvmpipe/SConscript46
-rw-r--r--src/gallium/drivers/softpipe/SConscript18
-rw-r--r--src/gallium/drivers/svga/SConscript27
-rw-r--r--src/gallium/frontends/dri/SConscript29
-rw-r--r--src/gallium/frontends/glx/xlib/SConscript18
-rw-r--r--src/gallium/frontends/hgl/SConscript24
-rw-r--r--src/gallium/frontends/osmesa/SConscript24
-rw-r--r--src/gallium/frontends/wgl/SConscript24
-rw-r--r--src/gallium/targets/dri/SConscript59
-rw-r--r--src/gallium/targets/haiku-softpipe/SConscript47
-rw-r--r--src/gallium/targets/libgl-gdi/SConscript55
-rw-r--r--src/gallium/targets/libgl-xlib/SConscript72
-rw-r--r--src/gallium/winsys/sw/gdi/SConscript24
-rw-r--r--src/gallium/winsys/sw/hgl/SConscript24
-rw-r--r--src/gallium/winsys/sw/null/SConscript19
-rw-r--r--src/gallium/winsys/sw/wrapper/SConscript18
-rw-r--r--src/gallium/winsys/sw/xlib/SConscript21
20 files changed, 0 insertions, 701 deletions
diff --git a/src/gallium/SConscript b/src/gallium/SConscript
deleted file mode 100644
index 98ba88588d5..00000000000
--- a/src/gallium/SConscript
+++ /dev/null
@@ -1,56 +0,0 @@
-Import('env')
-
-#
-# Auxiliary modules
-#
-
-SConscript('auxiliary/SConscript')
-SConscript('auxiliary/pipe-loader/SConscript')
-
-#
-# Drivers
-#
-
-# These are common and work across all platforms
-SConscript([
- 'drivers/llvmpipe/SConscript',
- 'drivers/softpipe/SConscript',
- 'drivers/svga/SConscript',
-])
-
-#
-# Winsys
-#
-
-SConscript([
- 'winsys/sw/null/SConscript',
- 'winsys/sw/wrapper/SConscript',
-])
-
-if env['x11']:
- SConscript([
- 'winsys/sw/xlib/SConscript',
- ])
-
-if env['platform'] == 'windows':
- SConscript([
- 'winsys/sw/gdi/SConscript',
- ])
-
-
-#
-# Frontends and targets
-#
-
-if not env['embedded']:
- if env['x11']:
- SConscript([
- 'frontends/glx/xlib/SConscript',
- 'targets/libgl-xlib/SConscript',
- ])
-
- if env['platform'] == 'windows':
- SConscript([
- 'frontends/wgl/SConscript',
- 'targets/libgl-gdi/SConscript',
- ])
diff --git a/src/gallium/auxiliary/SConscript b/src/gallium/auxiliary/SConscript
deleted file mode 100644
index 69aeeb8c524..00000000000
--- a/src/gallium/auxiliary/SConscript
+++ /dev/null
@@ -1,64 +0,0 @@
-Import('*')
-
-from sys import executable as python_cmd
-
-env.Append(CPPPATH = [
- '#src',
- 'indices',
- 'util',
- '#src/compiler/nir',
- '../../compiler/nir',
-])
-
-env = env.Clone()
-
-env.MSVC2013Compat()
-
-env.CodeGenerate(
- target = 'indices/u_indices_gen.c',
- script = 'indices/u_indices_gen.py',
- source = [],
- command = python_cmd + ' $SCRIPT > $TARGET'
-)
-
-env.CodeGenerate(
- target = 'indices/u_unfilled_gen.c',
- script = 'indices/u_unfilled_gen.py',
- source = [],
- command = python_cmd + ' $SCRIPT > $TARGET'
-)
-
-env.CodeGenerate(
- target = 'util/u_tracepoints.c',
- script = 'util/u_tracepoints.py',
- source = [],
- command = python_cmd + ' $SCRIPT -p ' + Dir('#').abspath + '/src/gallium/auxiliary/util -C $TARGET'
-)
-
-env.CodeGenerate(
- target = 'util/u_tracepoints.h',
- script = 'util/u_tracepoints.py',
- source = [],
- command = python_cmd + ' $SCRIPT -p ' + Dir('#').abspath + '/src/gallium/auxiliary/util -H $TARGET'
-)
-
-source = env.ParseSourceList('Makefile.sources', [
- 'C_SOURCES',
- 'NIR_SOURCES',
- 'VL_STUB_SOURCES',
- 'GENERATED_SOURCES'
-])
-
-if env['llvm']:
- source += env.ParseSourceList('Makefile.sources', [
- 'GALLIVM_SOURCES',
- ])
-
-gallium = env.ConvenienceLibrary(
- target = 'gallium',
- source = source,
-)
-
-env.Alias('gallium', gallium)
-
-Export('gallium')
diff --git a/src/gallium/auxiliary/pipe-loader/SConscript b/src/gallium/auxiliary/pipe-loader/SConscript
deleted file mode 100644
index 0fd4dccb6fa..00000000000
--- a/src/gallium/auxiliary/pipe-loader/SConscript
+++ /dev/null
@@ -1,32 +0,0 @@
-Import('*')
-
-env = env.Clone()
-
-env.MSVC2013Compat()
-
-env.Append(CPPPATH = [
- '#/src/loader',
- '#/src/gallium/winsys',
-])
-
-env.Append(CPPDEFINES = [
- ('HAVE_PIPE_LOADER_DRI', '1'),
- ('GALLIUM_STATIC_TARGETS', '1'),
-])
-
-source = env.ParseSourceList('Makefile.sources', 'COMMON_SOURCES')
-
-if env['HAVE_DRM']:
- source += env.ParseSourceList('Makefile.sources', 'DRM_SOURCES')
-
- env.PkgUseModules('DRM')
- env.Append(LIBS = [libloader])
-
-pipe_loader = env.ConvenienceLibrary(
- target = 'pipe_loader',
- source = source,
-)
-
-env.Alias('pipe_loader', pipe_loader)
-
-Export('pipe_loader')
diff --git a/src/gallium/drivers/llvmpipe/SConscript b/src/gallium/drivers/llvmpipe/SConscript
deleted file mode 100644
index 1af6867715c..00000000000
--- a/src/gallium/drivers/llvmpipe/SConscript
+++ /dev/null
@@ -1,46 +0,0 @@
-from sys import executable as python_cmd
-import distutils.version
-
-Import('*')
-
-if not env['llvm']:
- print('warning: LLVM disabled: not building llvmpipe')
- Return()
-
-env = env.Clone()
-
-env.MSVC2013Compat()
-
-llvmpipe = env.ConvenienceLibrary(
- target = 'llvmpipe',
- source = env.ParseSourceList('Makefile.sources', 'C_SOURCES')
- )
-
-env.Alias('llvmpipe', llvmpipe)
-
-env.Append(CPPPATH = [
- '../../../compiler/nir',
-])
-
-if not env['embedded']:
- env = env.Clone()
-
- env.Prepend(LIBS = [llvmpipe, gallium, mesautil])
-
- tests = [
- 'arit',
- 'format',
- 'blend',
- 'conv',
- 'printf',
- ]
-
- for test in tests:
- testname = 'lp_test_' + test
- target = env.Program(
- target = testname,
- source = [testname + '.c', 'lp_test_main.c'],
- )
- env.UnitTest(testname, target)
-
-Export('llvmpipe')
diff --git a/src/gallium/drivers/softpipe/SConscript b/src/gallium/drivers/softpipe/SConscript
deleted file mode 100644
index b540ca7a90d..00000000000
--- a/src/gallium/drivers/softpipe/SConscript
+++ /dev/null
@@ -1,18 +0,0 @@
-Import('*')
-
-env = env.Clone()
-
-env.Prepend(CPPPATH = [
- '../../../compiler/nir',
- ])
-
-env.MSVC2013Compat()
-
-softpipe = env.ConvenienceLibrary(
- target = 'softpipe',
- source = env.ParseSourceList('Makefile.sources', 'C_SOURCES')
- )
-
-env.Alias('softpipe', softpipe)
-
-Export('softpipe')
diff --git a/src/gallium/drivers/svga/SConscript b/src/gallium/drivers/svga/SConscript
deleted file mode 100644
index efed9790b77..00000000000
--- a/src/gallium/drivers/svga/SConscript
+++ /dev/null
@@ -1,27 +0,0 @@
-Import('*')
-
-env = env.Clone()
-
-env.MSVC2013Compat()
-
-if env['suncc']:
- print('warning: not building svga')
- Return()
-
-env.Prepend(CPPPATH = [
- 'include',
-])
-
-env.Append(CPPDEFINES = [
-])
-
-sources = env.ParseSourceList('Makefile.sources', 'C_SOURCES')
-
-svga = env.ConvenienceLibrary(
- target = 'svga',
- source = sources,
-)
-
-env.Alias('svga', svga)
-
-Export('svga')
diff --git a/src/gallium/frontends/dri/SConscript b/src/gallium/frontends/dri/SConscript
deleted file mode 100644
index 03c9f71987d..00000000000
--- a/src/gallium/frontends/dri/SConscript
+++ /dev/null
@@ -1,29 +0,0 @@
-#######################################################################
-# SConscript for dri state_tracker
-
-Import('*')
-
-env = env.Clone()
-
-env.PkgUseModules(['DRM'])
-
-env.Append(CPPPATH = [
- '#/src',
- '#/src/mapi',
- '#/src/mesa',
- '#/src/mesa/drivers/dri/common',
-])
-
-sources = env.ParseSourceList('Makefile.sources', 'common_SOURCES')
-
-# XXX: if HAVE_DRISW
-sources.append(env.ParseSourceList('Makefile.sources', 'drisw_SOURCES'))
-
-# XXX: if HAVE_DRI2
-sources.append(env.ParseSourceList('Makefile.sources', 'dri2_SOURCES'))
-
-st_dri = env.ConvenienceLibrary(
- target = 'st_dri',
- source = sources
-)
-Export('st_dri')
diff --git a/src/gallium/frontends/glx/xlib/SConscript b/src/gallium/frontends/glx/xlib/SConscript
deleted file mode 100644
index 1d5dd1df4fd..00000000000
--- a/src/gallium/frontends/glx/xlib/SConscript
+++ /dev/null
@@ -1,18 +0,0 @@
-#######################################################################
-# SConscript for xlib state_tracker
-
-Import('*')
-
-env = env.Clone()
-
-env.Append(CPPPATH = [
- '#/src',
- '#/src/mapi',
- '#/src/mesa',
-])
-
-st_xlib = env.ConvenienceLibrary(
- target = 'st_xlib',
- source = env.ParseSourceList('Makefile.sources', 'C_SOURCES')
-)
-Export('st_xlib')
diff --git a/src/gallium/frontends/hgl/SConscript b/src/gallium/frontends/hgl/SConscript
deleted file mode 100644
index d2389c80802..00000000000
--- a/src/gallium/frontends/hgl/SConscript
+++ /dev/null
@@ -1,24 +0,0 @@
-#######################################################################
-# SConscript for Haiku state_tracker
-
-Import('*')
-
-env = env.Clone()
-
-env.Append(CPPPATH = [
- '#/src',
- '#/src/mapi',
- '#/src/mesa',
- '#/include/HaikuGL',
-])
-
-sources = [
- 'hgl.c',
- 'bitmap_wrapper.cpp',
-]
-
-st_haiku = env.ConvenienceLibrary(
- target = 'st_haiku',
- source = sources
-)
-Export('st_haiku')
diff --git a/src/gallium/frontends/osmesa/SConscript b/src/gallium/frontends/osmesa/SConscript
deleted file mode 100644
index be67d0fe739..00000000000
--- a/src/gallium/frontends/osmesa/SConscript
+++ /dev/null
@@ -1,24 +0,0 @@
-import os
-
-Import('*')
-
-env = env.Clone()
-
-env.Append(CPPPATH = [
- '#src/mapi',
- '#src/mesa',
- '.',
-])
-
-if env['platform'] == 'windows':
- env.AppendUnique(CPPDEFINES = [
- 'BUILD_GL32', # declare gl* as __declspec(dllexport) in Mesa headers
- 'WIN32_LEAN_AND_MEAN', # http://msdn2.microsoft.com/en-us/library/6dwk3a1z.aspx
- '_GLAPI_NO_EXPORTS', # prevent _glapi_* from being declared __declspec(dllimport)
- ])
-
-st_osmesa = env.ConvenienceLibrary(
- target ='st_osmesa',
- source = env.ParseSourceList('Makefile.sources', 'C_SOURCES'),
-)
-Export('st_osmesa')
diff --git a/src/gallium/frontends/wgl/SConscript b/src/gallium/frontends/wgl/SConscript
deleted file mode 100644
index bbf5ebd9764..00000000000
--- a/src/gallium/frontends/wgl/SConscript
+++ /dev/null
@@ -1,24 +0,0 @@
-import os
-
-Import('*')
-
-env = env.Clone()
-
-env.Append(CPPPATH = [
- '#src/mapi',
- '#src/mesa',
- '.',
-])
-
-env.AppendUnique(CPPDEFINES = [
- '_GDI32_', # prevent wgl* being declared __declspec(dllimport)
- 'BUILD_GL32', # declare gl* as __declspec(dllexport) in Mesa headers
- 'WIN32_LEAN_AND_MEAN', # http://msdn2.microsoft.com/en-us/library/6dwk3a1z.aspx
- '_GLAPI_NO_EXPORTS', # prevent _glapi_* from being declared __declspec(dllimport)
-])
-
-wgl = env.ConvenienceLibrary(
- target ='wgl',
- source = env.ParseSourceList('Makefile.sources', 'C_SOURCES'),
-)
-Export('wgl')
diff --git a/src/gallium/targets/dri/SConscript b/src/gallium/targets/dri/SConscript
deleted file mode 100644
index 835038dd639..00000000000
--- a/src/gallium/targets/dri/SConscript
+++ /dev/null
@@ -1,59 +0,0 @@
-Import('*')
-
-env = drienv.Clone()
-
-if env['suncc']:
- print('warning: not building dri-vmwgfx')
- Return()
-
-env.Append(CPPPATH = [
- '#/src/loader',
- '#/src/mapi',
- '#/src/mesa',
- '#/src/mesa/drivers/dri/common',
- '#/src/gallium/frontends/dri',
-])
-
-if env['llvm']:
- env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE')
- env.Prepend(LIBS = [llvmpipe])
-
-env.PkgUseModules('DRM')
-
-env.Append(CPPDEFINES = [
- 'GALLIUM_VMWGFX',
- 'GALLIUM_SOFTPIPE',
-])
-
-env.Prepend(LIBS = [
- st_dri,
- svgadrm,
- svga,
- ws_dri,
- softpipe,
- pipe_loader,
- libloader,
- mesautil,
- compiler,
- mesa,
- glsl,
- nir,
- spirv,
- gallium,
- megadrivers_stub,
- dri_common,
-])
-
-module = env.LoadableModule(
- target = 'gallium_dri.so',
- source = 'target.c',
- SHLIBPREFIX = '',
-)
-
-# vmwgfx_dri.so
-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}")
-
-env.Alias('dri-vmwgfx', module)
-env.Alias('dri-swrast', module)
diff --git a/src/gallium/targets/haiku-softpipe/SConscript b/src/gallium/targets/haiku-softpipe/SConscript
deleted file mode 100644
index 312155abe14..00000000000
--- a/src/gallium/targets/haiku-softpipe/SConscript
+++ /dev/null
@@ -1,47 +0,0 @@
-Import('*')
-
-env.Prepend(LIBS = [
- ws_haiku,
- st_haiku,
- mesautil,
- compiler,
- mesa,
- glsl,
- nir,
- spirv,
- gallium
-])
-
-if True:
- env.Append(CPPDEFINES = [
- 'GALLIUM_SOFTPIPE',
- ])
- env.Prepend(LIBS = [softpipe])
-
-env.Prepend(LIBS = [libgl])
-
-env.Append(CPPPATH = [
- '#/src/mapi',
- '#/src/mesa',
- '#/src/mesa/main',
- '#/include/HaikuGL',
- '#/src/gallium/winsys',
- '#/src/gallium/frontends/hgl',
- '/boot/system/develop/headers/private',
-])
-
-if env['llvm']:
- env.Append(CPPDEFINES = ['GALLIUM_LLVMPIPE'])
- env.Prepend(LIBS = [llvmpipe])
-
-softpipe_sources = [
- 'GalliumContext.cpp',
- 'SoftwareRenderer.cpp'
-]
-
-# libswpipe gets turned into "Softpipe" by the haiku package system
-module = env.LoadableModule(
- target ='swpipe',
- source = softpipe_sources,
-)
-
diff --git a/src/gallium/targets/libgl-gdi/SConscript b/src/gallium/targets/libgl-gdi/SConscript
deleted file mode 100644
index 754cdc1688b..00000000000
--- a/src/gallium/targets/libgl-gdi/SConscript
+++ /dev/null
@@ -1,55 +0,0 @@
-#######################################################################
-# SConscript for gdi winsys
-
-Import('*')
-
-env = env.Clone()
-
-env.Append(CPPPATH = [
- '#src',
- '#src/gallium/frontends/wgl',
- '#src/gallium/winsys/sw',
-])
-
-env.Append(LIBS = [
- 'gdi32',
- 'user32',
- 'kernel32',
- 'ws2_32',
- 'advapi32',
-])
-
-env.Prepend(LIBS = [
- mesautil,
- nir,
- spirv
-])
-
-sources = ['libgl_gdi.c']
-drivers = []
-
-if True:
- env.Append(CPPDEFINES = ['GALLIUM_SOFTPIPE'])
- drivers += [softpipe]
-
-if env['llvm']:
- env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE')
- drivers += [llvmpipe]
-
-if env['gcc'] and env['machine'] != 'x86_64':
- # DEF parser in certain versions of MinGW is busted, as does not behave as
- # MSVC. mingw-w64 works fine.
- sources += ['#src/gallium/frontends/wgl/opengl32.mingw.def']
-else:
- sources += ['#src/gallium/frontends/wgl/opengl32.def']
-
-env['no_import_lib'] = 1
-
-opengl32 = env.SharedLibrary(
- target ='opengl32',
- source = sources,
- LIBS = wgl + ws_gdi + glapi + compiler + mesa + drivers + gallium + glsl + nir + env['LIBS'],
-)
-
-env.Alias('opengl32', opengl32)
-env.Alias('libgl-gdi', opengl32)
diff --git a/src/gallium/targets/libgl-xlib/SConscript b/src/gallium/targets/libgl-xlib/SConscript
deleted file mode 100644
index c1b787d95af..00000000000
--- a/src/gallium/targets/libgl-xlib/SConscript
+++ /dev/null
@@ -1,72 +0,0 @@
-#######################################################################
-# SConscript for xlib winsys
-
-Import('*')
-
-env = env.Clone()
-
-env.Append(CPPPATH = [
- '#/src/mapi',
- '#/src/mesa',
- '#/src/mesa/main',
- '#src/gallium/frontends/glx/xlib',
- Dir('../../../mapi'), # src/mapi build path for python-generated GL API files/headers
- Dir('../../../mapi/glapi/gen'), # src/mapi build path for python-generated GL API files/headers
-])
-
-env.Append(CPPDEFINES = ['USE_XSHM'])
-
-env.Prepend(LIBS = env['X11_LIBS'])
-env.Prepend(LIBPATH = env['X11_LIBPATH'])
-
-env.Prepend(LIBS = [
- st_xlib,
- ws_xlib,
- glapi,
- mesautil,
- compiler,
- mesa,
- glsl,
- nir,
- spirv,
- gallium,
-])
-
-sources = [
- 'xlib.c',
-]
-
-if True:
- env.Append(CPPDEFINES = ['GALLIUM_SOFTPIPE'])
- env.Prepend(LIBS = [softpipe])
-
-if env['llvm']:
- env.Append(CPPDEFINES = ['GALLIUM_LLVMPIPE'])
- env.Prepend(LIBS = [llvmpipe])
-
-if env['platform'] != 'darwin':
- # Disallow undefined symbols, except with Address Sanitizer, since libasan
- # is not linked on shared libs, as it should be LD_PRELOAD'ed instead
- if not env['asan']:
- env.Append(SHLINKFLAGS = [
- '-Wl,-z,defs',
- ])
- env.Append(SHLINKFLAGS = [
- # Restrict exported symbols
- '-Wl,--version-script=%s' % File("libgl-xlib.sym").srcnode().path,
- ])
-
-# libGL.so.1.5
-libgl_1_5 = env.SharedLibrary(
- target ='GL',
- source = sources,
- SHLIBSUFFIX = env['SHLIBSUFFIX'] + '.1.5',
-)
-
-# libGL.so.1
-libgl = env.subst('${SHLIBPREFIX}GL${SHLIBSUFFIX}')
-libgl_1 = libgl + '.1'
-env.Command(libgl_1, libgl_1_5, "ln -sf ${SOURCE.file} ${TARGET}")
-env.Command(libgl, libgl_1, "ln -sf ${SOURCE.file} ${TARGET}")
-
-env.Alias('libgl-xlib', libgl)
diff --git a/src/gallium/winsys/sw/gdi/SConscript b/src/gallium/winsys/sw/gdi/SConscript
deleted file mode 100644
index b346ca9019a..00000000000
--- a/src/gallium/winsys/sw/gdi/SConscript
+++ /dev/null
@@ -1,24 +0,0 @@
-#######################################################################
-# SConscript for xlib winsys
-
-
-Import('*')
-
-if env['platform'] == 'windows':
-
- env = env.Clone()
-
- env.Append(CPPPATH = [
- '#/src/gallium/include',
- '#/src/gallium/auxiliary',
- '#/src/gallium/drivers',
- ])
-
- ws_gdi = env.ConvenienceLibrary(
- target = 'ws_gdi',
- source = [
- 'gdi_sw_winsys.c',
- ]
- )
- env.Alias('ws_gdi', ws_gdi)
- Export('ws_gdi')
diff --git a/src/gallium/winsys/sw/hgl/SConscript b/src/gallium/winsys/sw/hgl/SConscript
deleted file mode 100644
index 776dd831a4b..00000000000
--- a/src/gallium/winsys/sw/hgl/SConscript
+++ /dev/null
@@ -1,24 +0,0 @@
-#######################################################################
-# SConscript for haiku winsys
-
-
-Import('*')
-
-if env['platform'] in ('haiku'):
-
- env = env.Clone()
-
- env.Append(CPPPATH = [
- '#/src/gallium/include',
- '#/src/gallium/auxiliary',
- '#/src/gallium/drivers',
- '#/src/gallium/frontend/hgl',
- ])
-
- ws_haiku = env.ConvenienceLibrary(
- target = 'ws_haiku',
- source = [
- 'hgl_sw_winsys.c',
- ]
- )
- Export('ws_haiku')
diff --git a/src/gallium/winsys/sw/null/SConscript b/src/gallium/winsys/sw/null/SConscript
deleted file mode 100644
index 6236498af2e..00000000000
--- a/src/gallium/winsys/sw/null/SConscript
+++ /dev/null
@@ -1,19 +0,0 @@
-#######################################################################
-# SConscript for xlib winsys
-
-
-Import('*')
-
-env = env.Clone()
-
-env.Append(CPPPATH = [
- '#/src/gallium/include',
- '#/src/gallium/auxiliary',
-])
-
-ws_null = env.ConvenienceLibrary(
- target = 'ws_null',
- source = env.ParseSourceList('Makefile.sources', 'C_SOURCES'),
-)
-env.Alias('ws_null', ws_null)
-Export('ws_null')
diff --git a/src/gallium/winsys/sw/wrapper/SConscript b/src/gallium/winsys/sw/wrapper/SConscript
deleted file mode 100644
index 9ff9bf6d1fa..00000000000
--- a/src/gallium/winsys/sw/wrapper/SConscript
+++ /dev/null
@@ -1,18 +0,0 @@
-#######################################################################
-# SConscript for xlib winsys
-
-
-Import('*')
-
-env = env.Clone()
-
-env.Append(CPPPATH = [
- '#/src/gallium/include',
- '#/src/gallium/auxiliary',
-])
-
-ws_wrapper = env.ConvenienceLibrary(
- target = 'ws_wrapper',
- source = env.ParseSourceList('Makefile.sources', 'C_SOURCES'),
-)
-Export('ws_wrapper')
diff --git a/src/gallium/winsys/sw/xlib/SConscript b/src/gallium/winsys/sw/xlib/SConscript
deleted file mode 100644
index 64db2013936..00000000000
--- a/src/gallium/winsys/sw/xlib/SConscript
+++ /dev/null
@@ -1,21 +0,0 @@
-#######################################################################
-# SConscript for xlib winsys
-
-
-Import('*')
-
-if env['platform'] in ('cygwin', 'darwin', 'freebsd', 'linux', 'sunos'):
-
- env = env.Clone()
-
- env.Append(CPPPATH = [
- '#/src/gallium/include',
- '#/src/gallium/auxiliary',
- ])
-
- ws_xlib = env.ConvenienceLibrary(
- target = 'ws_xlib',
- source = env.ParseSourceList('Makefile.sources', 'C_SOURCES'),
- )
- env.Alias('ws_xlib', ws_xlib)
- Export('ws_xlib')