diff options
| author | José Fonseca <jfonseca@vmware.com> | 2010-04-10 02:00:33 +0100 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2010-04-11 17:17:34 +0900 |
| commit | 9fc93b80413d63aeb08b5a17602d111ed3899faf (patch) | |
| tree | 34a42545a0bd567fbdfc8cb44301031b6a7db240 | |
| parent | 9faf9529f38e1b22550f4910ea863391bfa02436 (diff) | |
scons: Use libdrm options only where needed.
Prevents needless recompiles when switching dri=yes to no.
| -rw-r--r-- | SConstruct | 10 | ||||
| -rw-r--r-- | src/gallium/state_trackers/dri/drm/SConscript | 2 |
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', |