diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-08-04 19:18:21 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-08-04 19:18:21 +0300 |
| commit | 16b619b77dfee1d5975a20ca44669fe4c72e9370 (patch) | |
| tree | e6791e6b287cc4cf5d660dfb215dd66894ce099f /intern/opensubdiv | |
| parent | dfc672f8bbb8633f014f393fe3de2e39ed77c8dd (diff) | |
OpenSubdiv: Correction for compute devices detection in SCons
SCons was still using file names from 2.x branch.
Diffstat (limited to 'intern/opensubdiv')
| -rw-r--r-- | intern/opensubdiv/SConscript | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/intern/opensubdiv/SConscript b/intern/opensubdiv/SConscript index 58926c6a94a..e0bcc7f6b0f 100644 --- a/intern/opensubdiv/SConscript +++ b/intern/opensubdiv/SConscript @@ -48,16 +48,15 @@ def checkOpenSubdivHeaderDefine(header, define): return True return False -checkOpenSubdivHeaderDefine("tbbComputeController.h", 'OPENSUBDIV_HAS_TBB') -checkOpenSubdivHeaderDefine("gcdComputeController.h", 'OPENSUBDIV_HAS_GCD') -if checkOpenSubdivHeaderDefine("clComputeController.h", 'OPENSUBDIV_HAS_OPENCL'): - defs += ['OPENSUBDIV_HAS_CLEW'] - incs += ' #/extern/clew/include' -if checkOpenSubdivHeaderDefine("cudaComputeController.h", 'OPENSUBDIV_HAS_CUDA'): - defs += ['OPENSUBDIV_HAS_CUEW'] - incs += ' #/extern/cuew/include' -checkOpenSubdivHeaderDefine("glslTransformFeedbackComputeController.h", 'OPENSUBDIV_HAS_GLSL_TRANSFORM_FEEDBACK') -checkOpenSubdivHeaderDefine("osd/glslComputeController.h", 'OPENSUBDIV_HAS_GLSL_COMPUTE') +checkOpenSubdivHeaderDefine("tbbEvaluator.h", 'OPENSUBDIV_HAS_TBB') +#if checkOpenSubdivHeaderDefine("clEvaluator.h", 'OPENSUBDIV_HAS_OPENCL'): +# defs += ['OPENSUBDIV_HAS_CLEW'] +# incs += ' #/extern/clew/include' +#if checkOpenSubdivHeaderDefine("cudaEvaluator.h", 'OPENSUBDIV_HAS_CUDA'): +# defs += ['OPENSUBDIV_HAS_CUEW'] +# incs += ' #/extern/cuew/include' +checkOpenSubdivHeaderDefine("glXFBEvaluator.h", 'OPENSUBDIV_HAS_GLSL_TRANSFORM_FEEDBACK') +checkOpenSubdivHeaderDefine("glComputeEvaluator.h", 'OPENSUBDIV_HAS_GLSL_COMPUTE') # generated data files sources.extend(( |