summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/SConscript9
-rw-r--r--src/gallium/SConscript4
-rw-r--r--src/gallium/targets/SConscript2
-rw-r--r--src/gallium/winsys/xlib/SConscript16
4 files changed, 17 insertions, 14 deletions
diff --git a/src/SConscript b/src/SConscript
index cd4896ada40..cf6db730da2 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -1,13 +1,12 @@
Import('*')
SConscript('glsl/SConscript')
-SConscript('gallium/SConscript')
if 'mesa' in env['statetrackers']:
- SConscript('mesa/SConscript')
+ SConscript('mesa/SConscript')
-SConscript('gallium/winsys/SConscript')
+SConscript('gallium/SConscript')
if platform != 'embedded':
- SConscript('glut/glx/SConscript')
- SConscript('glew/SConscript')
+ SConscript('glut/glx/SConscript')
+ SConscript('glew/SConscript')
diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index d56c5c84617..ba541f96367 100644
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -15,3 +15,7 @@ if platform != 'embedded':
if platform == 'windows':
SConscript('state_trackers/wgl/SConscript')
+
+SConscript('winsys/SConscript')
+
+SConscript('targets/SConscript')
diff --git a/src/gallium/targets/SConscript b/src/gallium/targets/SConscript
index 46cbe656f4f..266d705f89c 100644
--- a/src/gallium/targets/SConscript
+++ b/src/gallium/targets/SConscript
@@ -5,7 +5,7 @@ Import('*')
# 'drm/SConscript',
# ])
-if 'xlib' in env['winsys']:
+if 'xlib' in env['targets']:
SConscript([
'libgl-xlib/SConscript',
])
diff --git a/src/gallium/winsys/xlib/SConscript b/src/gallium/winsys/xlib/SConscript
index 587cdb8e38a..1a1879f1287 100644
--- a/src/gallium/winsys/xlib/SConscript
+++ b/src/gallium/winsys/xlib/SConscript
@@ -15,13 +15,13 @@ if env['platform'] == 'linux' \
'#/src/gallium/drivers',
])
- st_xlib = env.ConvenienceLibrary(
- target = 'ws_xlib',
- source = [
- 'xlib_cell.c',
- 'xlib_llvmpipe.c',
- 'xlib_softpipe.c',
- 'xlib_sw_winsys.c',
- ]
+ ws_xlib = env.ConvenienceLibrary(
+ target = 'ws_xlib',
+ source = [
+ 'xlib_cell.c',
+ 'xlib_llvmpipe.c',
+ 'xlib_softpipe.c',
+ 'xlib_sw_winsys.c',
+ ]
)
Export('ws_xlib')