Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2014-03-29 18:56:29 +0400
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2014-03-29 18:57:27 +0400
commit73299516fa2ba8abbde2635754726e287bd2da94 (patch)
tree67c2e858423c833b9cccdfc5cd8e2b828601421d /intern/cycles/kernel
parentf449542d6a099e3f98366cfe057034a882b76272 (diff)
Fix scons CUDA build and compile error with more strict compilers.
Diffstat (limited to 'intern/cycles/kernel')
-rw-r--r--intern/cycles/kernel/SConscript2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/SConscript b/intern/cycles/kernel/SConscript
index b2eafe6a83d..82aaccb62d6 100644
--- a/intern/cycles/kernel/SConscript
+++ b/intern/cycles/kernel/SConscript
@@ -77,7 +77,7 @@ if env['WITH_BF_CYCLES_CUDA_BINARIES']:
nvcc_flags += " --cubin --ptxas-options=\"-v\""
nvcc_flags += " -D__KERNEL_CUDA_VERSION__=%d" % (cuda_version)
nvcc_flags += " -DCCL_NAMESPACE_BEGIN= -DCCL_NAMESPACE_END= -DNVCC"
- nvcc_flags += " -I \"%s\" -I \"%s\" -I \"%s\"" % (util_dir, svm_dir, geom_dir, closure_dir)
+ nvcc_flags += " -I \"%s\" -I \"%s\" -I \"%s\" -I \"%s\"" % (util_dir, svm_dir, geom_dir, closure_dir)
# dependencies
dependencies = ['kernel.cu'] + kernel.Glob('*.h') + kernel.Glob('../util/*.h') + kernel.Glob('svm/*.h') + kernel.Glob('geom/*.h') + kernel.Glob('closure/*.h')