Merge remote branch 'origin/master' into lp-binning

[mesa.git] / progs / trivial / SConscript

diff --git a/progs/trivial/SConscript b/progs/trivial/SConscript
index dc84a0550be68e25189e7c3aa5e25708ba26f3bd..29062564adc6eed3c9585a88070ac557dc0bd73e 100644 (file)
--- a/progs/trivial/SConscript
+++ b/progs/trivial/SConscript
@@ -1,11 +1,4 @@
-Import('env')
-
-if not env['GLUT']:
-    Return()
-
-env = env.Clone()
-
-env.Prepend(LIBS = ['$GLUT_LIB'])
+Import('*')
 
 progs = [
     'clear-fbo-tex',
@@ -19,12 +12,14 @@ progs = [
        'dlist-edgeflag',
        'dlist-degenerate',
        'drawarrays',
+       'draw2arrays',
        'drawelements',
        'drawrange',
        'flat-clip',
        'fs-tri',
        'line-clip',
        'line-cull',
+       'line-flat',
        'line-smooth',
        'line-stipple-wide',
        'line-userclip-clip',
@@ -65,6 +60,7 @@ progs = [
        'quad-tex-3d',
        'quad-tex-alpha',
        'quad-tex-pbo',
+       'quad-tex-sub',
        'quad-unfilled-clip',
        'quad-unfilled-stipple',
        'quad-unfilled',
@@ -74,6 +70,8 @@ progs = [
        'quadstrip-cont',
        'quadstrip-flat',
        'quadstrip',
+       'sub-tex',
+       'tex-quads',
        'tri-alpha',
        'tri-blend-color',
        'tri-blend-max',
@@ -87,6 +85,7 @@ progs = [
        'tri-cull',
        'tri-dlist',
        'tri-edgeflag',
+       'tri-fbo-tex-mip',
        'tri-fbo-tex',
        'tri-fbo',
        'tri-flat-clip',
@@ -95,12 +94,16 @@ progs = [
        'tri-fp',
        'tri-fp-const-imm',
        'tri-lit',
+       'tri-logicop-none',
+       'tri-logicop-xor',
        'tri-mask-tri',
        'tri-orig',
        'tri-query',
        'tri-repeat',
        'tri-scissor-tri',
        'tri-stencil',
+       'tri-stipple',
+       'tri-multitex-vbo',
        'tri-tex',
        'tri-tex-3d',
        'tri-tri',
@@ -127,6 +130,7 @@ progs = [
        'tristrip-flat',
        'tristrip',
        'vbo-drawarrays',
+       'vbo-noninterleaved',
        'vbo-drawelements',
        'vbo-drawrange',
        'vp-array',
@@ -134,6 +138,7 @@ progs = [
        'vp-clip',
        'vp-line-clip',
        'vp-tri',
+       'vp-tri-invariant',
        'vp-tri-swap',
        'vp-tri-tex',
        'vp-tri-imm',
@@ -144,7 +149,7 @@ progs = [
 ]
 
 for prog in progs:
-    prog = env.Program(
+    prog = progs_env.Program(
         target = prog,
         source = prog + '.c',
     )