aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/glsl/SConscript
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-02-01 10:02:38 +0000
committermarha <marha@users.sourceforge.net>2011-02-01 10:02:38 +0000
commit0bf07d32cbd460220c67d726900772cf3692746d (patch)
treeba6b1e1937e42744591715078444891d4ade5b1e /mesalib/src/glsl/SConscript
parentcacf23d832a26e35851c9cc666304ac72cf8fe34 (diff)
downloadvcxsrv-0bf07d32cbd460220c67d726900772cf3692746d.tar.gz
vcxsrv-0bf07d32cbd460220c67d726900772cf3692746d.tar.bz2
vcxsrv-0bf07d32cbd460220c67d726900772cf3692746d.zip
libX11 libXinerama mesa git update 1 Feb 2011
Diffstat (limited to 'mesalib/src/glsl/SConscript')
-rw-r--r--mesalib/src/glsl/SConscript22
1 files changed, 3 insertions, 19 deletions
diff --git a/mesalib/src/glsl/SConscript b/mesalib/src/glsl/SConscript
index 5885e4b4f..2cc7b0eda 100644
--- a/mesalib/src/glsl/SConscript
+++ b/mesalib/src/glsl/SConscript
@@ -7,14 +7,12 @@ from sys import executable as python_cmd
env = env.Clone()
env.Prepend(CPPPATH = [
+ '#include',
'#src/mapi',
'#src/mesa',
'#src/glsl',
])
-if env['platform'] == 'windows':
- env.Prepend(CPPPATH = ['#src/talloc'])
-
sources = [
'glcpp/glcpp-lex.c',
'glcpp/glcpp-parse.c',
@@ -77,6 +75,7 @@ sources = [
'opt_structure_splitting.cpp',
'opt_swizzle_swizzle.cpp',
'opt_tree_grafting.cpp',
+ 'ralloc.c',
's_expression.cpp',
'strtod.c',
]
@@ -87,13 +86,6 @@ if env['platform'] == common.host_platform:
env.Prepend(CPPPATH = ['#/src/getopt'])
env.PrependUnique(LIBS = [getopt])
- if env['platform'] == 'windows':
- env.Prepend(CPPPATH = ['#src/talloc'])
- env.Prepend(LIBS = [talloc])
- else:
- env.Prepend(CPPPATH = ['#include'])
- env.Prepend(LIBS = ['talloc'])
-
builtin_compiler = env.Program(
target = 'builtin_compiler',
source = sources + ['main.cpp', 'builtin_stubs.cpp',
@@ -110,14 +102,6 @@ if env['platform'] == common.host_platform:
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')
if common.cross_compiling:
@@ -142,7 +126,7 @@ if env['platform'] == 'windows':
'user32',
])
-env.Prepend(LIBS = [glsl, talloc])
+env.Prepend(LIBS = [glsl])
env.Program(
target = 'glsl2',