blender
/
blender
130
398
Fork 573
Code Issues 6.2k Pull Requests 745 Projects 19 Wiki Activity

OpenSubdiv: Correction for compute devices detection in SCons 

SCons was still using file names from 2.x branch.
This commit is contained in:
Sergey Sharybin 2015-08-04 18:18:21 +02:00
parent dfc672f8bb
commit 16b619b77d
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
intern/opensubdiv/SConscript
View File

@ -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((