Merge commit 'origin/master' into gallium-0.2

[mesa.git] / SConstruct

diff --git a/SConstruct b/SConstruct
index 8013e7c3b2ee06f77db761164d86e7020b9293e7..8c96817daefc04264a0a2863f2d1a02b9577272b 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -29,36 +29,37 @@ import common
 #######################################################################
 # Configuration options
 
+default_statetrackers = 'mesa'
+
 if common.default_platform in ('linux', 'freebsd', 'darwin'):
-       default_statetrackers = 'mesa'
-       default_drivers = 'softpipe,failover,i915simple,i965simple'
+       default_drivers = 'softpipe,failover,i915simple,i965simple,trace'
        default_winsys = 'xlib'
-       default_dri = 'yes'
 elif common.default_platform in ('winddk',):
-       default_statetrackers = 'none'
-       default_drivers = 'softpipe,i915simple'
-       default_winsys = 'none'
-       default_dri = 'no'
+       default_drivers = 'softpipe,i915simple,trace'
+       default_winsys = 'all'
 else:
        default_drivers = 'all'
        default_winsys = 'all'
-       default_dri = 'no'
 
-opts = common.Options()
-opts.Add(ListOption('statetrackers', 'state_trackers to build', default_statetrackers,
-                     ['mesa']))
+opts = Options('config.py')
+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']))
 opts.Add(ListOption('winsys', 'winsys drivers to build', default_winsys,
-                     ['xlib', 'intel'])) 
+                     ['xlib', 'intel', 'gdi'])) 
+
+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']
@@ -69,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',
@@ -85,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 = [
@@ -157,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 = [
@@ -207,11 +135,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 platform not in ('winddk',):
+if platform in ('linux', 'freebsd', 'darwin'):
        env.Append(LIBS = [
                'X11',
                'Xext',
@@ -220,8 +148,8 @@ if platform not in ('winddk',):
                'Xfixes',
        ])
 
-# Convenience library support
-common.createConvenienceLibBuilder(env)
+# for debugging
+#print env.Dump()
 
 Export('env')
 
@@ -234,6 +162,6 @@ Export('env')
 
 SConscript(
        'src/SConscript',
-       build_dir = common.make_build_dir(env),
+       build_dir = env['build'],
        duplicate = 0 # http://www.scons.org/doc/0.97/HTML/scons-user/x2261.html
 )