summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Boll <andreas.boll.dev@gmail.com>2013-05-03 11:41:00 +0200
committerAndreas Boll <andreas.boll.dev@gmail.com>2013-05-03 18:44:57 +0200
commite62be5de53a528cf1a0d6cbcb76b493838dac643 (patch)
treef71a4774942dca57329fe2e4ff15c5e156808df5
parent4ca44f2c5e6b3a0a91626b576d72d306e5c08592 (diff)
scons: remove nouveau build
One build system for linux/unix only drivers should be enough. Additionally the nouveau target was disabled anyway. Acked-by: Jose Fonseca <jfonseca@vmware.com>
-rw-r--r--src/gallium/SConscript15
-rw-r--r--src/gallium/drivers/nouveau/SConscript10
-rw-r--r--src/gallium/drivers/nv30/SConscript11
-rw-r--r--src/gallium/drivers/nv50/SConscript11
-rw-r--r--src/gallium/drivers/nvc0/SConscript11
5 files changed, 0 insertions, 58 deletions
diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index c53cd391b1f..a3edc655432 100644
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -27,19 +27,6 @@ if not env['msvc']:
'drivers/i915/SConscript',
])
-if env['drm']:
- # These drivers depend on drm headers
- # XXX: nouveau drivers have a tight dependency on libdrm, so to enable
- # we need some version logic before we enable them. Also, ATM there is
- # no nouveau target in scons
- # if env['drm_nouveau']:
- # SConscript([
- # 'drivers/nouveau/SConscript',
- # 'drivers/nv50/SConscript',
- # 'drivers/nvc0/SConscript',
- # 'drivers/nvfx/SConscript',
- # ])
-
#
# State trackers
#
@@ -132,7 +119,6 @@ if not env['embedded']:
'targets/SConscript.dri',
'targets/dri-swrast/SConscript',
'targets/dri-vmwgfx/SConscript',
- #'targets/dri-nouveau/SConscript',
])
if env['drm_intel']:
SConscript([
@@ -142,7 +128,6 @@ if not env['embedded']:
if env['xorg'] and env['drm']:
SConscript([
#'targets/xorg-i915/SConscript',
- #'targets/xorg-nouveau/SConscript',
])
diff --git a/src/gallium/drivers/nouveau/SConscript b/src/gallium/drivers/nouveau/SConscript
deleted file mode 100644
index 418744cd482..00000000000
--- a/src/gallium/drivers/nouveau/SConscript
+++ /dev/null
@@ -1,10 +0,0 @@
-Import('*')
-
-env = env.Clone()
-
-nouveau = env.ConvenienceLibrary(
- target = 'nouveau',
- source = env.ParseSourceList('Makefile.sources', 'C_SOURCES')
- )
-
-Export('nouveau')
diff --git a/src/gallium/drivers/nv30/SConscript b/src/gallium/drivers/nv30/SConscript
deleted file mode 100644
index 3c2ff03dafd..00000000000
--- a/src/gallium/drivers/nv30/SConscript
+++ /dev/null
@@ -1,11 +0,0 @@
-Import('*')
-
-env = env.Clone()
-
-nv30 = env.ConvenienceLibrary(
- target = 'nv30',
- source = env.ParseSourceList('Makefile.sources',
- ['C_SOURCES', 'CPP_SOURCES'])
- )
-
-Export('nv30')
diff --git a/src/gallium/drivers/nv50/SConscript b/src/gallium/drivers/nv50/SConscript
deleted file mode 100644
index 3baaa8ae341..00000000000
--- a/src/gallium/drivers/nv50/SConscript
+++ /dev/null
@@ -1,11 +0,0 @@
-Import('*')
-
-env = env.Clone()
-
-nv50 = env.ConvenienceLibrary(
- target = 'nv50',
- source = env.ParseSourceList('Makefile.sources',
- ['C_SOURCES', 'CPP_SOURCES'])
- )
-
-Export('nv50')
diff --git a/src/gallium/drivers/nvc0/SConscript b/src/gallium/drivers/nvc0/SConscript
deleted file mode 100644
index 4e456d1956b..00000000000
--- a/src/gallium/drivers/nvc0/SConscript
+++ /dev/null
@@ -1,11 +0,0 @@
-Import('*')
-
-env = env.Clone()
-
-nvc0 = env.ConvenienceLibrary(
- target = 'nvc0',
- source = env.ParseSourceList('Makefile.sources',
- ['C_SOURCES', 'CPP_SOURCES'])
- )
-
-Export('nvc0')