diff options
| author | Zack Rusin <[email protected]> | 2010-03-15 15:24:38 -0400 |
|---|---|---|
| committer | Zack Rusin <[email protected]> | 2010-03-15 15:24:38 -0400 |
| commit | 275c4bd3643d773210780cb8d578ca84f2604684 (patch) | |
| tree | 8266edc39d4253ac0f2a0ecd41f560f3d815bb5c /progs/SConscript | |
| parent | c5c5cd7132e18f4aad8e73d8ee879f8823c4c1e7 (diff) | |
| parent | d0b35352ed27b1e66785c45ee95a352ed06b47ce (diff) | |
Merge remote branch 'origin/master' into gallium_draw_llvm
Diffstat (limited to 'progs/SConscript')
| -rw-r--r-- | progs/SConscript | 81 |
1 files changed, 43 insertions, 38 deletions
diff --git a/progs/SConscript b/progs/SConscript index 2ec95a282e8..aa6640cf7a6 100644 --- a/progs/SConscript +++ b/progs/SConscript @@ -1,8 +1,13 @@ +Import('*') + +if env['platform'] == 'embedded': + Return() + SConscript([ 'util/SConscript', ]) -Import('*') +Import('util') progs_env = env.Clone() @@ -15,40 +20,40 @@ if progs_env['platform'] == 'windows': 'gdi32', ]) -if platform != 'embedded': - # OpenGL - if progs_env['platform'] == 'windows': - progs_env.Prepend(LIBS = ['glu32', 'opengl32']) - else: - progs_env.Prepend(LIBS = ['GLU', 'GL']) - - # Glut - progs_env.Prepend(LIBPATH = [glut.dir]) - progs_env.Prepend(LIBS = [glut.name]) - - # GLEW - progs_env.Prepend(LIBS = [glew]) - - progs_env.Prepend(CPPPATH = [ - '#progs/util', - ]) - - progs_env.Prepend(LIBS = [ - util, - ]) - - Export('progs_env') - - SConscript([ - 'demos/SConscript', - 'glsl/SConscript', - 'redbook/SConscript', - 'samples/SConscript', - 'tests/SConscript', - 'trivial/SConscript', - 'vp/SConscript', - 'vpglsl/SConscript', - 'fp/SConscript', - 'wgl/SConscript', - 'perf/SConscript', - ]) +# OpenGL +if progs_env['platform'] == 'windows': + progs_env.Prepend(LIBS = ['glu32', 'opengl32']) +else: + progs_env.Prepend(LIBS = ['GLU', 'GL']) + +# Glut +progs_env.Prepend(LIBPATH = [glut.dir]) +progs_env.Prepend(LIBS = [glut.name]) + +# GLEW +progs_env.Prepend(LIBS = [glew]) + +progs_env.Prepend(CPPPATH = [ + '#progs/util', +]) + +progs_env.Prepend(LIBS = [ + util, +]) + +Export('progs_env') + +SConscript([ + 'demos/SConscript', + 'glsl/SConscript', + 'redbook/SConscript', + 'samples/SConscript', + 'tests/SConscript', + 'trivial/SConscript', + 'vp/SConscript', + 'vpglsl/SConscript', + 'fp/SConscript', + 'wgl/SConscript', + 'perf/SConscript', + 'gallium/unit/SConscript', +]) |