Merge branch '7.8'

[mesa.git] / progs / SConscript

diff --git a/progs/SConscript b/progs/SConscript
index 3b180d00bc2396af24e44f8b63392422a379601d..d84e0a8220a8ec77e4129c50bde774f24ae69afc 100644 (file)
--- a/progs/SConscript
+++ b/progs/SConscript
@@ -1,8 +1,13 @@
+Import('*')
+
+if env['platform'] == 'embedded':
+    Return()
+
 SConscript([
     'util/SConscript',
 ])
 
-Import('*')
+Import('util')
 
 progs_env = env.Clone()
 
@@ -19,20 +24,22 @@ if progs_env['platform'] == 'windows':
 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(LIBS = [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/util',
 ])
 
 progs_env.Prepend(LIBS = [
-       util,
+    util,
 ])
 
 Export('progs_env')