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

[android-x86/external-mesa.git] / progs / trivial / SConscript

diff --git a/progs/trivial/SConscript b/progs/trivial/SConscript
index 37a5329..2906256 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',
@@ -156,7 +149,7 @@ progs = [
 ]
 
 for prog in progs:
-    prog = env.Program(
+    prog = progs_env.Program(
         target = prog,
         source = prog + '.c',
     )