diff options
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/SConstruct b/SConstruct index e1c4a1898c..56d88cc1cc 100644 --- a/SConstruct +++ b/SConstruct @@ -52,7 +52,7 @@ opts.Add(ListVariable('statetrackers', 'state trackers to build', default_statet opts.Add(ListVariable('drivers', 'pipe drivers to build', default_drivers, ['softpipe', 'failover', 'svga', 'i915', 'i965', 'trace', 'r300', 'identity', 'llvmpipe'])) opts.Add(ListVariable('winsys', 'winsys drivers to build', default_winsys, - ['xlib', 'vmware', 'intel', 'i965', 'gdi', 'radeon'])) + ['xlib', 'vmware', 'i915', 'i965', 'gdi', 'radeon', 'graw-xlib'])) opts.Add(EnumVariable('MSVS_VERSION', 'MS Visual C++ version', None, allowed_values=('7.1', '8.0', '9.0'))) @@ -88,6 +88,8 @@ if drawllvm: env.Tool('llvm') if not env.has_key('LLVM_VERSION'): drawllvm = False +if drawllvm: + env.Append(CFLAGS = ['-DDRAW_LLVM=1']) # derived options x86 = machine == 'x86' @@ -110,9 +112,11 @@ Export([ ####################################################################### # Environment setup -# Always build trace driver +# Always build trace and identity drivers if 'trace' not in env['drivers']: env['drivers'].append('trace') +if 'identity' not in env['drivers']: + env['drivers'].append('identity') # Includes env.Append(CPPPATH = [ @@ -120,6 +124,7 @@ env.Append(CPPPATH = [ '#/src/gallium/include', '#/src/gallium/auxiliary', '#/src/gallium/drivers', + '#/src/gallium/winsys', ]) if env['msvc']: @@ -156,12 +161,9 @@ if platform in ('posix', 'linux', 'freebsd', 'darwin'): ]) if platform == 'darwin': env.Append(CPPDEFINES = ['_DARWIN_C_SOURCE']) - env.Append(CPPPATH = ['/usr/X11R6/include']) - env.Append(LIBPATH = ['/usr/X11R6/lib']) env.Append(LIBS = [ 'm', 'pthread', - 'expat', 'dl', ]) @@ -179,16 +181,6 @@ if dri: if drawllvm: env.Append(CPPDEFINES = ['DRAW_LLVM']) -# libGL -if platform in ('linux', 'freebsd', 'darwin'): - env.Append(LIBS = [ - 'X11', - 'Xext', - 'Xxf86vm', - 'Xdamage', - 'Xfixes', - ]) - # for debugging #print env.Dump() |