summaryrefslogtreecommitdiff
path: root/SConstruct
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2009-12-31 21:10:25 +0000
committerJosé Fonseca <jfonseca@vmware.com>2010-01-01 12:16:19 +0000
commit7062e5ce30ae53709ca10529cb517b09bf7b8aba (patch)
treef7e082a5868715f22d7a27d19cb36f1b441c291d /SConstruct
parentfe220832c6eb24e6dc3a2c8c9292660431dd8c8e (diff)
downloadmesa-demos-7062e5ce30ae53709ca10529cb517b09bf7b8aba.tar.gz
scons: Build progs together with everything else.
This is a substantial reorganization, This particular commit enables: - building the progs for unices platforms - glew is now built as a shared library (it is the default, and it is inconvenient and pointless to shift away from that default) - all progs get built by default
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct8
1 files changed, 7 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct
index 0a545d5c..ed92518e 100644
--- a/SConstruct
+++ b/SConstruct
@@ -177,7 +177,7 @@ if env['platform'] != common.default_platform:
SConscript(
'src/glsl/SConscript',
- variant_dir = env['build'] + '/host',
+ variant_dir = os.path.join(env['build'], 'host'),
duplicate = 0, # http://www.scons.org/doc/0.97/HTML/scons-user/x2261.html
exports={'env':host_env},
)
@@ -187,3 +187,9 @@ SConscript(
variant_dir = env['build'],
duplicate = 0 # http://www.scons.org/doc/0.97/HTML/scons-user/x2261.html
)
+
+SConscript(
+ 'progs/SConscript',
+ variant_dir = os.path.join('progs', env['build']),
+ duplicate = 0 # http://www.scons.org/doc/0.97/HTML/scons-user/x2261.html
+)