summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpal1000 <[email protected]>2019-09-29 18:35:29 +0300
committerJose Fonseca <[email protected]>2019-09-30 15:49:46 +0100
commiteebe091d292609de8aaf5b5c537d867b23908947 (patch)
treef3dca18243428b9b1b0d4c8ec3a689ec867f726e
parent7be00b2a06d09e8f3cf2257c7449219a4685ed7f (diff)
scons/windows: Enable compute shaders when possible.
Tests done with llvm-config indicate that there are only 2 libraries in irreader and not in engine, LLVMAsmParser and LLVMIRReader and both of them are part of coroutines so I replaced irreader with coroutines and added libraries unique to coroutines. Reviewed-by: Jose Fonseca <[email protected]>
-rw-r--r--scons/llvm.py27
1 files changed, 26 insertions, 1 deletions
diff --git a/scons/llvm.py b/scons/llvm.py
index fc128ab1e68..061295d1d79 100644
--- a/scons/llvm.py
+++ b/scons/llvm.py
@@ -108,7 +108,7 @@ def generate(env):
env.AppendUnique(CXXFLAGS = ['-posix'])
# LIBS should match the output of `llvm-config --libs engine mcjit bitwriter x86asmprinter irreader` for LLVM<=7.0
- # and `llvm-config --libs engine irreader` for LLVM>=8.0
+ # and `llvm-config --libs engine coroutines` for LLVM>=8.0
# LLVMAggressiveInstCombine library part of engine component can be safely omitted as it's not used.
if llvm_version >= distutils.version.LooseVersion('9.0'):
env.Prepend(LIBS = [
@@ -129,6 +129,31 @@ def generate(env):
'LLVMDemangle', 'LLVMGlobalISel', 'LLVMDebugInfoMSF',
'LLVMBinaryFormat',
'LLVMRemarks', 'LLVMBitstreamReader', 'LLVMDebugInfoDWARF',
+ # Add these libraries to enable ompute shaders support.
+ 'LLVMLinker', 'LLVMVectorize', 'LLVMInstrumentation',
+ 'LLVMipo', 'LLVMCoroutines',
+ ])
+ elif llvm_version >= distutils.version.LooseVersion('8.0'):
+ env.Prepend(LIBS = [
+ 'LLVMX86Disassembler', 'LLVMX86AsmParser',
+ 'LLVMX86CodeGen', 'LLVMSelectionDAG', 'LLVMAsmPrinter',
+ 'LLVMDebugInfoCodeView', 'LLVMCodeGen',
+ 'LLVMScalarOpts', 'LLVMInstCombine',
+ 'LLVMTransformUtils',
+ 'LLVMBitWriter', 'LLVMX86Desc',
+ 'LLVMMCDisassembler', 'LLVMX86Info',
+ 'LLVMX86AsmPrinter', 'LLVMX86Utils',
+ 'LLVMMCJIT', 'LLVMExecutionEngine', 'LLVMTarget',
+ 'LLVMAnalysis', 'LLVMProfileData',
+ 'LLVMRuntimeDyld', 'LLVMObject', 'LLVMMCParser',
+ 'LLVMBitReader', 'LLVMMC', 'LLVMCore',
+ 'LLVMSupport',
+ 'LLVMIRReader', 'LLVMAsmParser',
+ 'LLVMDemangle', 'LLVMGlobalISel', 'LLVMDebugInfoMSF',
+ 'LLVMBinaryFormat',
+ # Add these libraries to enable ompute shaders support.
+ 'LLVMLinker', 'LLVMVectorize', 'LLVMInstrumentation',
+ 'LLVMipo', 'LLVMCoroutines',
])
elif llvm_version >= distutils.version.LooseVersion('5.0'):
env.Prepend(LIBS = [