Merge branch '7.8'

[mesa.git] / progs / samples / SConscript

diff --git a/progs/samples/SConscript b/progs/samples/SConscript
index 7a8a0d62d81c1b00726d81ee730900b7c73b1bab..134dfa99807f47d2fb69bf4d55ae08ef34104d61 100644 (file)
--- a/progs/samples/SConscript
+++ b/progs/samples/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 = [
     'accum',
     'bitmap1',
@@ -52,7 +34,7 @@ progs = [
 ]
 
 for prog in progs:
-    env.Program(
+    progs_env.Program(
         target = prog,
         source = prog + '.c',
     )