diff options
Diffstat (limited to 'build_files/scons/tools/Blender.py')
-rw-r--r--[-rwxr-xr-x] | build_files/scons/tools/Blender.py | 39 |
1 files changed, 21 insertions, 18 deletions
diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py index b5853b22455..060904e7cd7 100755..100644 --- a/build_files/scons/tools/Blender.py +++ b/build_files/scons/tools/Blender.py @@ -143,7 +143,7 @@ def setup_staticlibs(lenv): libincs += Split(lenv['BF_FREETYPE_LIBPATH']) if lenv['WITH_BF_PYTHON']: libincs += Split(lenv['BF_PYTHON_LIBPATH']) - if lenv['WITH_BF_SDL']: + if lenv['WITH_BF_SDL'] and not lenv['WITH_BF_SDL_DYNLOAD']: libincs += Split(lenv['BF_SDL_LIBPATH']) if lenv['WITH_BF_JACK'] and not lenv['WITH_BF_JACK_DYNLOAD']: libincs += Split(lenv['BF_JACK_LIBPATH']) @@ -216,16 +216,16 @@ def setup_staticlibs(lenv): if lenv['WITH_BF_STATICOCIO']: statlibs += Split(lenv['BF_OCIO_LIB_STATIC']) - if lenv['WITH_BF_BOOST']: - libincs += Split(lenv['BF_BOOST_LIBPATH']) - if lenv['WITH_BF_STATICBOOST']: - statlibs += Split(lenv['BF_BOOST_LIB_STATIC']) - if lenv['WITH_BF_CYCLES_OSL']: libincs += Split(lenv['BF_OSL_LIBPATH']) if lenv['WITH_BF_STATICOSL']: statlibs += Split(lenv['BF_OSL_LIB_STATIC']) + if lenv['WITH_BF_BOOST']: + libincs += Split(lenv['BF_BOOST_LIBPATH']) + if lenv['WITH_BF_STATICBOOST']: + statlibs += Split(lenv['BF_BOOST_LIB_STATIC']) + if lenv['WITH_BF_LLVM']: libincs += Split(lenv['BF_LLVM_LIBPATH']) if lenv['WITH_BF_STATICLLVM']: @@ -303,7 +303,7 @@ def setup_syslibs(lenv): if lenv['WITH_BF_ELTOPO']: syslibs += Split(lenv['BF_LAPACK_LIB']) ''' - if lenv['WITH_BF_SDL']: + if lenv['WITH_BF_SDL'] and not lenv['WITH_BF_SDL_DYNLOAD']: syslibs += Split(lenv['BF_SDL_LIB']) if not lenv['WITH_BF_STATICOPENGL']: syslibs += Split(lenv['BF_OPENGL_LIB']) @@ -325,16 +325,16 @@ def setup_syslibs(lenv): if lenv['WITH_BF_3DMOUSE']: if not lenv['WITH_BF_STATIC3DMOUSE']: syslibs += Split(lenv['BF_3DMOUSE_LIB']) - + + if lenv['WITH_BF_CYCLES_OSL'] and not lenv['WITH_BF_STATICOSL']: + syslibs += Split(lenv['BF_OSL_LIB']) + if lenv['WITH_BF_BOOST'] and not lenv['WITH_BF_STATICBOOST']: syslibs += Split(lenv['BF_BOOST_LIB']) - + if lenv['WITH_BF_INTERNATIONAL']: syslibs += Split(lenv['BF_BOOST_LIB_INTERNATIONAL']) - if lenv['WITH_BF_CYCLES_OSL'] and not lenv['WITH_BF_STATICOSL']: - syslibs += Split(lenv['BF_OSL_LIB']) - if lenv['WITH_BF_LLVM'] and not lenv['WITH_BF_STATICLLVM']: syslibs += Split(lenv['BF_LLVM_LIB']) @@ -381,12 +381,19 @@ def creator(env): defs.append('WITH_BINRELOC') if env['WITH_BF_SDL']: + if env['WITH_BF_SDL_DYNLOAD']: + defs.append('WITH_SDL_DYNLOAD') + incs.append('#/extern/sdlew/include') defs.append('WITH_SDL') if env['WITH_BF_LIBMV']: incs.append('#/extern/libmv') defs.append('WITH_LIBMV') + if env['WITH_BF_CYCLES'] and env['WITH_BF_CYCLES_LOGGING']: + incs.append('#/intern/cycles/blender') + defs.append('WITH_CYCLES_LOGGING') + if env['WITH_BF_FFMPEG']: defs.append('WITH_FFMPEG') @@ -647,7 +654,7 @@ def WinPyBundle(target=None, source=None, env=None): # Extract Numpy if env['WITH_BF_PYTHON_INSTALL_NUMPY']: py_tar = env.subst(env['LCGDIR']).lstrip("#") - py_tar += '/release/python' + env['BF_PYTHON_VERSION'].replace('.','') + '_numpy_1.8.tar.gz' + py_tar += '/release/python' + env['BF_PYTHON_VERSION'].replace('.','') + '_numpy_1.9.tar.gz' py_target = env.subst(env['BF_INSTALLDIR']).lstrip("#") py_target = os.path.join(py_target, VERSION, 'python', 'lib', 'site-packages') @@ -755,7 +762,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/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) + 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_math_fast.h %s/util/util_transform.h %s/util/util_types.h %s/kernel/' % (croot, 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) @@ -809,10 +816,6 @@ def AppIt(target=None, source=None, env=None): instname = env['LCGDIR'][1:] # made libiomp5 part of blender libs cmd = 'ditto --arch %s %s/openmp/lib/libiomp5.dylib %s/%s.app/Contents/Resources/lib/'%(osxarch, instname, installdir, binary) # copy libiomp5 commands.getoutput(cmd) - cmd = 'install_name_tool -id @loader_path/../Resources/lib/libiomp5.dylib %s/%s.app/Contents/Resources/lib/libiomp5.dylib'%(installdir, binary) # change id of libiomp5 - commands.getoutput(cmd) - cmd = 'install_name_tool -change @loader_path/libiomp5.dylib @loader_path/../Resources/lib/libiomp5.dylib %s/%s.app/Contents/MacOS/%s'%(installdir, binary, binary) # change ref to libiomp5 ( blender ) - commands.getoutput(cmd) # extract copy system python, be sure to update other build systems # when making changes to the files that are copied. |