Merge branch '7.8'

[mesa.git] / progs / SConscript

diff --git a/progs/SConscript b/progs/SConscript
index 544ea6475047433e879f611b28e3371d1aae9f0c..d84e0a8220a8ec77e4129c50bde774f24ae69afc 100644 (file)
--- a/progs/SConscript
+++ b/progs/SConscript
@@ -1,9 +1,59 @@
+Import('*')
+
+if env['platform'] == 'embedded':
+    Return()
+
 SConscript([
     'util/SConscript',
+])
+
+Import('util')
+
+progs_env = env.Clone()
+
+if progs_env['platform'] == 'windows':
+    progs_env.Append(CPPDEFINES = ['NOMINMAX'])
+    progs_env.Prepend(LIBS = [
+        'winmm',
+        'kernel32',
+        'user32',
+        'gdi32',
+    ])
+
+# OpenGL
+if progs_env['platform'] == 'windows':
+    progs_env.Prepend(LIBS = ['glu32', 'opengl32'])
+else:
+    progs_env.Tool('x11')
+    progs_env.Prepend(LIBS = ['GLU', 'GL'])
+
+# Glut
+progs_env.Prepend(LIBPATH = [glut.dir])
+progs_env.Prepend(LIBS = [glut.name])
+
+# GLEW
+progs_env.Prepend(LIBS = [glew])
+
+progs_env.Prepend(CPPPATH = [
+    '#progs/util',
+])
+
+progs_env.Prepend(LIBS = [
+    util,
+])
+
+Export('progs_env')
+
+SConscript([
     'demos/SConscript',
+    'glsl/SConscript',
     'redbook/SConscript',
     'samples/SConscript',
+    'tests/SConscript',
     'trivial/SConscript',
     'vp/SConscript',
+    'vpglsl/SConscript',
     'fp/SConscript',
+    'wgl/SConscript',
+    'perf/SConscript',
 ])