Merge branch '7.8'

[mesa.git] / SConstruct

diff --git a/SConstruct b/SConstruct
index 787ff6e2d6b3e1d28a01cb0031031c3032681f22..5d44b6efde625f73ed9d104562c461f861f99cc9 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -23,6 +23,7 @@
 import os
 import os.path
 import sys
+import SCons.Util
 
 import common
 
@@ -37,6 +38,9 @@ if common.default_platform in ('linux', 'freebsd', 'darwin'):
 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'
@@ -48,7 +52,7 @@ opts.Add(ListVariable('statetrackers', 'state trackers to build', default_statet
 opts.Add(ListVariable('drivers', 'pipe drivers to build', default_drivers,
                      ['softpipe', 'failover', 'svga', 'i915', 'i965', 'trace', 'r300', 'identity', 'llvmpipe']))
 opts.Add(ListVariable('winsys', 'winsys drivers to build', default_winsys,
-                     ['xlib', 'vmware', 'intel', 'i965', 'gdi', 'radeon']))
+                     ['xlib', 'vmware', 'i915', 'i965', 'gdi', 'radeon', 'graw-xlib']))
 
 opts.Add(EnumVariable('MSVS_VERSION', 'MS Visual C++ version', None, allowed_values=('7.1', '8.0', '9.0')))
 
@@ -59,19 +63,36 @@ 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']
+drawllvm = 'llvmpipe' in env['drivers']
+
+# LLVM support in the Draw module
+if drawllvm:
+        env.Tool('llvm')
+        if not env.has_key('LLVM_VERSION'):
+           drawllvm = False
 
 # 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 +100,7 @@ Export([
        'x86', 
        'ppc', 
        'dri', 
-       'llvm',
+       'drawllvm',
        'platform',
        'gcc',
        'msvc',
@@ -89,14 +110,40 @@ Export([
 #######################################################################
 # Environment setup
 
+# Always build trace and identity drivers
+if 'trace' not in env['drivers']:
+    env['drivers'].append('trace')
+if 'identity' not in env['drivers']:
+    env['drivers'].append('identity')
+
 # Includes
 env.Append(CPPPATH = [
        '#/include',
        '#/src/gallium/include',
        '#/src/gallium/auxiliary',
        '#/src/gallium/drivers',
+       '#/src/gallium/winsys',
 ])
 
+if env['msvc']:
+    env.Append(CPPPATH = ['#include/c99'])
+
+# Embedded
+if platform == 'embedded':
+       env.Append(CPPDEFINES = [
+               '_POSIX_SOURCE',
+               ('_POSIX_C_SOURCE', '199309L'), 
+               '_SVID_SOURCE',
+               '_BSD_SOURCE', 
+               '_GNU_SOURCE',
+               
+               'PTHREADS',
+       ])
+       env.Append(LIBS = [
+               'm',
+               'pthread',
+               'dl',
+       ])
 
 # Posix
 if platform in ('posix', 'linux', 'freebsd', 'darwin'):
@@ -110,6 +157,8 @@ if platform in ('posix', 'linux', 'freebsd', 'darwin'):
                '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 = [
@@ -119,7 +168,6 @@ if platform in ('posix', 'linux', 'freebsd', 'darwin'):
                'dl',
        ])
 
-
 # DRI
 if dri:
        env.ParseConfig('pkg-config --cflags --libs libdrm')
@@ -130,13 +178,9 @@ if dri:
                'GLX_INDIRECT_RENDERING',
        ])
 
-# 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']
+# LLVM support in the Draw module
+if drawllvm:
+    env.Append(CPPDEFINES = ['DRAW_LLVM'])
 
 # libGL
 if platform in ('linux', 'freebsd', 'darwin'):
@@ -188,8 +232,10 @@ SConscript(
        duplicate = 0 # http://www.scons.org/doc/0.97/HTML/scons-user/x2261.html
 )
 
+env.Default('src')
+
 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
+    'progs/SConscript',
+    variant_dir = os.path.join('progs', env['build']),
+    duplicate = 0 # http://www.scons.org/doc/0.97/HTML/scons-user/x2261.html
 )