X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=SConstruct;h=4785e39ec566deb2ca80c897cdd51adc27f41382;hb=5d2577e576635559da202d0d062601e404843b2c;hp=042019539531e4676221ef9bab570625d365bc9a;hpb=f7922db610d05efee0ee8c5f0dadb69e3939482e;p=mesa.git diff --git a/SConstruct b/SConstruct index 04201953953..4785e39ec56 100644 --- a/SConstruct +++ b/SConstruct @@ -1,13 +1,5 @@ ####################################################################### # Top-level SConstruct - -import os -import os.path -import sys - - -####################################################################### -# Configuration options # # For example, invoke scons as # @@ -28,31 +20,41 @@ import sys # to get the full list of options. See scons manpage for more info. # -platform_map = { - 'linux2': 'linux', - 'win32': 'winddk', -} +import os +import os.path +import sys + +import common + +####################################################################### +# Configuration options -platform = platform_map.get(sys.platform, sys.platform) +if common.default_platform in ('linux', 'freebsd', 'darwin'): + default_statetrackers = 'mesa' + default_drivers = 'softpipe,failover,i915simple,i965simple' + default_winsys = 'xlib' +elif common.default_platform in ('winddk',): + default_statetrackers = 'none' + default_drivers = 'softpipe,i915simple' + default_winsys = 'none' +else: + default_drivers = 'all' + default_winsys = 'all' -# TODO: auto-detect defaults opts = Options('config.py') -opts.Add(BoolOption('debug', 'build debug version', False)) -opts.Add(BoolOption('dri', 'build dri drivers', False)) -opts.Add(BoolOption('llvm', 'use llvm', False)) -opts.Add(EnumOption('machine', 'use machine-specific assembly code', 'x86', - allowed_values=('generic', 'x86', 'x86-64'))) -opts.Add(EnumOption('platform', 'target platform', platform, - allowed_values=('linux', 'cell', 'winddk'))) +common.AddOptions(opts) +opts.Add(ListOption('statetrackers', 'state_trackers to build', default_statetrackers, + ['mesa'])) +opts.Add(ListOption('drivers', 'pipe drivers to build', default_drivers, + ['softpipe', 'failover', 'i915simple', 'i965simple', 'cell'])) +opts.Add(ListOption('winsys', 'winsys drivers to build', default_winsys, + ['xlib', 'intel'])) env = Environment( options = opts, ENV = os.environ) Help(opts.GenerateHelpText(env)) -# for debugging -#print env.Dump() - # replicate options values in local variables debug = env['debug'] dri = env['dri'] @@ -82,28 +84,17 @@ Export([ # TODO: put the compiler specific settings in separate files # TODO: auto-detect as much as possible +common.generate(env) if platform == 'winddk': - import ntpath - escape = env['ESCAPE'] - env.Tool('msvc') - if 'BASEDIR' in os.environ: - WINDDK = os.environ['BASEDIR'] - else: - WINDDK = "C:\\WINDDK\\3790.1830" - # NOTE: We need this elaborate construct to get the absolute paths and - # forward slashes to msvc unharmed when cross compiling from posix platforms - env.Append(CPPFLAGS = [ - escape('/I' + ntpath.join(WINDDK, 'inc\\ddk\\wxp')), - escape('/I' + ntpath.join(WINDDK, 'inc\\ddk\\wdm\\wxp')), - escape('/I' + ntpath.join(WINDDK, 'inc\\crt')), - ]) - env.Append(CPPDEFINES = [ - ('i386', '1'), - ]) - if debug: - env.Append(CPPDEFINES = ['DBG']) + 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: @@ -114,13 +105,22 @@ if gcc: env.Append(CFLAGS = '-O3 -g3') env.Append(CXXFLAGS = '-O3 -g3') - env.Append(CFLAGS = '-Wall -Wmissing-prototypes -std=c99 -ffast-math -pedantic') + 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: + cflags = [ + #'/Wp64', # enable 64 bit porting warnings + ] + 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: @@ -189,10 +189,11 @@ if llvm: env.ParseConfig('llvm-config --cflags --ldflags --libs') env.Append(CPPDEFINES = ['MESA_LLVM']) env.Append(CXXFLAGS = ['-Wno-long-long']) - + # Force C++ linkage + env['LINK'] = env['CXX'] # libGL -if 1: +if platform not in ('winddk',): env.Append(LIBS = [ 'X11', 'Xext', @@ -201,64 +202,20 @@ if 1: '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 x86: - build_subdir += "-x86" -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, + build_dir = common.make_build_dir(env), duplicate = 0 # http://www.scons.org/doc/0.97/HTML/scons-user/x2261.html )