scons: avoid building any piece of i915
authorEmil Velikov <emil.l.velikov@gmail.com>
Thu, 19 Jun 2014 00:47:38 +0000 (01:47 +0100)
committerEmil Velikov <emil.l.velikov@gmail.com>
Sat, 21 Jun 2014 15:43:10 +0000 (16:43 +0100)
Leftover from commit c21fca8bf24.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Jakob Bornecrantz <wallbraker@gmail.com>
src/gallium/SConscript
src/gallium/drivers/i915/SConscript [deleted file]
src/gallium/winsys/i915/sw/SConscript [deleted file]

index 816c79c9a184cdd48d5ada99abb3da51c5451c8f..598b2f1ecb9313dd2a0cf123f8124cc679a839fc 100644 (file)
@@ -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 (file)
index 22de67d..0000000
+++ /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 (file)
index 9d78519..0000000
+++ /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')