summaryrefslogtreecommitdiffstats
path: root/src/gallium/targets/dri-radeong
diff options
context:
space:
mode:
authorJakob Bornecrantz <[email protected]>2010-03-26 14:19:48 +0100
committerJakob Bornecrantz <[email protected]>2010-03-26 14:48:35 +0100
commit711529153c797b4169fd5bbba79b370a2f38a0e9 (patch)
tree602acdc11ecf7551fcbd1a826d0b785441b9a881 /src/gallium/targets/dri-radeong
parentfb70f456fce6b9cca9330e1c1e174153e532693e (diff)
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-radeong')
-rw-r--r--src/gallium/targets/dri-radeong/SConscript15
-rw-r--r--src/gallium/targets/dri-radeong/dummy.c0
2 files changed, 12 insertions, 3 deletions
diff --git a/src/gallium/targets/dri-radeong/SConscript b/src/gallium/targets/dri-radeong/SConscript
index 239d29ace18..d926c272889 100644
--- a/src/gallium/targets/dri-radeong/SConscript
+++ b/src/gallium/targets/dri-radeong/SConscript
@@ -8,10 +8,19 @@ env = drienv.Clone()
env.ParseConfig('pkg-config --cflags --libs libdrm_radeon')
-drivers = r300 + trace + softpipe
+env.Prepend(LIBS = [
+ st_dri,
+ radeonwinsys,
+ r300,
+ trace,
+ mesa,
+ glsl,
+ gallium,
+ COMMON_DRI_DRM_OBJECTS
+])
env.SharedLibrary(
target ='radeon_dri.so',
- source = COMMON_GALLIUM_SOURCES,
- LIBS = st_dri + radeonwinsys + mesa + glsl + drivers + gallium + env['LIBS'],
+ source = 'dummy.c',
+ SHLIBPREFIX = '',
)
diff --git a/src/gallium/targets/dri-radeong/dummy.c b/src/gallium/targets/dri-radeong/dummy.c
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/src/gallium/targets/dri-radeong/dummy.c