Mesa (gallium-mesa-7.4): scons: Fixups for the introduction of the xlib state_tracker.
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Wed Mar 25 15:20:42 UTC 2009
Module: Mesa
Branch: gallium-mesa-7.4
Commit: dc88d8a7913c5c2da7ae0c1377dd8329796cbcb3
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=dc88d8a7913c5c2da7ae0c1377dd8329796cbcb3
Author: Michel Dänzer <daenzer at vmware.com>
Date: Mon Feb 2 14:49:33 2009 +0000
scons: Fixups for the introduction of the xlib state_tracker.
Not quite working yet; glxinfo complains about glXChooseVisual being undefined.
Conflicts:
src/gallium/SConscript
---
src/gallium/SConscript | 1 +
src/gallium/state_trackers/glx/xlib/SConscript | 26 ++++++++++++++++++++++++
src/gallium/winsys/xlib/SConscript | 10 +-------
3 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index 6a3e7e7..312867a 100644
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -27,3 +27,4 @@ for driver in env['drivers']:
SConscript(os.path.join('drivers', driver, 'SConscript'))
SConscript('state_trackers/python/SConscript')
+SConscript('state_trackers/glx/xlib/SConscript')
diff --git a/src/gallium/state_trackers/glx/xlib/SConscript b/src/gallium/state_trackers/glx/xlib/SConscript
new file mode 100644
index 0000000..14cdad6
--- /dev/null
+++ b/src/gallium/state_trackers/glx/xlib/SConscript
@@ -0,0 +1,26 @@
+#######################################################################
+# SConscript for xlib state_tracker
+
+Import('*')
+
+if env['platform'] == 'linux' \
+ and 'mesa' in env['statetrackers'] \
+ and ('softpipe' or 'i915simple' or 'trace') in env['drivers'] \
+ and not env['dri']:
+
+ env = env.Clone()
+
+ env.Append(CPPPATH = [
+ '#/src/mesa',
+ '#/src/mesa/main',
+ ])
+
+ st_xlib = env.ConvenienceLibrary(
+ target = 'st_xlib',
+ source = [ 'glxapi.c',
+ 'fakeglx.c',
+ 'fakeglx_fonts.c',
+ 'xm_api.c',
+ ]
+ )
+ Export('st_xlib')
diff --git a/src/gallium/winsys/xlib/SConscript b/src/gallium/winsys/xlib/SConscript
index 3aef3b6..434572f 100644
--- a/src/gallium/winsys/xlib/SConscript
+++ b/src/gallium/winsys/xlib/SConscript
@@ -15,13 +15,7 @@ if env['platform'] == 'linux' \
'#/src/mesa/main',
])
- sources = [
- 'glxapi.c',
- 'fakeglx.c',
- 'xfonts.c',
- 'xm_api.c',
- 'xm_winsys.c',
- ]
+ sources = [];
drivers = [];
@@ -43,7 +37,7 @@ if env['platform'] == 'linux' \
libgl = env.SharedLibrary(
target ='GL',
source = sources,
- LIBS = glapi + mesa + drivers + auxiliaries + env['LIBS'],
+ LIBS = st_xlib + glapi + mesa + drivers + auxiliaries + env['LIBS'],
)
env.InstallSharedLibrary(libgl, version=(1, 5))
More information about the mesa-commit
mailing list