summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--SConstruct10
-rw-r--r--src/gallium/state_trackers/dri/drm/SConscript2
2 files changed, 2 insertions, 10 deletions
diff --git a/SConstruct b/SConstruct
index 56d88cc1cc0..8b7ae7d112b 100644
--- a/SConstruct
+++ b/SConstruct
@@ -167,16 +167,6 @@ if platform in ('posix', 'linux', 'freebsd', 'darwin'):
'dl',
])
-# DRI
-if dri:
- env.ParseConfig('pkg-config --cflags --libs libdrm')
- env.Append(CPPDEFINES = [
- ('USE_EXTERNAL_DXTN_LIB', '1'),
- 'IN_DRI_DRIVER',
- 'GLX_DIRECT_RENDERING',
- 'GLX_INDIRECT_RENDERING',
- ])
-
# LLVM support in the Draw module
if drawllvm:
env.Append(CPPDEFINES = ['DRAW_LLVM'])
diff --git a/src/gallium/state_trackers/dri/drm/SConscript b/src/gallium/state_trackers/dri/drm/SConscript
index b9726ee3113..1dfaa402f2d 100644
--- a/src/gallium/state_trackers/dri/drm/SConscript
+++ b/src/gallium/state_trackers/dri/drm/SConscript
@@ -7,6 +7,8 @@ if env['dri']:
env = env.Clone()
+ env.ParseConfig('pkg-config --cflags --libs libdrm')
+
env.Append(CPPPATH = [
'#/src/mesa',
'#/src/gallium/state_trackers/dri/common',