diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-12-03 20:51:05 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-12-03 20:51:05 +0400 |
| commit | dbd44e3bf5bc2f9ce0ae8d65a285155b5798e48d (patch) | |
| tree | 856d913f5d01e701f2abe5c594261db7b6b7bb3f /intern | |
| parent | a4e6da35806f40d9815732516c9102fe9e7e1ecb (diff) | |
Fix scons not installing closure/ directory for runtime compiles of CUDA kernel.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/kernel/SConscript | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/intern/cycles/kernel/SConscript b/intern/cycles/kernel/SConscript index 14890164a42..730f758194e 100644 --- a/intern/cycles/kernel/SConscript +++ b/intern/cycles/kernel/SConscript @@ -32,16 +32,17 @@ if env['WITH_BF_CYCLES_CUDA_BINARIES']: kernel_file = os.path.join(source_dir, "kernel.cu") util_dir = os.path.join(source_dir, "../util") svm_dir = os.path.join(source_dir, "../svm") + closure_dir = os.path.join(source_dir, "../closure") # nvcc flags nvcc_flags = "-m%s" % (bits) nvcc_flags += " --cubin --ptxas-options=\"-v\" --maxrregcount=24" nvcc_flags += " --opencc-options -OPT:Olimit=0" nvcc_flags += " -DCCL_NAMESPACE_BEGIN= -DCCL_NAMESPACE_END= -DNVCC" - nvcc_flags += " -I \"%s\" -I \"%s\"" % (util_dir, svm_dir) + nvcc_flags += " -I \"%s\" -I \"%s\" -I \"%s\"" % (util_dir, svm_dir, closure_dir) # dependencies - dependencies = ['kernel.cu'] + kernel.Glob('*.h') + kernel.Glob('../util/*.h') + kernel.Glob('svm/*.h') + dependencies = ['kernel.cu'] + kernel.Glob('*.h') + kernel.Glob('../util/*.h') + kernel.Glob('svm/*.h') + kernel.Glob('closure/*.h') last_cubin_file = None # add command for each cuda architecture |