summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2014-06-19 01:47:38 +0100
committerEmil Velikov <[email protected]>2014-06-21 16:43:10 +0100
commitdfaf6116c9d29b01633601b09c6846c21383aaa9 (patch)
tree0817e311c8c2518975861cd407dc4873b5bf69f5
parent564821c917f4a9d5a0de2ee77b90b0cd85e3d3a6 (diff)
scons: avoid building any piece of i915
Leftover from commit c21fca8bf24. Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Jakob Bornecrantz <[email protected]>
-rw-r--r--src/gallium/SConscript11
-rw-r--r--src/gallium/drivers/i915/SConscript12
-rw-r--r--src/gallium/winsys/i915/sw/SConscript12
3 files changed, 0 insertions, 35 deletions
diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index 816c79c9a18..598b2f1ecb9 100644
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -21,12 +21,6 @@ SConscript([
'drivers/trace/SConscript',
])
-if not env['msvc']:
- # These drivers do not build on MSVC compilers
- SConscript([
- 'drivers/i915/SConscript',
- ])
-
#
# State trackers
#
@@ -66,11 +60,6 @@ if env['platform'] == 'windows':
'winsys/sw/gdi/SConscript',
])
-if not env['msvc']:
- SConscript([
- 'winsys/i915/sw/SConscript',
- ])
-
if env['platform'] == 'haiku':
SConscript([
'winsys/sw/hgl/SConscript',
diff --git a/src/gallium/drivers/i915/SConscript b/src/gallium/drivers/i915/SConscript
deleted file mode 100644
index 22de67d5ac9..00000000000
--- a/src/gallium/drivers/i915/SConscript
+++ /dev/null
@@ -1,12 +0,0 @@
-Import('*')
-
-env = env.Clone()
-
-i915 = env.ConvenienceLibrary(
- target = 'i915',
- source = env.ParseSourceList('Makefile.sources', 'C_SOURCES')
- )
-
-env.Alias('i915', i915)
-
-Export('i915')
diff --git a/src/gallium/winsys/i915/sw/SConscript b/src/gallium/winsys/i915/sw/SConscript
deleted file mode 100644
index 9d785191d54..00000000000
--- a/src/gallium/winsys/i915/sw/SConscript
+++ /dev/null
@@ -1,12 +0,0 @@
-Import('*')
-
-env = env.Clone()
-
-i915_sw_sources = env.ParseSourceList('Makefile.sources', 'C_SOURCES')
-
-i915sw = env.ConvenienceLibrary(
- target ='i915sw',
- source = i915_sw_sources,
-)
-
-Export('i915sw')