Mesa (master): scons: Include headers from the local include directory first.

Vinson Lee vlee at kemper.freedesktop.org
Mon Apr 26 08:19:08 UTC 2010


Module: Mesa
Branch: master
Commit: 5fd97573e3c35d5e7e2b17dc2795dc9292ea944c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5fd97573e3c35d5e7e2b17dc2795dc9292ea944c

Author: Vinson Lee <vlee at vmware.com>
Date:   Mon Apr 26 01:08:34 2010 -0700

scons: Include headers from the local include directory first.

Certain headers, such as GL/glew.h, are in both the Mesa include and the
default installed include directories. On recent distros the needed
symbols can be found in both places. On older distros the installed
headers could be lacking symbols, so for a header that exists in both
places, the local one should be found first.

---

 SConstruct |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/SConstruct b/SConstruct
index de3f6ea..3a4ff9a 100644
--- a/SConstruct
+++ b/SConstruct
@@ -113,8 +113,10 @@ if env['llvm'] and 'llvmpipe' not in env['drivers']:
     env['drivers'].append('llvmpipe')
 
 # Includes
-env.Append(CPPPATH = [
+env.Prepend(CPPPATH = [
 	'#/include',
+])
+env.Append(CPPPATH = [
 	'#/src/gallium/include',
 	'#/src/gallium/auxiliary',
 	'#/src/gallium/drivers',




More information about the mesa-commit mailing list