From 485c6d231e0af4e90804ac5e0da40b7bd97ac78e Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Mon, 18 Jul 2016 19:23:02 +0100 Subject: [PATCH] mesa: scons: list builddir before srcdir Analogous to previous commit. Note: scons always uses OOT builds, while the in-tree generated files could be created either manually or by the autoconf build. Cc: "11.2 12.0" Cc: Alexander von Gluck IV Signed-off-by: Emil Velikov (cherry picked from commit 1c7c0d77ac1f7035558c37fc0297e9d22991d429) [Emil Velikov: remove not-applicable "Dir('main')" entry] Signed-off-by: Emil Velikov Conflicts: src/mesa/SConscript --- src/mesa/SConscript | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mesa/SConscript b/src/mesa/SConscript index 434800e4560..8f41174bb1f 100644 --- a/src/mesa/SConscript +++ b/src/mesa/SConscript @@ -15,13 +15,13 @@ env.MSVC2013Compat() env.Append(CPPPATH = [ '../compiler/nir', # for generated nir_opcodes.h, etc '#/src', + Dir('../mapi'), # src/mapi build path '#/src/mapi', '#/src/glsl', + Dir('.'), # src/mesa build path '#/src/mesa', '#/src/gallium/include', '#/src/gallium/auxiliary', - Dir('../mapi'), # src/mapi build path - Dir('.'), # src/mesa build path ]) if env['platform'] == 'windows': @@ -116,7 +116,7 @@ if env['platform'] not in ('cygwin', 'darwin', 'windows', 'haiku'): ) # Add the dir containing the generated header (somewhere inside the # build dir) to the include path - env.Append(CPPPATH = [matypes[0].dir]) + env.Prepend(CPPPATH = [matypes[0].dir]) def write_git_sha1_h_file(filename):