projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/gallium-draw-retval'
[mesa.git]
/
src
/
gallium
/
winsys
/
xlib
/
SConscript
diff --git
a/src/gallium/winsys/xlib/SConscript
b/src/gallium/winsys/xlib/SConscript
index 3aef3b6cedddb2e73026fbfeee387553a2a93c07..713841aeb1b6cb40e4450defa120b1152ab017a0 100644
(file)
--- a/
src/gallium/winsys/xlib/SConscript
+++ b/
src/gallium/winsys/xlib/SConscript
@@
-5,7
+5,7
@@
Import('*')
if env['platform'] == 'linux' \
and 'mesa' in env['statetrackers'] \
if env['platform'] == 'linux' \
and 'mesa' in env['statetrackers'] \
- and
('softpipe' or 'i915simple' or 'trace') in env['drivers']
\
+ and
set(('softpipe', 'llvmpipe', 'i915', 'trace')).intersection(env['drivers'])
\
and not env['dri']:
env = env.Clone()
and not env['dri']:
env = env.Clone()
@@
-13,37
+13,40
@@
if env['platform'] == 'linux' \
env.Append(CPPPATH = [
'#/src/mesa',
'#/src/mesa/main',
env.Append(CPPPATH = [
'#/src/mesa',
'#/src/mesa/main',
+ '#src/gallium/state_trackers/glx/xlib',
])
])
+ env.Append(CPPDEFINES = ['USE_XSHM'])
+
sources = [
sources = [
- 'glxapi.c',
- 'fakeglx.c',
- 'xfonts.c',
- 'xm_api.c',
- 'xm_winsys.c',
+ 'xlib.c',
]
]
- drivers = [
];
+ drivers = [
trace]
if 'softpipe' in env['drivers']:
if 'softpipe' in env['drivers']:
+ env.Append(CPPDEFINES = 'GALLIUM_SOFTPIPE')
+ sources += ['xlib_softpipe.c']
drivers += [softpipe]
drivers += [softpipe]
- if 'i965simple' in env['drivers']:
- drivers += [i965simple]
- sources += [
- 'brw_aub.c',
- 'xm_winsys_aub.c',
- ]
+ if 'llvmpipe' in env['drivers']:
+ env.Tool('llvm')
+ if 'LLVM_VERSION' in env:
+ env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE')
+ env.Tool('udis86')
+ sources += ['xlib_llvmpipe.c']
+ drivers += [llvmpipe]
- if 'trace' in env['drivers']:
- env.Append(CPPDEFINES = 'GALLIUM_TRACE')
- drivers += [trace]
+ if 'cell' in env['drivers']:
+ env.Append(CPPDEFINES = 'GALLIUM_CELL')
+ sources += ['xlib_cell.c']
+ drivers += [cell]
# TODO: write a wrapper function http://www.scons.org/wiki/WrapperFunctions
libgl = env.SharedLibrary(
target ='GL',
source = sources,
# TODO: write a wrapper function http://www.scons.org/wiki/WrapperFunctions
libgl = env.SharedLibrary(
target ='GL',
source = sources,
- LIBS =
glapi + mesa + drivers + auxiliaries
+ env['LIBS'],
+ LIBS =
st_xlib + glapi + mesa + glsl + drivers + gallium
+ env['LIBS'],
)
env.InstallSharedLibrary(libgl, version=(1, 5))
)
env.InstallSharedLibrary(libgl, version=(1, 5))