From 0b57da0211452eb31a905dd7b288cd5a77b8e295 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Mon, 30 Sep 2013 22:13:54 +0100 Subject: [PATCH] scons: move SConscript from gallium/targets/ to mesa/drivers/dri/common/ Store scons side by side with the other build systems. v2: cleanup after a failed rebase Signed-off-by: Emil Velikov --- src/gallium/SConscript | 1 - src/mesa/drivers/SConscript | 5 ++++- .../SConscript.dri => mesa/drivers/dri/common/SConscript} | 0 3 files changed, 4 insertions(+), 2 deletions(-) rename src/{gallium/targets/SConscript.dri => mesa/drivers/dri/common/SConscript} (100%) diff --git a/src/gallium/SConscript b/src/gallium/SConscript index c68519df055..6e27be2c062 100644 --- a/src/gallium/SConscript +++ b/src/gallium/SConscript @@ -124,7 +124,6 @@ if not env['embedded']: if env['dri']: SConscript([ - 'targets/SConscript.dri', 'targets/dri-swrast/SConscript', 'targets/dri-vmwgfx/SConscript', ]) diff --git a/src/mesa/drivers/SConscript b/src/mesa/drivers/SConscript index 86aa868e5ee..9888e330688 100644 --- a/src/mesa/drivers/SConscript +++ b/src/mesa/drivers/SConscript @@ -6,7 +6,10 @@ if env['x11']: SConscript('x11/SConscript') if env['dri']: - SConscript('dri/common/xmlpool/SConscript') + SConscript([ + 'dri/common/xmlpool/SConscript', + 'dri/common/SConscript', + ]) if env['platform'] == 'windows': SConscript('windows/gdi/SConscript') diff --git a/src/gallium/targets/SConscript.dri b/src/mesa/drivers/dri/common/SConscript similarity index 100% rename from src/gallium/targets/SConscript.dri rename to src/mesa/drivers/dri/common/SConscript -- 2.30.2