fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 04:48:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: scons: list builddir before srcdir

Browse source 
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" <mesa-stable@lists.freedesktop.org>
Cc: Alexander von Gluck IV <kallisti5@unixzen.com>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
(cherry picked from commit 1c7c0d77ac)
[Emil Velikov: remove not-applicable "Dir('main')" entry]
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>

Conflicts:
	src/mesa/SConscript
This commit is contained in:
Emil Velikov 2016-07-18 19:23:02 +01:00 • committed by Emil Velikov
parent 1f3ce210cd
commit 485c6d231e
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/mesa/SConscript
View file

@ -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):