Merge branch 'mesa_7_7_branch'

[mesa.git] / progs / trivial / SConscript

diff --git a/progs/trivial/SConscript b/progs/trivial/SConscript
index 97820dc3b85167c0e196cf2c57835f50bd990b88..613383c77b1a374e887a6386e99b9065b7fadc6d 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',
@@ -87,6 +83,7 @@ progs = [
        'tri-cull',
        'tri-dlist',
        'tri-edgeflag',
+       'tri-fbo-tex-mip',
        'tri-fbo-tex',
        'tri-fbo',
        'tri-flat-clip',
@@ -95,6 +92,8 @@ progs = [
        'tri-fp',
        'tri-fp-const-imm',
        'tri-lit',
+       'tri-logicop-none',
+       'tri-logicop-xor',
        'tri-mask-tri',
        'tri-orig',
        'tri-query',
@@ -102,6 +101,7 @@ progs = [
        'tri-scissor-tri',
        'tri-stencil',
        'tri-stipple',
+       'tri-multitex-vbo',
        'tri-tex',
        'tri-tex-3d',
        'tri-tri',
@@ -128,6 +128,7 @@ progs = [
        'tristrip-flat',
        'tristrip',
        'vbo-drawarrays',
+       'vbo-noninterleaved',
        'vbo-drawelements',
        'vbo-drawrange',
        'vp-array',
@@ -135,6 +136,7 @@ progs = [
        'vp-clip',
        'vp-line-clip',
        'vp-tri',
+       'vp-tri-invariant',
        'vp-tri-swap',
        'vp-tri-tex',
        'vp-tri-imm',
@@ -145,7 +147,7 @@ progs = [
 ]
 
 for prog in progs:
-    prog = env.Program(
+    prog = progs_env.Program(
         target = prog,
         source = prog + '.c',
     )