diff options
| -rw-r--r-- | build_files/scons/config/win32-vc-config.py | 2 | ||||
| -rw-r--r-- | build_files/scons/config/win64-vc-config.py | 2 | ||||
| -rw-r--r-- | build_files/scons/tools/Blender.py | 21 |
3 files changed, 15 insertions, 10 deletions
diff --git a/build_files/scons/config/win32-vc-config.py b/build_files/scons/config/win32-vc-config.py index 16b105d188d..54ab4af318e 100644 --- a/build_files/scons/config/win32-vc-config.py +++ b/build_files/scons/config/win32-vc-config.py @@ -38,6 +38,8 @@ BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION[0]}${BF_PYTHON_VERSION[2]}' BF_PYTHON_DLL = '${BF_PYTHON_LIB}' BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib' +WITH_BF_PYTHON_INSTALL_NUMPY = False + WITH_BF_OPENAL = True BF_OPENAL = LIBDIR + '/openal' BF_OPENAL_INC = '${BF_OPENAL}/include ' diff --git a/build_files/scons/config/win64-vc-config.py b/build_files/scons/config/win64-vc-config.py index 3ec284ed34a..87af137814f 100644 --- a/build_files/scons/config/win64-vc-config.py +++ b/build_files/scons/config/win64-vc-config.py @@ -39,6 +39,8 @@ BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION[0]}${BF_PYTHON_VERSION[2]}' BF_PYTHON_DLL = '${BF_PYTHON_LIB}' BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib' +WITH_BF_PYTHON_INSTALL_NUMPY = False + WITH_BF_OPENAL = True BF_OPENAL = LIBDIR + '/openal' BF_OPENAL_INC = '${BF_OPENAL}/include ' diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py index 29e04baf955..496f90d0bea 100644 --- a/build_files/scons/tools/Blender.py +++ b/build_files/scons/tools/Blender.py @@ -629,16 +629,17 @@ def WinPyBundle(target=None, source=None, env=None): # ------------- # Extract Numpy - py_tar = env.subst(env['LCGDIR']).lstrip("#") - py_tar += '/release/python' + env['BF_PYTHON_VERSION'].replace('.','') + '_numpy_1.8.tar.gz' - - py_target = env.subst(env['BF_INSTALLDIR']).lstrip("#") - py_target = os.path.join(py_target, VERSION, 'python', 'lib', 'site-packages') - # rmtree handled above - # files are cleaned up in their archive - exclude_re = [] - print("Unpacking '" + py_tar + "' to '" + py_target + "'") - untar_pybundle(py_tar, py_target, exclude_re) + 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_target = env.subst(env['BF_INSTALLDIR']).lstrip("#") + py_target = os.path.join(py_target, VERSION, 'python', 'lib', 'site-packages') + # rmtree handled above + # files are cleaned up in their archive + exclude_re = [] + print("Unpacking '" + py_tar + "' to '" + py_target + "'") + untar_pybundle(py_tar, py_target, exclude_re) # -------------------- # Copy 'site-packages' |