Move mm.c code into util module.

[mesa.git] / SConstruct

diff --git a/SConstruct b/SConstruct
index 22a4072c9334c27df4a1fc67217a7236a04c3349..b20f88a303e9ecaf3204b80625ed4ee1442a8565 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -32,6 +32,7 @@ import sys
 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')))
 
@@ -55,6 +56,7 @@ else:
 # replicate options values in local variables
 debug = env['debug']
 dri = env['dri']
+llvm = env['llvm']
 machine = env['machine']
 
 # derived options
@@ -66,6 +68,7 @@ Export([
        'debug', 
        'x86', 
        'dri', 
+       'llvm',
        'platform',
        'gcc',
        'msvc',
@@ -108,7 +111,9 @@ env.Append(CPPPATH = [
        '#/include',
        '#/src/mesa',
        '#/src/mesa/main',
-       '#/src/mesa/pipe',
+       '#/src/gallium/include',
+       '#/src/gallium/auxiliary',
+       '#/src/gallium/drivers',
 ])
 
 
@@ -157,6 +162,14 @@ if dri:
                'GLX_INDIRECT_RENDERING',
        ])
 
+# LLVM
+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'])
+       
+
 # libGL
 if 1:
        env.Append(LIBS = [
@@ -212,6 +225,8 @@ build_topdir = 'build'
 build_subdir = platform
 if dri:
        build_subdir += "-dri"
+if llvm:
+       build_subdir += "-llvm"
 if x86:
        build_subdir += "-x86"
 if debug:
@@ -222,7 +237,7 @@ build_dir = os.path.join(build_topdir, build_subdir)
 # http://www.scons.org/wiki/SimultaneousVariantBuilds
 
 SConscript(
-       'src/mesa/SConscript',
+       'src/SConscript',
        build_dir = build_dir,
        duplicate = 0 # http://www.scons.org/doc/0.97/HTML/scons-user/x2261.html
 )