diff options
| author | Emil Velikov <[email protected]> | 2016-07-18 19:23:02 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2016-07-20 13:32:24 +0100 |
| commit | 1c7c0d77ac1f7035558c37fc0297e9d22991d429 (patch) | |
| tree | c3d2530ba831bed346b629ce0db0c7c4314834cb /src/mesa | |
| parent | eafa82e20e35c532bd2918c62d0100cbbecc7f1f (diff) | |
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" <[email protected]>
Cc: Alexander von Gluck IV <[email protected]>
Signed-off-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/SConscript | 8 |
1 files 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]) # |