diff options
| -rw-r--r-- | SConstruct | 7 | ||||
| -rw-r--r-- | build_files/scons/tools/Blender.py | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct index 267e79382ab..0258f776824 100644 --- a/SConstruct +++ b/SConstruct @@ -895,6 +895,7 @@ if env['OURPLATFORM']!='darwin': source.remove('CMakeLists.txt') source.remove('svm') source.remove('closure') + source.remove('geom') source.remove('shaders') source.remove('osl') source=['intern/cycles/kernel/'+s for s in source] @@ -916,6 +917,12 @@ if env['OURPLATFORM']!='darwin': if '__pycache__' in source: source.remove('__pycache__') source=['intern/cycles/kernel/closure/'+s for s in source] scriptinstall.append(env.Install(dir=dir,source=source)) + # geom + dir=os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts', 'addons','cycles', 'kernel', 'geom') + source=os.listdir('intern/cycles/kernel/geom') + if '__pycache__' in source: source.remove('__pycache__') + source=['intern/cycles/kernel/geom/'+s for s in source] + scriptinstall.append(env.Install(dir=dir,source=source)) # licenses dir=os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts', 'addons','cycles', 'license') diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py index 4ceadc7b0a4..29e04baf955 100644 --- a/build_files/scons/tools/Blender.py +++ b/build_files/scons/tools/Blender.py @@ -738,7 +738,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_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) + cmd = 'cp -R %s/kernel/svm %s/kernel/closure %s/kernel/geom %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, croot, cinstalldir) commands.getoutput(cmd) cmd = 'cp -R %s/../intern/cycles/kernel/*.cubin %s/lib/' % (builddir, cinstalldir) commands.getoutput(cmd) |