scons: Use inline wrap helpers more consistently.

This commit is contained in:
José Fonseca 2010-11-18 13:02:36 +00:00
parent 185d862cd8
commit 3dcc3153b0
3 changed files with 12 additions and 19 deletions

View file

@ -9,15 +9,9 @@ env.Append(CPPPATH = [
'#src/gallium/winsys/sw',
])
env.Append(CPPDEFINES = ['GALLIUM_RBUG', 'GALLIUM_TRACE', 'GALLIUM_GALAHAD'])
env.Prepend(LIBS = [
gallium,
'gdi32',
identity,
rbug,
trace,
galahad,
'user32',
'ws2_32',
])
@ -27,8 +21,13 @@ sources = [
graw_util,
]
env.Append(CPPDEFINES = 'GALLIUM_SOFTPIPE')
env.Prepend(LIBS = [softpipe])
if True:
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')
env.Prepend(LIBS = [llvmpipe])
graw = env.SharedLibrary(
target = 'graw',

View file

@ -7,9 +7,6 @@ env = env.Clone()
env.Prepend(LIBS = [
ws_xlib,
trace,
rbug,
galahad,
gallium,
])
@ -28,8 +25,8 @@ sources = [
]
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')

View file

@ -19,9 +19,6 @@ env.Prepend(LIBS = env['X11_LIBS'])
env.Prepend(LIBS = [
st_xlib,
ws_xlib,
trace,
rbug,
galahad,
glapi,
mesa,
glsl,
@ -34,11 +31,11 @@ sources = [
]
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')
env.Append(CPPDEFINES = ['GALLIUM_LLVMPIPE'])
env.Prepend(LIBS = [llvmpipe])
if False: