diff options
| author | José Fonseca <jfonseca@vmware.com> | 2009-12-31 21:10:25 +0000 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2010-01-01 12:16:19 +0000 |
| commit | 7bbf7f94ea786e41ff1364cedaf7dd5c0bbf605a (patch) | |
| tree | f1869014d019a56360916119528e8a2cad7ef1bd /progs/tests/SConscript | |
| parent | 58b401315b1db3c2c483e1d1df372be76ca1001a (diff) | |
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 'progs/tests/SConscript')
| -rw-r--r-- | progs/tests/SConscript | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/progs/tests/SConscript b/progs/tests/SConscript index ae6488b3e6..e2c6538288 100644 --- a/progs/tests/SConscript +++ b/progs/tests/SConscript @@ -1,23 +1,5 @@ Import('*') -if not env['GLUT']: - Return() - -env = env.Clone() - -env.Prepend(CPPPATH = [ - '../util', -]) - -env.Prepend(LIBS = [ - util, - '$GLUT_LIB' -]) - -if env['platform'] == 'windows': - env.Append(CPPDEFINES = ['NOMINMAX']) - env.Prepend(LIBS = ['winmm']) - linux_progs = [ 'api_speed', ] @@ -140,7 +122,7 @@ progs = [ ] for prog in progs: - env.Program( + progs_env.Program( target = prog, source = prog + '.c', ) |