Mesa (master): nvfx: Move src/gallium/ drivers to beginning of SCons include path.

Vinson Lee vlee at kemper.freedesktop.org
Tue Apr 27 00:58:46 PDT 2010


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

Author: Vinson Lee <vlee at vmware.com>
Date:   Tue Apr 27 00:46:00 2010 -0700

nvfx: Move src/gallium/drivers to beginning of SCons include path.

libdrm-2.4.20 and earlier include the nouveau/nouveau_class.h header. A
later version of libdrm will not ship this header. Mesa also has this
header at src/gallium/drivers.

The symbol NV34TCL_VTXFMT_TYPE_HALF is needed by nvfx_vbo.c. This symbol
is not in the libdrm copy of the header but is in the Mesa copy of the
header. This patch moves src/gallium/drivers to the beginning of the
include paths such that when building on hosts with libdrm-2.4.20 or
ealier the build uses the copy in Mesa.

---

 src/gallium/drivers/nvfx/SConscript |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/gallium/drivers/nvfx/SConscript b/src/gallium/drivers/nvfx/SConscript
index 7c452ac..02d931b 100644
--- a/src/gallium/drivers/nvfx/SConscript
+++ b/src/gallium/drivers/nvfx/SConscript
@@ -2,7 +2,7 @@ Import('*')
 
 env = env.Clone()
 
-env.Append(CPPPATH = [
+env.PrependUnique(delete_existing=1, CPPPATH = [
     '#/src/gallium/drivers',
 ])
 



More information about the mesa-commit mailing list