Mesa (7.10): Remove talloc from the SCons build system.
Kenneth Graunke
kwg at kemper.freedesktop.org
Tue Feb 8 00:09:00 UTC 2011
Module: Mesa
Branch: 7.10
Commit: 5c1e361b8ead915d5f009d3fd2bd14c951f6cf65
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5c1e361b8ead915d5f009d3fd2bd14c951f6cf65
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Thu Feb 3 16:11:29 2011 -0800
Remove talloc from the SCons build system.
(cherry picked from commit 8aac5d123c4636fad5e9d70c3a6706aaa6f1f240)
Conflicts:
src/SConscript
src/gallium/targets/egl-static/SConscript
src/glsl/SConscript
src/mesa/SConscript
---
src/SConscript | 1 -
src/gallium/targets/SConscript.dri | 1 -
src/gallium/targets/libgl-gdi/SConscript | 1 -
src/gallium/targets/libgl-xlib/SConscript | 1 -
src/glsl/SConscript | 6 ++----
src/mesa/SConscript | 1 -
src/talloc/SConscript | 20 --------------------
7 files changed, 2 insertions(+), 29 deletions(-)
diff --git a/src/SConscript b/src/SConscript
index c42d9bf..269e232 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -4,7 +4,6 @@ SConscript('mapi/vgapi/SConscript')
if env['platform'] == 'windows':
SConscript('egl/main/SConscript')
- SConscript('talloc/SConscript')
SConscript('glsl/SConscript')
SConscript('mapi/glapi/SConscript')
diff --git a/src/gallium/targets/SConscript.dri b/src/gallium/targets/SConscript.dri
index bc3671a..101863a 100644
--- a/src/gallium/targets/SConscript.dri
+++ b/src/gallium/targets/SConscript.dri
@@ -72,7 +72,6 @@ COMMON_DRI_DRM_OBJECTS = [
drienv.AppendUnique(LIBS = [
'expat',
- 'talloc',
])
Export([
diff --git a/src/gallium/targets/libgl-gdi/SConscript b/src/gallium/targets/libgl-gdi/SConscript
index 6fa0851..ec7dbad 100644
--- 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',
- talloc,
])
sources = ['libgl_gdi.c']
diff --git a/src/gallium/targets/libgl-xlib/SConscript b/src/gallium/targets/libgl-xlib/SConscript
index d932736..7f0f245 100644
--- a/src/gallium/targets/libgl-xlib/SConscript
+++ b/src/gallium/targets/libgl-xlib/SConscript
@@ -23,7 +23,6 @@ env.Prepend(LIBS = [
mesa,
glsl,
gallium,
- 'talloc'
])
sources = [
diff --git a/src/glsl/SConscript b/src/glsl/SConscript
index d0b79b1..c1adfe8 100644
--- a/src/glsl/SConscript
+++ b/src/glsl/SConscript
@@ -7,11 +7,9 @@ env = env.Clone()
env.Prepend(CPPPATH = [
'#src/mapi',
'#src/mesa',
+ '#src/glsl',
])
-if env['platform'] == 'windows':
- env.Prepend(CPPPATH = ['#src/talloc'])
-
sources = [
'glcpp/glcpp-lex.c',
'glcpp/glcpp-parse.c',
@@ -97,7 +95,7 @@ if env['platform'] == 'windows':
'user32',
])
-env.Prepend(LIBS = [glsl, talloc])
+env.Prepend(LIBS = [glsl])
env.Program(
target = 'glsl2',
diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index cc4ad09..0e93ab7 100644
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -17,7 +17,6 @@ if env['platform'] == 'windows':
'_GDI32_', # prevent gl* being declared __declspec(dllimport) in MS headers
'BUILD_GL32', # declare gl* as __declspec(dllexport) in Mesa headers
])
- env.Prepend(CPPPATH = ['#src/talloc'])
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
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')
More information about the mesa-commit
mailing list