X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=SConstruct;h=e7c10fcf527f680c1cadcb57416b0c236ba40e97;hb=6980823da9120d8d8533f7a78eac2d63dece430f;hp=b20f88a303e9ecaf3204b80625ed4ee1442a8565;hpb=e773a813cf475e2a7ad79ea1ec698bf2530d0433;p=mesa.git diff --git a/SConstruct b/SConstruct index b20f88a303e..e7c10fcf527 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,41 +20,52 @@ import sys # to get the full list of options. See scons manpage for more info. # -# TODO: auto-detect defaults +import os +import os.path +import sys + +import common + +####################################################################### +# Configuration options + +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' + 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'))) +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() - -if 0: - # platform will be typically 'posix' or 'win32' - platform = env['PLATFORM'] -else: - # platform will be one of 'linux', 'freebsd', 'win32', 'darwin', etc. - platform = sys.platform - if platform == 'linux2': - platform = 'linux' - # 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' -gcc = platform in ('posix', 'linux', 'freebsd', 'darwin') -msvc = platform == 'win32' +gcc = platform in ('linux', 'freebsd', 'darwin') +msvc = platform in ('windows', 'winddk') Export([ 'debug', @@ -78,39 +81,25 @@ Export([ ####################################################################### # Environment setup # -# TODO: put the compiler specific settings in seperate files +# TODO: put the compiler specific settings in separate files # TODO: auto-detect as much as possible - -# 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 -std=c99 -ffast-math -pedantic') - env.Append(CXXFLAGS = '-Wall -pedantic') +if platform == 'winddk': + env.Tool('winddk', ['.']) - # Be nice to Eclipse - env.Append(CFLAGS = '-fmessage-length=0') - env.Append(CXXFLAGS = '-fmessage-length=0') - + env.Append(CPPPATH = [ + env['SDK_INC_PATH'], + env['DDK_INC_PATH'], + env['WDM_INC_PATH'], + env['CRT_INC_PATH'], + ]) -# Defines -if debug: - env.Append(CPPDEFINES = ['DEBUG']) -else: - env.Append(CPPDEFINES = ['NDEBUG']) +common.generate(env) # Includes env.Append(CPPPATH = [ '#/include', - '#/src/mesa', - '#/src/mesa/main', '#/src/gallium/include', '#/src/gallium/auxiliary', '#/src/gallium/drivers', @@ -119,12 +108,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') @@ -167,11 +150,11 @@ if llvm: # See also http://www.scons.org/wiki/UsingPkgConfig 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 in ('linux', 'freebsd', 'darwin'): env.Append(LIBS = [ 'X11', 'Xext', @@ -180,64 +163,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 )