summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/gallium/SConscript6
-rw-r--r--src/gallium/auxiliary/gallivm/SConscript16
2 files changed, 21 insertions, 1 deletions
diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index ea55ed2ed55..c505eee792c 100644
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -13,9 +13,13 @@ SConscript([
'auxiliary/tgsi/SConscript',
'auxiliary/cso_cache/SConscript',
'auxiliary/draw/SConscript',
- #'auxiliary/gallivm/SConscript',
'auxiliary/pipebuffer/SConscript',
+])
+
+if llvm:
+ SConscript(['auxiliary/gallivm/SConscript'])
+SConscript([
'drivers/softpipe/SConscript',
'drivers/i915simple/SConscript',
'drivers/i965simple/SConscript',
diff --git a/src/gallium/auxiliary/gallivm/SConscript b/src/gallium/auxiliary/gallivm/SConscript
new file mode 100644
index 00000000000..c0aa51b90a9
--- /dev/null
+++ b/src/gallium/auxiliary/gallivm/SConscript
@@ -0,0 +1,16 @@
+Import('*')
+
+gallivm = env.ConvenienceLibrary(
+ target = 'gallivm',
+ source = [
+ 'gallivm.cpp',
+ 'gallivm_cpu.cpp',
+ 'instructions.cpp',
+ 'loweringpass.cpp',
+ 'tgsitollvm.cpp',
+ 'storage.cpp',
+ 'storagesoa.cpp',
+ 'instructionssoa.cpp',
+ ])
+
+auxiliaries.insert(0, gallivm)