X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=SConstruct;h=7e7f51516e8453c1903fe0b37a4919491ffb745b;hb=12256fc2b2e0a54db24210a4b86f6fb5919d0fe8;hp=c9a4031fbb2e148addd469cb9edbfc9549eceae2;hpb=67099cd7b96dca5ee0e88543b7fc316f6535ea8f;p=mesa.git diff --git a/SConstruct b/SConstruct index c9a4031fbb2..7e7f51516e8 100644 --- a/SConstruct +++ b/SConstruct @@ -1,14 +1,5 @@ ####################################################################### # Top-level SConstruct - -import os -import os.path -import sys -import platform as _platform - - -####################################################################### -# Configuration options # # For example, invoke scons as # @@ -29,80 +20,46 @@ import platform as _platform # to get the full list of options. See scons manpage for more info. # -platform_map = { - 'linux2': 'linux', - 'win32': 'winddk', -} -default_platform = sys.platform -default_platform = platform_map.get(default_platform, default_platform) +import os +import os.path +import sys -machine_map = { - 'x86': 'x86', - 'i386': 'x86', - 'i486': 'x86', - 'i586': 'x86', - 'i686': 'x86', - 'x86_64': 'x86_64', -} -if 'PROCESSOR_ARCHITECTURE' in os.environ: - default_machine = os.environ['PROCESSOR_ARCHITECTURE'] -else: - default_machine = _platform.machine() -default_machine = machine_map.get(default_machine, 'generic') +import common -if default_platform in ('linux', 'freebsd', 'darwin'): - default_statetrackers = 'mesa' - default_drivers = 'softpipe,failover,i915simple,i965simple' +####################################################################### +# Configuration options + +default_statetrackers = 'mesa' + +if common.default_platform in ('linux', 'freebsd', 'darwin'): + default_drivers = 'softpipe,failover,i915simple,trace' default_winsys = 'xlib' - default_dri = 'yes' -elif default_platform in ('winddk',): - default_statetrackers = 'none' - default_drivers = 'softpipe,i915simple' - default_winsys = 'none' - default_dri = 'no' +elif common.default_platform in ('winddk',): + default_drivers = 'softpipe,i915simple,trace' + default_winsys = 'all' else: default_drivers = 'all' default_winsys = 'all' - default_dri = 'no' - -# TODO: auto-detect defaults opts = Options('config.py') -opts.Add(BoolOption('debug', 'build debug version', 'no')) -opts.Add(EnumOption('machine', 'use machine-specific assembly code', default_machine, - allowed_values=('generic', 'x86', 'x86_64'))) -opts.Add(EnumOption('platform', 'target platform', default_platform, - allowed_values=('linux', 'cell', 'winddk'))) -opts.Add(ListOption('statetrackers', 'state_trackers to build', default_statetrackers, - [ - 'mesa', - ], - )) +common.AddOptions(opts) +opts.Add(ListOption('statetrackers', 'state trackers to build', default_statetrackers, + ['mesa', 'python'])) opts.Add(ListOption('drivers', 'pipe drivers to build', default_drivers, - [ - 'softpipe', - 'failover', - 'i915simple', - 'i965simple', - 'cell', - ], - )) + ['softpipe', 'failover', 'i915simple', 'i965simple', 'cell', 'trace', 'r300'])) opts.Add(ListOption('winsys', 'winsys drivers to build', default_winsys, - [ - 'xlib', - 'intel', - ], - )) -opts.Add(BoolOption('llvm', 'use LLVM', 'no')) -opts.Add(BoolOption('dri', 'build DRI drivers', default_dri)) + ['xlib', 'intel', 'gdi', 'amd'])) + +opts.Add(EnumOption('MSVS_VERSION', 'MS Visual C++ version', None, allowed_values=('7.1', '8.0', '9.0'))) env = Environment( - options = opts, - ENV = os.environ) -Help(opts.GenerateHelpText(env)) + options = opts, + tools = ['gallium'], + toolpath = ['#scons'], + ENV = os.environ, +) -# for debugging -#print env.Dump() +Help(opts.GenerateHelpText(env)) # replicate options values in local variables debug = env['debug'] @@ -113,12 +70,14 @@ platform = env['platform'] # derived options x86 = machine == 'x86' +ppc = machine == 'ppc' gcc = platform in ('linux', 'freebsd', 'darwin') -msvc = platform in ('win32', 'winddk') +msvc = platform in ('windows', 'winddk') Export([ 'debug', 'x86', + 'ppc', 'dri', 'llvm', 'platform', @@ -129,68 +88,6 @@ Export([ ####################################################################### # Environment setup -# -# TODO: put the compiler specific settings in separate files -# TODO: auto-detect as much as possible - - -if platform == 'winddk': - env.Tool('winddk', ['.']) - - env.Append(CPPPATH = [ - env['SDK_INC_PATH'], - env['DDK_INC_PATH'], - env['WDM_INC_PATH'], - env['CRT_INC_PATH'], - ]) - -# Optimization flags -if gcc: - if debug: - env.Append(CFLAGS = '-O0 -g3') - env.Append(CXXFLAGS = '-O0 -g3') - else: - env.Append(CFLAGS = '-O3 -g3') - env.Append(CXXFLAGS = '-O3 -g3') - - env.Append(CFLAGS = '-Wall -Wmissing-prototypes -Wno-long-long -ffast-math -pedantic') - env.Append(CXXFLAGS = '-Wall -pedantic') - - # Be nice to Eclipse - env.Append(CFLAGS = '-fmessage-length=0') - env.Append(CXXFLAGS = '-fmessage-length=0') - -if msvc: - env.Append(CFLAGS = '/W3') - if debug: - cflags = [ - '/Od', # disable optimizations - '/Oy-', # disable frame pointer omission - ] - else: - cflags = [ - '/Ox', # maximum optimizations - '/Os', # favor code space - ] - env.Append(CFLAGS = cflags) - env.Append(CXXFLAGS = cflags) - # Put debugging information in a separate .pdb file for each object file as - # descrived in the scons manpage - env['CCPDBFLAGS'] = '/Zi /Fd${TARGET}.pdb' - -# Defines -if debug: - if gcc: - env.Append(CPPDEFINES = ['DEBUG']) - if msvc: - env.Append(CPPDEFINES = [ - ('DBG', '1'), - ('DEBUG', '1'), - ('_DEBUG', '1'), - ]) -else: - env.Append(CPPDEFINES = ['NDEBUG']) - # Includes env.Append(CPPPATH = [ @@ -201,19 +98,6 @@ env.Append(CPPPATH = [ ]) -# x86 assembly -if x86: - env.Append(CPPDEFINES = [ - 'USE_X86_ASM', - 'USE_MMX_ASM', - 'USE_3DNOW_ASM', - 'USE_SSE_ASM', - ]) - if gcc: - env.Append(CFLAGS = '-m32') - env.Append(CXXFLAGS = '-m32') - - # Posix if platform in ('posix', 'linux', 'freebsd', 'darwin'): env.Append(CPPDEFINES = [ @@ -249,13 +133,13 @@ if dri: # LLVM if llvm: # See also http://www.scons.org/wiki/UsingPkgConfig - env.ParseConfig('llvm-config --cflags --ldflags --libs') + env.ParseConfig('llvm-config --cflags --ldflags --libs backend bitreader engine instrumentation interpreter ipo') env.Append(CPPDEFINES = ['MESA_LLVM']) - env.Append(CXXFLAGS = ['-Wno-long-long']) - + # Force C++ linkage + env['LINK'] = env['CXX'] # libGL -if platform not in ('winddk',): +if platform in ('linux', 'freebsd', 'darwin'): env.Append(LIBS = [ 'X11', 'Xext', @@ -264,64 +148,20 @@ if platform not in ('winddk',): 'Xfixes', ]) -Export('env') - - -####################################################################### -# Convenience Library Builder -# based on the stock StaticLibrary and SharedLibrary builders - -def createConvenienceLibBuilder(env): - """This is a utility function that creates the ConvenienceLibrary - Builder in an Environment if it is not there already. - - If it is already there, we return the existing one. - """ - - try: - convenience_lib = env['BUILDERS']['ConvenienceLibrary'] - except KeyError: - action_list = [ Action("$ARCOM", "$ARCOMSTR") ] - if env.Detect('ranlib'): - ranlib_action = Action("$RANLIBCOM", "$RANLIBCOMSTR") - action_list.append(ranlib_action) - - convenience_lib = Builder(action = action_list, - emitter = '$LIBEMITTER', - prefix = '$LIBPREFIX', - suffix = '$LIBSUFFIX', - src_suffix = '$SHOBJSUFFIX', - src_builder = 'SharedObject') - env['BUILDERS']['ConvenienceLibrary'] = convenience_lib - env['BUILDERS']['Library'] = convenience_lib - - return convenience_lib +# for debugging +#print env.Dump() -createConvenienceLibBuilder(env) +Export('env') ####################################################################### # Invoke SConscripts -# Put build output in a separate dir, which depends on the current configuration -# See also http://www.scons.org/wiki/AdvancedBuildExample -build_topdir = 'build' -build_subdir = platform -if dri: - build_subdir += "-dri" -if llvm: - build_subdir += "-llvm" -if env['machine'] != 'generic': - build_subdir += '-' + env['machine'] -if debug: - build_subdir += "-debug" -build_dir = os.path.join(build_topdir, build_subdir) - # TODO: Build several variants at the same time? # http://www.scons.org/wiki/SimultaneousVariantBuilds SConscript( 'src/SConscript', - build_dir = build_dir, + variant_dir = env['build'], duplicate = 0 # http://www.scons.org/doc/0.97/HTML/scons-user/x2261.html )