Remove talloc from the SCons build system.

This commit is contained in:
Kenneth Graunke
2011-01-24 10:35:48 -08:00
parent d1d8120545
commit 8aac5d123c
8 changed files with 2 additions and 49 deletions

View File

@@ -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',