OpenSubdiv: Correction for compute devices detection in SCons
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 4 Aug 2015 16:18:21 +0000 (18:18 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 4 Aug 2015 16:18:21 +0000 (18:18 +0200)
SCons was still using file names from 2.x branch.

intern/opensubdiv/SConscript

index 58926c6a94a0e41703e89047c8d7bbc802af2792..e0bcc7f6b0fb6683df893a4d13dcfe8bcf1019c2 100644 (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((