Merge branch 'mesa_7_7_branch'

[mesa.git] / progs / trivial / SConscript

diff --git a/progs/trivial/SConscript b/progs/trivial/SConscript
index 6a9ffafe5096d90cb4e06fa7a851d037e09f0fd6..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',
@@ -26,6 +19,7 @@ progs = [
        'fs-tri',
        'line-clip',
        'line-cull',
+       'line-flat',
        'line-smooth',
        'line-stipple-wide',
        'line-userclip-clip',
@@ -107,6 +101,7 @@ progs = [
        'tri-scissor-tri',
        'tri-stencil',
        'tri-stipple',
+       'tri-multitex-vbo',
        'tri-tex',
        'tri-tex-3d',
        'tri-tri',
@@ -133,6 +128,7 @@ progs = [
        'tristrip-flat',
        'tristrip',
        'vbo-drawarrays',
+       'vbo-noninterleaved',
        'vbo-drawelements',
        'vbo-drawrange',
        'vp-array',
@@ -140,6 +136,7 @@ progs = [
        'vp-clip',
        'vp-line-clip',
        'vp-tri',
+       'vp-tri-invariant',
        'vp-tri-swap',
        'vp-tri-tex',
        'vp-tri-imm',
@@ -150,7 +147,7 @@ progs = [
 ]
 
 for prog in progs:
-    prog = env.Program(
+    prog = progs_env.Program(
         target = prog,
         source = prog + '.c',
     )