Remove talloc from the SCons build system.

diff --git a/src/SConscript b/src/SConscript
index 06c6f94bf0c2c9c17a9a55895d1c05976e19ad2f..d5cde1c96423cc79f2024c70d034ab27dc7c3072 100644 (file)
--- a/src/SConscript
+++ b/src/SConscript
@@ -2,10 +2,6 @@ Import('*')
 
 if env['platform'] == 'windows':
     SConscript('getopt/SConscript')
 
 if env['platform'] == 'windows':
     SConscript('getopt/SConscript')

-    SConscript('talloc/SConscript')
-else:
-    talloc = 'talloc'
-    Export('talloc')

 
 SConscript('glsl/SConscript')
 # When env['gles'] is set, the targets defined in mapi/glapi/SConscript are not
 
 SConscript('glsl/SConscript')
 # When env['gles'] is set, the targets defined in mapi/glapi/SConscript are not

diff --git a/src/gallium/targets/SConscript.dri b/src/gallium/targets/SConscript.dri
index bc3671a256bb4612fb92bb61edc5a2b138223270..101863a68489c3dd9775da2b04bd4b793e3d811c 100644 (file)
--- a/src/gallium/targets/SConscript.dri
+++ b/src/gallium/targets/SConscript.dri
@@ -72,7 +72,6 @@ COMMON_DRI_DRM_OBJECTS = [
 
 drienv.AppendUnique(LIBS = [
     'expat',
 
 drienv.AppendUnique(LIBS = [
     'expat',

-    'talloc',

 ])
 
 Export([
 ])
 
 Export([

diff --git a/src/gallium/targets/egl-static/SConscript b/src/gallium/targets/egl-static/SConscript
index c978934a0c8b577bfa7b95e8f0125ee793d2edc2..974c35e46a70a41d3476a229f69195e6b7cb6e57 100644 (file)
--- a/src/gallium/targets/egl-static/SConscript
+++ b/src/gallium/targets/egl-static/SConscript
@@ -69,7 +69,7 @@ if env['gles']:
     env.Prepend(LIBPATH = [shared_glapi.dir])
     # manually add LIBPREFIX on windows
     glapi_name = 'glapi' if env['platform'] != 'windows' else 'libglapi'
     env.Prepend(LIBPATH = [shared_glapi.dir])
     # manually add LIBPREFIX on windows
     glapi_name = 'glapi' if env['platform'] != 'windows' else 'libglapi'

-    env.Prepend(LIBS = [glapi_name, talloc, glsl, mesa])
+    env.Prepend(LIBS = [glapi_name, glsl, mesa])

 
 # OpenVG
 if True:
 
 # OpenVG
 if True:

diff --git a/src/gallium/targets/libgl-gdi/SConscript b/src/gallium/targets/libgl-gdi/SConscript
index c088d4c2ae65966340ade23f13335b5809482561..49462a8e309cf4235fdae2035f799579770c3cb9 100644 (file)
--- a/src/gallium/targets/libgl-gdi/SConscript
+++ b/src/gallium/targets/libgl-gdi/SConscript
@@ -15,7 +15,6 @@ env.Append(LIBS = [
     'user32',
     'kernel32',
     'ws2_32',
     'user32',
     'kernel32',
     'ws2_32',

-    talloc,

 ])
 
 sources = ['libgl_gdi.c']
 ])
 
 sources = ['libgl_gdi.c']

diff --git a/src/gallium/targets/libgl-xlib/SConscript b/src/gallium/targets/libgl-xlib/SConscript
index 9bb0a56525e08489a15eebf75388f30243ea53c3..ca15372f1d9dc14d00dbe482a53f20ba6acb2cf1 100644 (file)
--- a/src/gallium/targets/libgl-xlib/SConscript
+++ b/src/gallium/targets/libgl-xlib/SConscript
@@ -29,7 +29,6 @@ env.Prepend(LIBS = [
     mesa,
     glsl,
     gallium,
     mesa,
     glsl,
     gallium,

-    'talloc'

 ])
 
 sources = [
 ])
 
 sources = [

diff --git a/src/glsl/SConscript b/src/glsl/SConscript
index 078b400e9d9f14ab651a9b62019ec4f422b35eb6..6a2347625c7a32892fa93ac3aa9c4dcc160130f5 100644 (file)
--- a/src/glsl/SConscript
+++ b/src/glsl/SConscript
@@ -12,9 +12,6 @@ env.Prepend(CPPPATH = [
     '#src/glsl',
 ])
 
     '#src/glsl',
 ])
 

-if env['platform'] == 'windows':
-    env.Prepend(CPPPATH = ['#src/talloc'])
-

 sources = [
     'glcpp/glcpp-lex.c',
     'glcpp/glcpp-parse.c',
 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])
 
         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',
     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/*'))
 
 
     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:
     Export('builtin_glsl_function')
 
     if common.cross_compiling:


@@ -143,7 +125,7 @@ if env['platform'] == 'windows':
         'user32',
     ])
 
         'user32',
     ])
 

-env.Prepend(LIBS = [glsl, talloc])
+env.Prepend(LIBS = [glsl])

 
 env.Program(
     target = 'glsl2',
 
 env.Program(
     target = 'glsl2',

diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index 7c7c7c37c8348d5e5a9c439541753a80e41c3469..ea04fb1a0ee0cf0ce6d4350c5317ebea8c47dac2 100644 (file)
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -24,8 +24,6 @@ if env['platform'] == 'windows':
     if not env['gles']:
         # prevent _glapi_* from being declared __declspec(dllimport)
         env.Append(CPPDEFINES = ['_GLAPI_NO_EXPORTS'])
     if not env['gles']:
         # prevent _glapi_* from being declared __declspec(dllimport)
         env.Append(CPPDEFINES = ['_GLAPI_NO_EXPORTS'])

-
-    env.Prepend(CPPPATH = ['#src/talloc'])

 else:
     env.Append(CPPDEFINES = [
         'IN_DRI_DRIVER', # enable the remap table (for DRI drivers)
 else:
     env.Append(CPPDEFINES = [
         'IN_DRI_DRIVER', # enable the remap table (for DRI drivers)

diff --git a/src/talloc/SConscript b/src/talloc/SConscript
deleted file mode 100644 (file)
index 3bf7029..0000000
--- a/src/talloc/SConscript
+++ /dev/null
@@ -1,20 +0,0 @@
-Import('*')
-
-if env['platform'] != 'windows':
-    Return()
-
-env = env.Clone()
-
-talloc = env.SharedLibrary(
-    target = 'talloc',
-    source = ['talloc.c', 'talloc.def'],
-)
-
-env.InstallSharedLibrary(talloc)
-
-if env['platform'] == 'windows':
-    talloc = env.FindIxes(talloc, 'LIBPREFIX', 'LIBSUFFIX')
-else:
-    talloc = env.FindIxes(talloc, 'SHLIBPREFIX', 'SHLIBSUFFIX')
-
-Export('talloc')