diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2014-01-19 03:09:03 +0000 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2014-01-19 15:17:00 +0000 |
| commit | 26d380da69d3fc3a4ced291028c105c0ac0f1a92 (patch) | |
| tree | 22cc3edfd8c6def10e5dc456d7a2296ed1f52978 /src/loader/SConscript | |
| parent | a33d1339d5bfb32377be92957a493f0e3d84b31e (diff) | |
| download | external_mesa3d-26d380da69d3fc3a4ced291028c105c0ac0f1a92.zip external_mesa3d-26d380da69d3fc3a4ced291028c105c0ac0f1a92.tar.gz external_mesa3d-26d380da69d3fc3a4ced291028c105c0ac0f1a92.tar.bz2 | |
loader: ifdef libdrm specific code and include
Mesa provides the flexibility of building without the
need to have libdrm present on the system. The situation
has regressed with the recent commit
commit 8c2e7fd8460750543367053b1be9368cc38e1d6a
Author: Emil Velikov <emil.l.velikov@gmail.com>
Date: Fri Jan 10 23:36:16 2014 +0000
loader: introduce the loader util lib
By isolating libdrm code by #ifndef __NOT_HAVE_DRM_H we
can have libdrm-less builds on across all build systems.
This patch converts Android's _EGL_NO_DRM to __NOT_HAVE_DRM_H
to provide consistency with the other cases within mesa, allows
compilation of libloader on libdrm-less scons and conditionally
links against libdrm if present under automake.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=73776
BUgzilla: https://bugs.freedesktop.org/show_bug.cgi?id=73777
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/loader/SConscript')
| -rw-r--r-- | src/loader/SConscript | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/loader/SConscript b/src/loader/SConscript index 76b0871..359fc18 100644 --- a/src/loader/SConscript +++ b/src/loader/SConscript @@ -1,15 +1,12 @@ Import('*') -if not env['drm']: - Return() - env = env.Clone() env.Prepend(CPPPATH = [ '#include' ]) -env.PkgUseModules('DRM') +env.Append(CPPDEFINES = ['__NOT_HAVE_DRM_H']) if env['udev']: env.PkgUseModules('UDEV') |