diff options
| author | Stephane Marchesin <marchesin@icps.u-strasbg.fr> | 2009-02-02 02:13:07 +0100 |
|---|---|---|
| committer | Stephane Marchesin <marchesin@icps.u-strasbg.fr> | 2009-02-02 02:13:07 +0100 |
| commit | 59edbc70cd1042a884e7d153ba547c2f7f87318d (patch) | |
| tree | c5764fc515f31ab8017d63b476c8ec1178d41d96 /progs/demos/SConscript | |
| parent | 4035e0f8989754ee7d31212e69d6461f1bbff008 (diff) | |
| parent | 1c90cdd878e9d10e1f6ac619d5d0c3f5151fcb2b (diff) | |
Merge branch 'gallium-0.2' of git+ssh://marcheu@git.freedesktop.org/git/mesa/mesa into gallium-0.2
Diffstat (limited to 'progs/demos/SConscript')
| -rw-r--r-- | progs/demos/SConscript | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/progs/demos/SConscript b/progs/demos/SConscript index 112da7bedb..bc166dd789 100644 --- a/progs/demos/SConscript +++ b/progs/demos/SConscript @@ -1,11 +1,22 @@ -Import('env') +Import('*') if not env['GLUT']: Return() env = env.Clone() -env.Prepend(LIBS = ['$GLUT_LIB']) +env.Prepend(CPPPATH = [ + '../util', +]) + +env.Prepend(LIBS = [ + util, + '$GLUT_LIB' +]) + +if env['platform'] == 'windows': + env.Append(CPPDEFINES = ['NOMINMAX']) + env.Prepend(LIBS = ['winmm']) progs = [ 'arbfplight', @@ -38,7 +49,6 @@ progs = [ 'multiarb', 'paltex', 'pointblast', - 'rain', 'ray', 'readpix', 'reflect', @@ -65,7 +75,15 @@ progs = [ ] for prog in progs: - prog = env.Program( + env.Program( target = prog, source = prog + '.c', ) + +env.Program( + target = 'rain', + source = [ + 'rain.cxx', + 'particles.cxx', + ] +) |