Commit: fd99b8d4cfce6c2c3e005596188c93f454a4f7b4
Author: Brecht Van Lommel
Date: Wed Apr 16 21:23:37 2014 +0200
https://developer.blender.org/rBfd99b8d4cfce6c2c3e005596188c93f454a4f7b4
Fix for scons/CUDA build after recent commit.
===================================================================
M intern/cycles/kernel/SConscript
===================================================================
diff --git a/intern/cycles/kernel/SConscript b/intern/cycles/kernel/SConscript
index 347835e..5316ec9 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)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
