diff options
| author | Jakob Bornecrantz <[email protected]> | 2010-11-05 16:55:46 +0000 |
|---|---|---|
| committer | Jakob Bornecrantz <[email protected]> | 2010-11-05 20:58:49 +0000 |
| commit | c0db7854d502d0b24110cbe8560967794d7938cb (patch) | |
| tree | 38bbfad082a387e557da40d355df1d9b51bd045d /scons/gallium.py | |
| parent | 98d6ed87421cd8a8a43b061a6ba634b8cbbec086 (diff) | |
scons: Check for libdrm_[intel|radeon] as well
And run SConscripts if they are present.
Also make dri depend on both drm and x11.
Diffstat (limited to 'scons/gallium.py')
| -rw-r--r-- | scons/gallium.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/scons/gallium.py b/scons/gallium.py index 36f1831af89..75e9b9e7fc3 100644 --- a/scons/gallium.py +++ b/scons/gallium.py @@ -560,10 +560,14 @@ def generate(env): env.Tool('udis86') pkg_config_modules(env, 'x11', ['x11', 'xext']) - pkg_config_modules(env, 'dri', ['libdrm']) + pkg_config_modules(env, 'drm', ['libdrm']) + pkg_config_modules(env, 'drm_intel', ['libdrm_intel']) + pkg_config_modules(env, 'drm_radeon', ['libdrm_radeon']) pkg_config_modules(env, 'xorg', ['xorg-server']) pkg_config_modules(env, 'kms', ['libkms']) + env['dri'] = env['x11'] and env['drm'] + # Custom builders and methods env.Tool('custom') createInstallMethods(env) |