From: Emil Velikov <emil.veli...@collabora.com> Analogous to previous commit.
Cc: "11.2 12.0" <mesa-sta...@lists.freedesktop.org> Cc: Alexander von Gluck IV <kallis...@unixzen.com> Signed-off-by: Emil Velikov <emil.veli...@collabora.com> --- Alexander, if my earlier suggestion(s) don't get you past the gl_function_remap build issue. please give this a try. --- src/mesa/SConscript | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mesa/SConscript b/src/mesa/SConscript index d20b158..f72e380 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.8.2 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev