X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=progs%2FSConscript;h=a90e13b4cb484e9ea057e0fade8ac741503ec9e4;hb=7b48d88407655dc135d7a3c2c47d9df3e8dff01e;hp=3b180d00bc2396af24e44f8b63392422a379601d;hpb=0fb1eaddfbaf487067e0ff4f1d6f82145b6b0acd;p=mesa.git diff --git a/progs/SConscript b/progs/SConscript index 3b180d00bc2..a90e13b4cb4 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() @@ -22,17 +27,18 @@ else: progs_env.Prepend(LIBS = ['GLU', 'GL']) # Glut -progs_env.Prepend(LIBS = [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/util', ]) progs_env.Prepend(LIBS = [ - util, + util, ]) Export('progs_env') @@ -49,4 +55,6 @@ SConscript([ 'fp/SConscript', 'wgl/SConscript', 'perf/SConscript', + 'gallium/unit/SConscript', +# 'gallium/raw/SConscript', ])