summaryrefslogtreecommitdiffstats
path: root/src/gallium/state_trackers/dri/drm
diff options
context:
space:
mode:
authorJakob Bornecrantz <[email protected]>2010-11-05 18:18:09 +0000
committerJakob Bornecrantz <[email protected]>2010-11-05 20:58:49 +0000
commit7e9f5eab4e18e0b661fc9b65a0f409d10e041b24 (patch)
tree2dcac3d4993bf9d33815821c9c752f3fa1ce1e8d /src/gallium/state_trackers/dri/drm
parentc0db7854d502d0b24110cbe8560967794d7938cb (diff)
scons: Move dependancy checks to the main gallium scons file
Diffstat (limited to 'src/gallium/state_trackers/dri/drm')
-rw-r--r--src/gallium/state_trackers/dri/drm/SConscript23
1 files changed, 11 insertions, 12 deletions
diff --git a/src/gallium/state_trackers/dri/drm/SConscript b/src/gallium/state_trackers/dri/drm/SConscript
index 7e3a264d1c1..90082ffb6ae 100644
--- a/src/gallium/state_trackers/dri/drm/SConscript
+++ b/src/gallium/state_trackers/dri/drm/SConscript
@@ -3,20 +3,18 @@
Import('*')
-if env['dri']:
+env = env.Clone()
- env = env.Clone()
+env.ParseConfig('pkg-config --cflags --libs libdrm')
- env.ParseConfig('pkg-config --cflags --libs libdrm')
+env.Append(CPPPATH = [
+ '#/src/mapi',
+ '#/src/mesa',
+ '#/src/gallium/state_trackers/dri/common',
+ '#/src/mesa/drivers/dri/common',
+])
- env.Append(CPPPATH = [
- '#/src/mapi',
- '#/src/mesa',
- '#/src/gallium/state_trackers/dri/common',
- '#/src/mesa/drivers/dri/common',
- ])
-
- st_dri = env.ConvenienceLibrary(
+st_dri = env.ConvenienceLibrary(
target = 'st_dri',
source = [ 'dri_context.c',
'dri_drawable.c',
@@ -24,4 +22,5 @@ if env['dri']:
'dri2.c',
]
)
- Export('st_dri')
+
+Export('st_dri')