summaryrefslogtreecommitdiff
path: root/src/glsl
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2011-02-11 17:38:54 +0000
committerJosé Fonseca <jfonseca@vmware.com>2011-02-11 20:09:26 +0000
commit982609f4cf2afc4e0afd450aa24907986bca41ab (patch)
tree93babf6ada7e9cc085a9f89bc5cb7368834a59b3 /src/glsl
parentae760279f142244590c8aa76e3139529ca42952f (diff)
scons: builtin_glsl_function on windows needs bundled getopt.
Diffstat (limited to 'src/glsl')
-rw-r--r--src/glsl/SConscript8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/glsl/SConscript b/src/glsl/SConscript
index ca17ddd6a2..7c6b6ae8c4 100644
--- 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])
@@ -105,6 +107,10 @@ if not env['crosscompile'] or env['platform'] == 'embedded':
Export('builtin_glsl_function')
+ if env['hostonly']:
+ Return()
+
+
sources += builtin_glsl_function
glsl = env.ConvenienceLibrary(