projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mesa: Move declaration to top of block.
[mesa.git]
/
src
/
gallium
/
targets
/
graw-xlib
/
SConscript
diff --git
a/src/gallium/targets/graw-xlib/SConscript
b/src/gallium/targets/graw-xlib/SConscript
index 21fce948f43c7c24a08fbe27c890b0b5762f8a5f..76e4d4fd64ee409f62720f28d890d562b4bc814a 100644
(file)
--- a/
src/gallium/targets/graw-xlib/SConscript
+++ b/
src/gallium/targets/graw-xlib/SConscript
@@
-3,56
+3,42
@@
Import('*')
Import('*')
-if env['platform'] != 'linux':
- Return()
-
env = env.Clone()
env = env.Clone()
-env.Tool('x11')
-
env.Prepend(LIBS = [
ws_xlib,
env.Prepend(LIBS = [
ws_xlib,
- trace,
- rbug,
- identity,
-# gallium,
+ gallium,
])
])
+env.Append(LIBS = env['X11_LIBS'])
+env.Append(LIBPATH = env['X11_LIBPATH'])
+
env.Append(CPPPATH = [
'#src/gallium/drivers',
'#src/gallium/include/state_tracker',
env.Append(CPPPATH = [
'#src/gallium/drivers',
'#src/gallium/include/state_tracker',
+ '#src/gallium/winsys',
])
])
+env.Append(CPPDEFINES = ['GALLIUM_RBUG', 'GALLIUM_TRACE', 'GALLIUM_GALAHAD'])
sources = [
'graw_xlib.c',
sources = [
'graw_xlib.c',
- 'graw_util.c',
+ graw_util
]
]
-env.Tool('x11')
-
if True:
if True:
- env.Append(CPPDEFINES =
'GALLIUM_SOFTPIPE'
)
- env.Prepend(LIBS = [softpipe])
+ env.Append(CPPDEFINES =
['GALLIUM_TRACE', 'GALLIUM_RBUG', 'GALLIUM_GALAHAD', 'GALLIUM_SOFTPIPE']
)
+ env.Prepend(LIBS = [
trace, rbug, galahad,
softpipe])
if env['llvm']:
env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE')
if env['llvm']:
env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE')
- env.Tool('udis86')
env.Prepend(LIBS = [llvmpipe])
env.Prepend(LIBS = [llvmpipe])
-# Need this for trace, identity drivers referenced by
-# gallium_wrap_screen().
-#
-env.Prepend(LIBS = [gallium])
-
-# TODO: write a wrapper function http://www.scons.org/wiki/WrapperFunctions
graw = env.SharedLibrary(
target ='graw',
source = sources,
)
graw = env.SharedLibrary(
target ='graw',
source = sources,
)
-env.InstallSharedLibrary(graw, version=(1, 0))
-
-graw = env.FindIxes(graw, 'SHLIBPREFIX', 'SHLIBSUFFIX')
+graw = env.InstallSharedLibrary(graw, version=(1, 0))
-
Export('graw'
)
+
env.Alias('graw-xlib', graw
)