summaryrefslogtreecommitdiff
path: root/src/glsl
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2011-02-11 16:44:13 +0000
committerJosé Fonseca <jfonseca@vmware.com>2011-02-11 20:09:26 +0000
commitae760279f142244590c8aa76e3139529ca42952f (patch)
treed293943af92cd7514536d9506d52858bf772225c /src/glsl
parent051f8bbfee6618e8bf04712cf214d96cec433e38 (diff)
scons: Try to support building 64bit binaries on 32bit windows.
Diffstat (limited to 'src/glsl')
-rw-r--r--src/glsl/SConscript5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/glsl/SConscript b/src/glsl/SConscript
index f55d7de744f..ca17ddd6a2c 100644
--- a/src/glsl/SConscript
+++ b/src/glsl/SConscript
@@ -82,7 +82,7 @@ sources = [
]
-if env['platform'] == common.host_platform:
+if not env['crosscompile'] or env['platform'] == 'embedded':
if env['msvc']:
env.Prepend(CPPPATH = ['#/src/getopt'])
env.PrependUnique(LIBS = [getopt])
@@ -105,9 +105,6 @@ if env['platform'] == common.host_platform:
Export('builtin_glsl_function')
- if common.cross_compiling:
- Return()
-
sources += builtin_glsl_function
glsl = env.ConvenienceLibrary(