X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=SConstruct;h=558ebf90aaa03673f92825bd6384fc8e6655ed5b;hb=446dbb921762710d678486f3f5a6dfdf318fe34c;hp=ff06b9b5921c20d0901dd0ab77fd715f57da84c2;hpb=9b22427911ad27efc1f36faee9462c6082d0417c;p=mesa.git diff --git a/SConstruct b/SConstruct index ff06b9b5921..558ebf90aaa 100644 --- a/SConstruct +++ b/SConstruct @@ -23,6 +23,7 @@ import os import os.path import sys +import SCons.Util import common @@ -30,13 +31,17 @@ import common # Configuration options default_statetrackers = 'mesa' +default_targets = 'graw-null' if common.default_platform in ('linux', 'freebsd', 'darwin'): - default_drivers = 'softpipe,failover,svga,i915,i965,trace,identity,llvmpipe' + default_drivers = 'softpipe,galahad,failover,svga,i915,i965,trace,identity,llvmpipe' default_winsys = 'xlib' elif common.default_platform in ('winddk',): default_drivers = 'softpipe,svga,i915,i965,trace,identity' default_winsys = 'all' +elif common.default_platform in ('embedded',): + default_drivers = 'softpipe,llvmpipe' + default_winsys = 'xlib' else: default_drivers = 'all' default_winsys = 'all' @@ -44,11 +49,34 @@ else: opts = Variables('config.py') common.AddOptions(opts) opts.Add(ListVariable('statetrackers', 'state trackers to build', default_statetrackers, - ['mesa', 'python', 'xorg'])) + ['mesa', 'python', 'xorg', 'egl'])) opts.Add(ListVariable('drivers', 'pipe drivers to build', default_drivers, - ['softpipe', 'failover', 'svga', 'i915', 'i965', 'trace', 'r300', 'identity', 'llvmpipe'])) + ['softpipe', 'galahad', 'failover', 'svga', 'i915', 'i965', 'trace', 'r300', 'r600', 'identity', 'llvmpipe', 'nouveau', 'nv50', 'nvfx'])) opts.Add(ListVariable('winsys', 'winsys drivers to build', default_winsys, - ['xlib', 'vmware', 'intel', 'i965', 'gdi', 'radeon'])) + ['xlib', 'vmware', 'i915', 'i965', 'gdi', 'radeon', 'r600', 'graw-xlib'])) + +opts.Add(ListVariable('targets', 'driver targets to build', default_targets, + ['dri-i915', + 'dri-i965', + 'dri-nouveau', + 'dri-radeong', + 'dri-swrast', + 'dri-vmwgfx', + 'egl-i915', + 'egl-i965', + 'egl-nouveau', + 'egl-radeon', + 'egl-swrast', + 'egl-vmwgfx', + 'graw-xlib', + 'graw-null', + 'libgl-gdi', + 'libgl-xlib', + 'xorg-i915', + 'xorg-i965', + 'xorg-nouveau', + 'xorg-radeon', + 'xorg-vmwgfx'])) opts.Add(EnumVariable('MSVS_VERSION', 'MS Visual C++ version', None, allowed_values=('7.1', '8.0', '9.0'))) @@ -59,19 +87,29 @@ env = Environment( ENV = os.environ, ) +if os.environ.has_key('CC'): + env['CC'] = os.environ['CC'] +if os.environ.has_key('CFLAGS'): + env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS']) +if os.environ.has_key('CXX'): + env['CXX'] = os.environ['CXX'] +if os.environ.has_key('CXXFLAGS'): + env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS']) +if os.environ.has_key('LDFLAGS'): + env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS']) + Help(opts.GenerateHelpText(env)) # replicate options values in local variables debug = env['debug'] dri = env['dri'] -llvm = env['llvm'] machine = env['machine'] platform = env['platform'] # derived options x86 = machine == 'x86' ppc = machine == 'ppc' -gcc = platform in ('linux', 'freebsd', 'darwin') +gcc = platform in ('linux', 'freebsd', 'darwin', 'embedded') msvc = platform in ('windows', 'winddk') Export([ @@ -79,7 +117,6 @@ Export([ 'x86', 'ppc', 'dri', - 'llvm', 'platform', 'gcc', 'msvc', @@ -89,20 +126,38 @@ Export([ ####################################################################### # Environment setup +# Always build trace, rbug, identity, softpipe, and llvmpipe (where possible) +if 'trace' not in env['drivers']: + env['drivers'].append('trace') +if 'rbug' not in env['drivers']: + env['drivers'].append('rbug') +if 'galahad' not in env['drivers']: + env['drivers'].append('galahad') +if 'identity' not in env['drivers']: + env['drivers'].append('identity') +if 'softpipe' not in env['drivers']: + env['drivers'].append('softpipe') +if env['llvm'] and 'llvmpipe' not in env['drivers']: + env['drivers'].append('llvmpipe') +if 'sw' not in env['drivers']: + env['drivers'].append('sw') + # Includes -env.Append(CPPPATH = [ +env.Prepend(CPPPATH = [ '#/include', +]) +env.Append(CPPPATH = [ '#/src/gallium/include', '#/src/gallium/auxiliary', '#/src/gallium/drivers', + '#/src/gallium/winsys', ]) if env['msvc']: env.Append(CPPPATH = ['#include/c99']) - -# Posix -if platform in ('posix', 'linux', 'freebsd', 'darwin'): +# Embedded +if platform == 'embedded': env.Append(CPPDEFINES = [ '_POSIX_SOURCE', ('_POSIX_C_SOURCE', '199309L'), @@ -111,46 +166,32 @@ if platform in ('posix', 'linux', 'freebsd', 'darwin'): '_GNU_SOURCE', 'PTHREADS', - 'HAVE_POSIX_MEMALIGN', ]) - 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', ]) - -# DRI -if dri: - env.ParseConfig('pkg-config --cflags --libs libdrm') +# Posix +if platform in ('posix', 'linux', 'freebsd', 'darwin'): env.Append(CPPDEFINES = [ - ('USE_EXTERNAL_DXTN_LIB', '1'), - 'IN_DRI_DRIVER', - 'GLX_DIRECT_RENDERING', - 'GLX_INDIRECT_RENDERING', + '_POSIX_SOURCE', + ('_POSIX_C_SOURCE', '199309L'), + '_SVID_SOURCE', + '_BSD_SOURCE', + '_GNU_SOURCE', + 'PTHREADS', + 'HAVE_POSIX_MEMALIGN', ]) - -# LLVM -if llvm: - # See also http://www.scons.org/wiki/UsingPkgConfig - env.ParseConfig('llvm-config --cflags --ldflags --libs backend bitreader engine instrumentation interpreter ipo') - env.Append(CPPDEFINES = ['MESA_LLVM']) - # Force C++ linkage - env['LINK'] = env['CXX'] - -# libGL -if platform in ('linux', 'freebsd', 'darwin'): + if gcc: + env.Append(CFLAGS = ['-fvisibility=hidden']) + if platform == 'darwin': + env.Append(CPPDEFINES = ['_DARWIN_C_SOURCE']) env.Append(LIBS = [ - 'X11', - 'Xext', - 'Xxf86vm', - 'Xdamage', - 'Xfixes', + 'm', + 'pthread', + 'dl', ]) # for debugging @@ -165,36 +206,11 @@ Export('env') # TODO: Build several variants at the same time? # http://www.scons.org/wiki/SimultaneousVariantBuilds -if env['platform'] != common.default_platform: - # GLSL code has to be built twice -- one for the host OS, another for the target OS... - - host_env = Environment( - # options are ignored - # default tool is used - tools = ['default', 'custom'], - toolpath = ['#scons'], - ENV = os.environ, - ) - - host_env['platform'] = common.default_platform - host_env['machine'] = common.default_machine - host_env['debug'] = env['debug'] - - SConscript( - 'src/glsl/SConscript', - variant_dir = os.path.join(env['build'], 'host'), - duplicate = 0, # http://www.scons.org/doc/0.97/HTML/scons-user/x2261.html - exports={'env':host_env}, - ) - SConscript( 'src/SConscript', - variant_dir = env['build'], + variant_dir = env['build_dir'], duplicate = 0 # http://www.scons.org/doc/0.97/HTML/scons-user/x2261.html ) -SConscript( - 'progs/SConscript', - variant_dir = os.path.join('progs', env['build']), - duplicate = 0 # http://www.scons.org/doc/0.97/HTML/scons-user/x2261.html -) +env.Default('src') +