diff options
| author | Michal Krol <michal@vmware.com> | 2010-03-10 15:49:30 +0100 |
|---|---|---|
| committer | Michal Krol <michal@vmware.com> | 2010-03-10 15:49:30 +0100 |
| commit | 3ce4375912c8ea488460e593e07c5bb15b92dca9 (patch) | |
| tree | 1011fa439bd829fd46a44fd99478135848800e73 /progs/SConscript | |
| parent | f59f28093ea827bd234d8e1a36bdd56a9fce5f09 (diff) | |
| parent | 9b348d0ed125a22be3f318ac60cef6f201edfdab (diff) | |
Merge branch 'master' into gallium-sampler-view
Conflicts:
src/gallium/auxiliary/Makefile
src/gallium/auxiliary/SConscript
src/gallium/auxiliary/tgsi/tgsi_exec.c
src/gallium/auxiliary/util/u_blitter.c
src/gallium/drivers/i915/i915_context.h
src/gallium/drivers/i965/brw_context.h
src/gallium/drivers/llvmpipe/lp_context.h
src/gallium/drivers/nv50/nv50_context.h
src/gallium/drivers/nv50/nv50_state_validate.c
src/gallium/drivers/nv50/nv50_tex.c
src/gallium/drivers/r300/r300_blit.c
src/gallium/drivers/r300/r300_context.h
src/gallium/drivers/r300/r300_emit.c
src/gallium/drivers/r300/r300_state.c
src/gallium/drivers/softpipe/sp_context.h
src/gallium/drivers/svga/svga_context.h
src/gallium/drivers/svga/svga_pipe_sampler.c
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 2ec95a282e..aa6640cf7a 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', +]) |