diff options
| author | Kenneth Graunke <[email protected]> | 2011-01-24 10:35:48 -0800 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2011-01-31 10:17:10 -0800 |
| commit | 8aac5d123c4636fad5e9d70c3a6706aaa6f1f240 (patch) | |
| tree | 27618281c2761dc2fcbc6ec85d2d7383e6bada24 /src/glsl/SConscript | |
| parent | d1d8120545b0bd2f7ec48c5f03c77b967b082e04 (diff) | |
Remove talloc from the SCons build system.
Diffstat (limited to 'src/glsl/SConscript')
| -rw-r--r-- | src/glsl/SConscript | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/src/glsl/SConscript b/src/glsl/SConscript index 078b400e9d9..6a2347625c7 100644 --- a/src/glsl/SConscript +++ b/src/glsl/SConscript @@ -12,9 +12,6 @@ env.Prepend(CPPPATH = [ '#src/glsl', ]) -if env['platform'] == 'windows': - env.Prepend(CPPPATH = ['#src/talloc']) - sources = [ 'glcpp/glcpp-lex.c', 'glcpp/glcpp-parse.c', @@ -88,13 +85,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', @@ -111,14 +101,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: @@ -143,7 +125,7 @@ if env['platform'] == 'windows': 'user32', ]) -env.Prepend(LIBS = [glsl, talloc]) +env.Prepend(LIBS = [glsl]) env.Program( target = 'glsl2', |