glapi: Move to src/mapi/.

[mesa.git] / progs / glsl / SConscript

diff --git a/progs/glsl/SConscript b/progs/glsl/SConscript
index 7a4549cd705e08e20ea2a269ab8427b954e04371..02884e5a7102e2af1a0aefdb885205fda01b2ff9 100644 (file)
--- a/progs/glsl/SConscript
+++ b/progs/glsl/SConscript
@@ -1,23 +1,5 @@
 Import('*')
 
-if not env['GLUT']:
-    Return()
-
-env = env.Clone()
-
-env.Prepend(CPPPATH = [
-       '../util',
-])
-
-env.Prepend(LIBS = [
-       util,
-       '$GLUT_LIB'
-])
-
-if env['platform'] == 'windows':
-    env.Append(CPPDEFINES = ['NOMINMAX'])
-    env.Prepend(LIBS = ['winmm'])
-
 progs = [
       'array',
       'bitmap',
@@ -26,6 +8,7 @@ progs = [
       'convolutions',
       'deriv',
       'fragcoord',
+      'fsraytrace',
       'identity',
       'linktest',
       'mandelbrot',
@@ -45,10 +28,11 @@ progs = [
       'twoside',
       'vert-or-frag-only',
       'vert-tex',
+      'vsraytrace',
 ]
 
 for prog in progs:
-    env.Program(
+    progs_env.Program(
         target = prog,
         source = prog + '.c',
     )