intel: save/restore GL matrix mode in intel_meta_set_passthrough_transform(), intel_m...

[mesa.git] / SConstruct

diff --git a/SConstruct b/SConstruct
index c1dc62465191eb1794a076e3f4d0c756f2ad66e5..88cdffa5048f747a970bdc3fd6ae394eae41bcb0 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -70,12 +70,14 @@ platform = env['platform']
 
 # derived options
 x86 = machine == 'x86'
+ppc = machine == 'ppc'
 gcc = platform in ('linux', 'freebsd', 'darwin')
 msvc = platform in ('windows', 'winddk')
 
 Export([
        'debug', 
        'x86', 
+       'ppc', 
        'dri', 
        'llvm',
        'platform',
@@ -131,7 +133,7 @@ if dri:
 # LLVM
 if llvm:
        # See also http://www.scons.org/wiki/UsingPkgConfig
-       env.ParseConfig('llvm-config --cflags --ldflags --libs')
+       env.ParseConfig('llvm-config --cflags --ldflags --libs backend bitreader engine ipo')
        env.Append(CPPDEFINES = ['MESA_LLVM'])
         # Force C++ linkage
        env['LINK'] = env['CXX']
@@ -160,6 +162,6 @@ Export('env')
 
 SConscript(
        'src/SConscript',
-       build_dir = env['build'],
+       variant_dir = env['build'],
        duplicate = 0 # http://www.scons.org/doc/0.97/HTML/scons-user/x2261.html
 )