From a7b6a06bf16d04b7372f10d8dd7c10c6c90d6c3c Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Tue, 27 Apr 2010 00:46:00 -0700 Subject: [PATCH] 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 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/drivers/nvfx/SConscript b/src/gallium/drivers/nvfx/SConscript index 7c452acb8b9..02d931b10e8 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', ]) -- 2.30.2