diff options
| author | Emil Velikov <[email protected]> | 2013-09-30 22:13:54 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2013-11-16 14:00:16 +0000 |
| commit | 0b57da0211452eb31a905dd7b288cd5a77b8e295 (patch) | |
| tree | e5e4e400b5e280a2f068d6c355681c1335545df9 | |
| parent | 595bd01eb1ab6df4d0454b4f9b158256be274bef (diff) | |
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 <[email protected]>
| -rw-r--r-- | src/gallium/SConscript | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/SConscript | 5 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/common/SConscript (renamed from src/gallium/targets/SConscript.dri) | 0 |
3 files changed, 4 insertions, 2 deletions
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 index 8b15532e3c0..8b15532e3c0 100644 --- a/src/gallium/targets/SConscript.dri +++ b/src/mesa/drivers/dri/common/SConscript |