summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2011-01-13 20:52:01 +0000
committerJosé Fonseca <jfonseca@vmware.com>2011-01-13 20:53:42 +0000
commite1bc68b0140fef465cda26b74602aeb1cbcfdafc (patch)
treeed3527b8a77b7304494abde1f7ea8eb1edc53e06 /src
parent0448f73f06b92dfd04e553147cac0e240dbabbdd (diff)
scons: Fix cross-compilation.
Hairy stuff. Don't know how to do it better though.
Diffstat (limited to 'src')
-rw-r--r--src/SConscript3
-rw-r--r--src/glsl/SConscript69
2 files changed, 42 insertions, 30 deletions
diff --git a/src/SConscript b/src/SConscript
index 38137ee9028..201812c5ac3 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -3,6 +3,9 @@ Import('*')
if env['platform'] == 'windows':
SConscript('getopt/SConscript')
SConscript('talloc/SConscript')
+else:
+ talloc = 'talloc'
+ Export('talloc')
SConscript('glsl/SConscript')
SConscript('mapi/glapi/SConscript')
diff --git a/src/glsl/SConscript b/src/glsl/SConscript
index a22fceb75c7..88a83fdb6fa 100644
--- a/src/glsl/SConscript
+++ b/src/glsl/SConscript
@@ -9,6 +9,7 @@ env = env.Clone()
env.Prepend(CPPPATH = [
'#src/mapi',
'#src/mesa',
+ '#src/glsl',
])
if env['platform'] == 'windows':
@@ -78,46 +79,54 @@ sources = [
'opt_tree_grafting.cpp',
's_expression.cpp',
'strtod.c',
-]
+]
-if env['msvc']:
- env.Prepend(CPPPATH = ['#/src/getopt'])
- env.PrependUnique(LIBS = [getopt])
-if env['platform'] == 'windows':
- env.Prepend(LIBS = [talloc])
-else:
- env.Prepend(LIBS = ['talloc'])
+if env['platform'] == common.host_platform:
+ if env['msvc']:
+ env.Prepend(CPPPATH = ['#/src/getopt'])
+ env.PrependUnique(LIBS = [getopt])
-env.Append(CPPPATH = ['#/src/glsl'])
+ if env['platform'] == 'windows':
+ env.Prepend(CPPPATH = ['#src/talloc'])
+ env.Prepend(LIBS = [talloc])
+ else:
+ env.Prepend(LIBS = ['talloc'])
-builtin_compiler = env.Program(
- target = 'builtin_compiler',
- source = sources + ['main.cpp', 'builtin_stubs.cpp',
- '#src/mesa/program/hash_table.c',
- '#src/mesa/program/symbol_table.c'],
-)
+ builtin_compiler = env.Program(
+ target = 'builtin_compiler',
+ source = sources + ['main.cpp', 'builtin_stubs.cpp',
+ '#src/mesa/program/hash_table.c',
+ '#src/mesa/program/symbol_table.c'],
+ )
-env.CodeGenerate(
- target = 'builtin_function.cpp',
- script = 'builtins/tools/generate_builtins.py',
- source = builtin_compiler,
- command = python_cmd + ' $SCRIPT $SOURCE > $TARGET'
-)
+ builtin_glsl_function = env.CodeGenerate(
+ target = 'builtin_function.cpp',
+ script = 'builtins/tools/generate_builtins.py',
+ source = builtin_compiler,
+ command = python_cmd + ' $SCRIPT $SOURCE > $TARGET'
+ )
+
+ env.Depends(builtin_glsl_function, ['builtins/tools/generate_builtins.py', 'builtins/tools/texture_builtins.py'] + Glob('builtins/ir/*'))
+
+ if env['msvc']:
+ # There is no LD_LIBRARY_PATH equivalent on Windows. We need to ensure
+ # talloc.dll is on the same dir as builtin_function.
+ talloc_dll_src = talloc.dir.File('talloc.dll')
+ talloc_dll_dst = builtin_compiler[0].dir.File('talloc.dll')
+ talloc_dll = env.Command(talloc_dll_dst, talloc_dll_src, Copy(talloc_dll_dst, talloc_dll_src))
+ env.Depends('builtin_function.cpp', talloc_dll)
+
+ Export('builtin_glsl_function')
-env.Depends('builtin_function.cpp', ['builtins/tools/generate_builtins.py', 'builtins/tools/texture_builtins.py'] + Glob('builtins/ir/*'))
+ if common.cross_compiling:
+ Return()
-if env['msvc']:
- # There is no LD_LIBRARY_PATH equivalent on Windows. We need to ensure
- # talloc.dll is on the same dir as builtin_function.
- talloc_dll_src = talloc.dir.File('talloc.dll')
- talloc_dll_dst = builtin_compiler[0].dir.File('talloc.dll')
- talloc_dll = env.Command(talloc_dll_dst, talloc_dll_src, Copy(talloc_dll_dst, talloc_dll_src))
- env.Depends('builtin_function.cpp', talloc_dll)
+sources += builtin_glsl_function
glsl = env.ConvenienceLibrary(
target = 'glsl',
- source = sources + [ 'builtin_function.cpp' ],
+ source = sources,
)
Export('glsl')