sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cycles: add some extra CUDA nvcc paths for runtime compile, might help for #33622.

Browse Source
This commit is contained in:
Brecht Van Lommel 2012-12-21 10:27:35 +00:00
parent 12117a8187
commit 5f4c7e5da4
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
intern/cycles/util/util_cuda.cpp
View File

@ -394,10 +394,10 @@ bool cuLibraryInit()
string cuCompilerPath()
{
#ifdef _WIN32
const char *defaultpath = "C:/CUDA/bin";
const char *defaultpaths[] = {"C:/CUDA/bin", NULL};
const char *executable = "nvcc.exe";
#else
const char *defaultpath = "/usr/local/cuda/bin";
const char *defaultpaths[] = {"/Developer/NVIDIA/CUDA-4.2/bin", "/usr/local/cuda-4.2/bin", "/usr/local/cuda/bin", NULL};
const char *executable = "nvcc";
#endif
@ -405,13 +405,17 @@ string cuCompilerPath()
string nvcc;
if(binpath)
if(binpath) {
nvcc = path_join(binpath, executable);
else
nvcc = path_join(defaultpath, executable);
if(path_exists(nvcc))
return nvcc;
}
if(path_exists(nvcc))
return nvcc;
for(int i = 0; defaultpaths[i]; i++) {
nvcc = path_join(defaultpaths[i], executable);
if(path_exists(nvcc))
return nvcc;
}
#ifndef _WIN32
{