1 files changed, 43 insertions, 38 deletions
diff --git a/progs/SConscript b/progs/SConscript
index 2ec95a282e..aa6640cf7a 100644
--- 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()
 
@@ -15,40 +20,40 @@ if progs_env['platform'] == 'windows':
         'gdi32',
     ])
 
-if platform != 'embedded':
-	# OpenGL
-	if progs_env['platform'] == 'windows':
-   		progs_env.Prepend(LIBS = ['glu32', 'opengl32'])
-	else:
-		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',
-	])
+# OpenGL
+if progs_env['platform'] == 'windows':
+    progs_env.Prepend(LIBS = ['glu32', 'opengl32'])
+else:
+    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',
+    'gallium/unit/SConscript',
+])