diff options
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 51 |
1 files changed, 49 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct index 16ce8ca4b32..5bc76c57091 100644 --- a/SConstruct +++ b/SConstruct @@ -435,12 +435,12 @@ B.init_lib_dict() Export('env') +BuildDir(B.root_build_dir+'/source', 'source', duplicate=0) +SConscript(B.root_build_dir+'/source/SConscript') BuildDir(B.root_build_dir+'/intern', 'intern', duplicate=0) SConscript(B.root_build_dir+'/intern/SConscript') BuildDir(B.root_build_dir+'/extern', 'extern', duplicate=0) SConscript(B.root_build_dir+'/extern/SConscript') -BuildDir(B.root_build_dir+'/source', 'source', duplicate=0) -SConscript(B.root_build_dir+'/source/SConscript') # now that we have read all SConscripts, we know what # libraries will be built. Create list of @@ -526,6 +526,50 @@ if env['OURPLATFORM']!='darwin': if len(source)==0: env.Execute(Mkdir(dir)) scriptinstall.append(env.Install(dir=dir,source=source)) + if env['WITH_BF_CYCLES']: + # cycles python code + dir=os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts', 'addons','cycles') + source=os.listdir('intern/cycles/blender/addon') + if '.svn' in source: source.remove('.svn') + if '_svn' in source: source.remove('_svn') + if '__pycache__' in source: source.remove('__pycache__') + source=['intern/cycles/blender/addon/'+s for s in source] + scriptinstall.append(env.Install(dir=dir,source=source)) + + # cycles kernel code + dir=os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts', 'addons','cycles', 'kernel') + source=os.listdir('intern/cycles/kernel') + if '.svn' in source: source.remove('.svn') + if '_svn' in source: source.remove('_svn') + if '__pycache__' in source: source.remove('__pycache__') + source.remove('kernel.cpp') + source.remove('CMakeLists.txt') + source.remove('svm') + 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_math.h') + source.append('intern/cycles/util/util_transform.h') + source.append('intern/cycles/util/util_types.h') + scriptinstall.append(env.Install(dir=dir,source=source)) + # svm + dir=os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts', 'addons','cycles', 'kernel', 'svm') + source=os.listdir('intern/cycles/kernel/svm') + if '.svn' in source: source.remove('.svn') + if '_svn' in source: source.remove('_svn') + if '__pycache__' in source: source.remove('__pycache__') + source=['intern/cycles/kernel/svm/'+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') + source=os.listdir('intern/cycles/doc/license') + if '.svn' in source: source.remove('.svn') + if '_svn' in source: source.remove('_svn') + if '__pycache__' in source: source.remove('__pycache__') + source.remove('CMakeLists.txt') + source=['intern/cycles/doc/license/'+s for s in source] + scriptinstall.append(env.Install(dir=dir,source=source)) if env['WITH_BF_INTERNATIONAL']: internationalpaths=['release' + os.sep + 'datafiles'] @@ -696,6 +740,9 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross'): dllsources.append('${LCGDIR}/thumbhandler/lib/BlendThumb.dll') dllsources.append('${LCGDIR}/thumbhandler/lib/BlendThumb64.dll') + if env['WITH_BF_OIIO']: + dllsources.append('${LCGDIR}/openimageio/bin/OpenImageIO.dll') + dllsources.append('#source/icons/blender.exe.manifest') windlls = env.Install(dir=env['BF_INSTALLDIR'], source = dllsources) |