From 1c7c0d77ac1f7035558c37fc0297e9d22991d429 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 --- src/mesa/SConscript | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mesa/SConscript b/src/mesa/SConscript index d20b1585a25..f72e380097a 100644 --- a/src/mesa/SConscript +++ b/src/mesa/SConscript @@ -12,15 +12,15 @@ 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', + Dir('main'), # src/mesa/main/ build path '#/src/mesa/main', '#/src/gallium/include', '#/src/gallium/auxiliary', - Dir('../mapi'), # src/mapi build path - Dir('.'), # src/mesa build path - Dir('main'), # src/mesa/main/ build path ]) if env['platform'] == 'windows': @@ -115,7 +115,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]) # -- 2.30.2