dri/drivers: fix 32bit builds on 64bit systems

[mesa.git] / SConstruct

diff --git a/SConstruct b/SConstruct
index 1c7550d783640bdc70e2caba38e0b218088dda53..fdcd72b30d140944b8c7ef91ff1cb68e4aa16dfa 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -52,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')))
 
@@ -79,7 +79,6 @@ 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']
 
@@ -94,7 +93,6 @@ Export([
        'x86', 
        'ppc', 
        'dri', 
-       'llvm',
        'platform',
        'gcc',
        'msvc',
@@ -104,12 +102,23 @@ Export([
 #######################################################################
 # Environment setup
 
+# Always build trace, identity, softpipe, and llvmpipe (where possible)
+if 'trace' not in env['drivers']:
+    env['drivers'].append('trace')
+if 'identity' not in env['drivers']:
+    env['drivers'].append('identity')
+if 'softpipe' not in env['drivers']:
+    env['drivers'].append('softpipe')
+if env['llvm'] and 'llvmpipe' not in env['drivers']:
+    env['drivers'].append('llvmpipe')
+
 # Includes
 env.Append(CPPPATH = [
        '#/include',
        '#/src/gallium/include',
        '#/src/gallium/auxiliary',
        '#/src/gallium/drivers',
+       '#/src/gallium/winsys',
 ])
 
 if env['msvc']:
@@ -146,43 +155,12 @@ if platform in ('posix', 'linux', 'freebsd', 'darwin'):
        ])
        if platform == 'darwin':
                env.Append(CPPDEFINES = ['_DARWIN_C_SOURCE'])
-       env.Append(CPPPATH = ['/usr/X11R6/include'])
-       env.Append(LIBPATH = ['/usr/X11R6/lib'])
        env.Append(LIBS = [
                'm',
                'pthread',
-               'expat',
                'dl',
        ])
 
-# DRI
-if dri:
-       env.ParseConfig('pkg-config --cflags --libs libdrm')
-       env.Append(CPPDEFINES = [
-               ('USE_EXTERNAL_DXTN_LIB', '1'), 
-               'IN_DRI_DRIVER',
-               'GLX_DIRECT_RENDERING',
-               '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']
-
-# libGL
-if platform in ('linux', 'freebsd', 'darwin'):
-       env.Append(LIBS = [
-               'X11',
-               'Xext',
-               'Xxf86vm',
-               'Xdamage',
-               'Xfixes',
-       ])
-
 # for debugging
 #print env.Dump()
 
@@ -223,8 +201,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
 )