summaryrefslogtreecommitdiff
path: root/SConstruct
diff options
context:
space:
mode:
authorZack Rusin <zackr@vmware.com>2010-02-08 18:05:22 -0500
committerZack Rusin <zackr@vmware.com>2010-02-08 18:22:11 -0500
commitc61bf363937f40624a5632745630d4f2b9907082 (patch)
treebb2388269117d6783400e17957ff8b0a68dfb5b5 /SConstruct
parent74d23546c79fe8c8d87588fa423040e3b19a8fc6 (diff)
llvmpipe: export the tgsi translation code to a common layer
the llvmpipe tgsi translation is a lot more complete than what was in gallivm so replacing the latter with the former. this is needed since the draw llvm paths will use the same code. effectively the proven llvmpipe code becomes gallivm.
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct16
1 files changed, 8 insertions, 8 deletions
diff --git a/SConstruct b/SConstruct
index 1c7550d783..76ab9025e2 100644
--- a/SConstruct
+++ b/SConstruct
@@ -79,9 +79,10 @@ 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']
+
# derived options
x86 = machine == 'x86'
@@ -94,7 +95,7 @@ Export([
'x86',
'ppc',
'dri',
- 'llvm',
+ 'drawllvm',
'platform',
'gcc',
'msvc',
@@ -165,13 +166,12 @@ if dri:
'GLX_INDIRECT_RENDERING',
])
-# LLVM
-if llvm:
+# LLVM support in the Draw module
+if drawllvm:
# 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']
+ # currently --ldflags --libsdisabled since the driver will force the correct linkage
+ env.ParseConfig('llvm-config --cflags backend bitreader engine instrumentation interpreter ipo')
+ env.Append(CPPDEFINES = ['DRAW_LLVM'])
# libGL
if platform in ('linux', 'freebsd', 'darwin'):