summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Dänzer <daenzer@vmware.com>2009-02-02 15:49:33 +0100
committerMichel Dänzer <daenzer@vmware.com>2009-02-02 15:49:33 +0100
commit859db22527d796d186d3cdf83d503669472863cc (patch)
tree59633249adc09c7c6bf754d7a67a5f379f69df30
parentbe0a6c3598a5a18a5a605b155bae5c986d3fc3b3 (diff)
scons: Fixups for the introduction of the xlib state_tracker.
Not quite working yet; glxinfo complains about glXChooseVisual being undefined.
-rw-r--r--src/gallium/SConscript1
-rw-r--r--src/gallium/state_trackers/glx/xlib/SConscript26
-rw-r--r--src/gallium/winsys/xlib/SConscript10
3 files changed, 29 insertions, 8 deletions
diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index 9e4596a647..85baf51a7f 100644
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -27,6 +27,7 @@ for driver in env['drivers']:
SConscript(os.path.join('drivers', driver, 'SConscript'))
SConscript('state_trackers/python/SConscript')
+SConscript('state_trackers/glx/xlib/SConscript')
if platform == 'windows':
SConscript('state_trackers/wgl/SConscript')
diff --git a/src/gallium/state_trackers/glx/xlib/SConscript b/src/gallium/state_trackers/glx/xlib/SConscript
new file mode 100644
index 0000000000..14cdad69cb
--- /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 3aef3b6ced..434572fcd0 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))