[Bf-blender-cvs] [11d1fea] master: Windows: Enable numpy again, as we do have libs again for vc2013 and against py3.4.

Thomas Dinges noreply at git.blender.org
Wed Jun 25 22:24:44 CEST 2014


Commit: 11d1fea2850dd4071268034b133c924ce6396df9
Author: Thomas Dinges
Date:   Wed Jun 25 22:23:04 2014 +0200
https://developer.blender.org/rB11d1fea2850dd4071268034b133c924ce6396df9

Windows: Enable numpy again, as we do have libs again for vc2013 and against py3.4.

===================================================================

M	build_files/scons/config/win32-vc-config.py
M	build_files/scons/config/win64-vc-config.py

===================================================================

diff --git a/build_files/scons/config/win32-vc-config.py b/build_files/scons/config/win32-vc-config.py
index 524446d..ebe24bf 100644
--- a/build_files/scons/config/win32-vc-config.py
+++ b/build_files/scons/config/win32-vc-config.py
@@ -31,7 +31,7 @@ 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_PYTHON_INSTALL_NUMPY = True
 
 WITH_BF_OPENAL = True
 BF_OPENAL = LIBDIR + '/openal'
diff --git a/build_files/scons/config/win64-vc-config.py b/build_files/scons/config/win64-vc-config.py
index a45c0b1..d94de3b 100644
--- a/build_files/scons/config/win64-vc-config.py
+++ b/build_files/scons/config/win64-vc-config.py
@@ -32,7 +32,7 @@ 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_PYTHON_INSTALL_NUMPY = True
 
 WITH_BF_OPENAL = True
 BF_OPENAL = LIBDIR + '/openal'




More information about the Bf-blender-cvs mailing list