Mesa (master): scons: avoid building any piece of i915

[Emil Velikov]

Module: Mesa
Branch: master
Commit: dfaf6116c9d29b01633601b09c6846c21383aaa9
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=dfaf6116c9d29b01633601b09c6846c21383aaa9

Author: Emil Velikov <emil.l.velikov at gmail.com>
Date:   Thu Jun 19 01:47:38 2014 +0100

scons: avoid building any piece of i915

Leftover from commit c21fca8bf24.

Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Jakob Bornecrantz <wallbraker at gmail.com>

---

 src/gallium/SConscript                |   11 -----------
 src/gallium/drivers/i915/SConscript   |   12 ------------
 src/gallium/winsys/i915/sw/SConscript |   12 ------------
 3 files changed, 35 deletions(-)

diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index 816c79c..598b2f1 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 22de67d..0000000
--- 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 9d78519..0000000
--- 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')