summaryrefslogtreecommitdiffstats
path: root/src/gallium/targets/dri-vmwgfx
diff options
context:
space:
mode:
authorJakob Bornecrantz <wallbraker@gmail.com>2010-03-26 14:19:48 +0100
committerJakob Bornecrantz <wallbraker@gmail.com>2010-03-26 14:48:35 +0100
commit711529153c797b4169fd5bbba79b370a2f38a0e9 (patch)
tree602acdc11ecf7551fcbd1a826d0b785441b9a881 /src/gallium/targets/dri-vmwgfx
parentfb70f456fce6b9cca9330e1c1e174153e532693e (diff)
downloadexternal_mesa3d-711529153c797b4169fd5bbba79b370a2f38a0e9.zip
external_mesa3d-711529153c797b4169fd5bbba79b370a2f38a0e9.tar.gz
external_mesa3d-711529153c797b4169fd5bbba79b370a2f38a0e9.tar.bz2
gallium: Fix DRI driver build warnings under scons
When building more then one dri driver we would get warnings because we where defining the same build target multiple times. Also move all the dri scons targets related code into its own file.
Diffstat (limited to 'src/gallium/targets/dri-vmwgfx')
-rw-r--r--src/gallium/targets/dri-vmwgfx/SConscript24
-rw-r--r--src/gallium/targets/dri-vmwgfx/dummy.c0
2 files changed, 12 insertions, 12 deletions
diff --git a/src/gallium/targets/dri-vmwgfx/SConscript b/src/gallium/targets/dri-vmwgfx/SConscript
index 7d248e8..6a1f882 100644
--- a/src/gallium/targets/dri-vmwgfx/SConscript
+++ b/src/gallium/targets/dri-vmwgfx/SConscript
@@ -6,19 +6,19 @@ if not 'svga' in env['drivers']:
env = drienv.Clone()
-drivers = [
- trace,
- st_dri,
- svgadrm,
- svga,
- mesa,
- glsl,
- gallium,
-]
+env.Prepend(LIBS = [
+ st_dri,
+ svgadrm,
+ svga,
+ trace,
+ mesa,
+ glsl,
+ gallium,
+ COMMON_DRI_DRM_OBJECTS
+])
env.LoadableModule(
- target ='vmwgfx_dri.so',
- source = COMMON_GALLIUM_SOURCES,
- LIBS = drivers + mesa + gallium + env['LIBS'],
+ target = 'vmwgfx_dri.so',
+ source = 'dummy.c',
SHLIBPREFIX = '',
)
diff --git a/src/gallium/targets/dri-vmwgfx/dummy.c b/src/gallium/targets/dri-vmwgfx/dummy.c
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/gallium/targets/dri-vmwgfx/dummy.c