Commit: e8b3a14dfb0113a7030dfb1a8d96f8b759947678
Author: Martijn Berger
Date: Tue Nov 24 23:18:25 2015 +0100
Branches: master
https://developer.blender.org/rBe8b3a14dfb0113a7030dfb1a8d96f8b759947678
OSX bump python to 3.5
===================================================================
M CMakeLists.txt
M build_files/scons/config/darwin-config.py
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cae1c24..f7be4eb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1940,7 +1940,7 @@ elseif(APPLE)
if(WITH_PYTHON)
# we use precompiled libraries for py 3.4 and up by default
- set(PYTHON_VERSION 3.4)
+ set(PYTHON_VERSION 3.5)
if(NOT WITH_PYTHON_MODULE AND NOT WITH_PYTHON_FRAMEWORK)
# normally cached but not since we include them with
blender
set(PYTHON_INCLUDE_DIR
"${LIBDIR}/python/include/python${PYTHON_VERSION}m")
diff --git a/build_files/scons/config/darwin-config.py
b/build_files/scons/config/darwin-config.py
index 16ba3ec..1ded9db 100644
--- a/build_files/scons/config/darwin-config.py
+++ b/build_files/scons/config/darwin-config.py
@@ -26,10 +26,10 @@ BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
BF_FFMPEG_LIB = 'avcodec avdevice avformat avutil mp3lame swscale x264
xvidcore theora theoradec theoraenc vorbis vorbisenc vorbisfile ogg bz2'
#bz2 is a standard osx dynlib
-BF_PYTHON_VERSION = '3.4'
+BF_PYTHON_VERSION = '3.5'
WITH_OSX_STATICPYTHON = True
-# python 3.4 uses precompiled libraries in bf svn /lib by default
+# python 3.5 uses precompiled libraries in bf svn /lib by default
BF_PYTHON = LIBDIR + '/python'
BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}m'
# BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
