Commit: 74ae93d1cd67becf89683be0b44a64e882a9429a
Author: Jens Verwiebe
Date: Fri Jan 17 00:33:32 2014 +0100
https://developer.blender.org/rB74ae93d1cd67becf89683be0b44a64e882a9429a
Scons: Fix cycles OpenCL kernelcompile by distributing util_half.h
===================================================================
M SConstruct
M build_files/scons/tools/Blender.py
===================================================================
diff --git a/SConstruct b/SConstruct
index d0af424..bff6d80 100644
--- a/SConstruct
+++ b/SConstruct
@@ -903,6 +903,7 @@ if env['OURPLATFORM']!='darwin':
source.remove('osl')
source=['intern/cycles/kernel/'+s for s in source]
source.append('intern/cycles/util/util_color.h')
+ source.append('intern/cycles/util/util_half.h')
source.append('intern/cycles/util/util_math.h')
source.append('intern/cycles/util/util_transform.h')
source.append('intern/cycles/util/util_types.h')
diff --git a/build_files/scons/tools/Blender.py
b/build_files/scons/tools/Blender.py
index 3291851..ec528c4 100644
--- a/build_files/scons/tools/Blender.py
+++ b/build_files/scons/tools/Blender.py
@@ -703,7 +703,7 @@ def AppIt(target=None, source=None, env=None):
commands.getoutput(cmd)
cmd = 'cp -R %s/kernel/*.h %s/kernel/*.cl %s/kernel/*.cu
%s/kernel/' % (croot, croot, croot, cinstalldir)
commands.getoutput(cmd)
- cmd = 'cp -R %s/kernel/svm %s/kernel/closure %s/util/util_color.h
%s/util/util_math.h %s/util/util_transform.h %s/util/util_types.h %s/kernel/' %
(croot, croot, croot, croot, croot, croot, cinstalldir)
+ cmd = 'cp -R %s/kernel/svm %s/kernel/closure %s/util/util_color.h
%s/util/util_half.h %s/util/util_math.h %s/util/util_transform.h
%s/util/util_types.h %s/kernel/' % (croot, croot, croot, croot, croot, croot,
croot, cinstalldir)
commands.getoutput(cmd)
cmd = 'cp -R %s/../intern/cycles/kernel/*.cubin %s/lib/' %
(builddir, cinstalldir)
commands.getoutput(cmd)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
