kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Windows: Disable Numpy for now, we miss the libs for Python 3.4.

Browse Source 
Also make the flag WITH_BF_PYTHON_INSTALL_NUMPY flag actually work on Windows.
This commit is contained in:
Thomas Dinges 2014-04-30 16:49:28 +02:00
parent 741f17f05b
commit d1009bdad5
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_files/scons/config/win32-vc-config.py
View File

@ -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 '

2
build_files/scons/config/win64-vc-config.py
View File

@ -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 '

19
build_files/scons/tools/Blender.py
View File

@ -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'
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)
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'