diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-04-16 23:23:37 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-04-16 23:23:37 +0400 |
| commit | fd99b8d4cfce6c2c3e005596188c93f454a4f7b4 (patch) | |
| tree | 4b511d57ee0e2d55f5d3927a398ce3487055e230 | |
| parent | 6f1afdbbfc4c25c74fbb470de09dc9b8b53497ca (diff) | |
Fix for scons/CUDA build after recent commit.
| -rw-r--r-- | intern/cycles/kernel/SConscript | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/SConscript b/intern/cycles/kernel/SConscript index 347835e6ef9..5316ec9926b 100644 --- a/intern/cycles/kernel/SConscript +++ b/intern/cycles/kernel/SConscript @@ -89,9 +89,9 @@ if env['WITH_BF_CYCLES_CUDA_BINARIES']: if env['BF_CYCLES_CUDA_ENV']: MS_SDK = "C:\\Program Files\\Microsoft SDKs\\Windows\\v7.1\\Bin\\SetEnv.cmd" - command = "\"%s\" & \"%s\" -arch=%s %s %s \"%s\" -o \"%s\"" % (MS_SDK, nvcc, arch, nvcc_flags, cuda_arch_flags, kernel_file, cubin_file) + command = "\"%s\" & \"%s\" -arch=%s %s \"%s\" -o \"%s\"" % (MS_SDK, nvcc, arch, nvcc_flags, kernel_file, cubin_file) else: - command = "\"%s\" -arch=%s %s %s \"%s\" -o \"%s\"" % (nvcc, arch, nvcc_flags, cuda_arch_flags, kernel_file, cubin_file) + command = "\"%s\" -arch=%s %s \"%s\" -o \"%s\"" % (nvcc, arch, nvcc_flags, kernel_file, cubin_file) kernel.Command(cubin_file, 'kernel.cu', command) kernel.Depends(cubin_file, dependencies) |