scons: builtin_glsl_function on windows needs bundled getopt.

[mesa.git] / src / glsl / SConscript

diff --git a/src/glsl/SConscript b/src/glsl/SConscript
index ca17ddd6a2cbaa4ef53b50de1e84475c2976dd92..7c6b6ae8c4df80541653cf1a257c3424a2933fa2 100644 (file)
--- a/src/glsl/SConscript
+++ b/src/glsl/SConscript
@@ -82,7 +82,9 @@ sources = [
 ] 
 
 
 ] 
 
 

-if not env['crosscompile'] or env['platform'] == 'embedded':
+if env['crosscompile'] and env['platform'] != 'embedded':
+    Import('builtin_glsl_function')
+else:

     if env['msvc']:
         env.Prepend(CPPPATH = ['#/src/getopt'])
         env.PrependUnique(LIBS = [getopt])
     if env['msvc']:
         env.Prepend(CPPPATH = ['#/src/getopt'])
         env.PrependUnique(LIBS = [getopt])


@@ -105,6 +107,10 @@ if not env['crosscompile'] or env['platform'] == 'embedded':
 
     Export('builtin_glsl_function')
 
 
     Export('builtin_glsl_function')
 

+    if env['hostonly']:
+        Return()
+
+

 sources += builtin_glsl_function
 
 glsl = env.ConvenienceLibrary(
 sources += builtin_glsl_function
 
 glsl = env.ConvenienceLibrary(