[Bf-blender-cvs] [cddbe87] master: OSX/python: update to py 3.4

Jens Verwiebe noreply at git.blender.org
Tue Apr 15 14:12:46 CEST 2014


Commit: cddbe87ae5009793fec8b55c8b26628ada9e66d4
Author: Jens Verwiebe
Date:   Tue Apr 15 14:12:06 2014 +0200
https://developer.blender.org/rBcddbe87ae5009793fec8b55c8b26628ada9e66d4

OSX/python: update to py 3.4

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

M	CMakeLists.txt
M	build_files/scons/config/darwin-config.py

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b73a0e1..7c1f799 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1642,8 +1642,8 @@ elseif(APPLE)
 	endif()
 
 	if(WITH_PYTHON)
-		# we use precompiled libraries for py 3.3 and up by default
-		set(PYTHON_VERSION 3.3)
+		# we use precompiled libraries for py 3.4 and up by default
+		set(PYTHON_VERSION 3.4)
 		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 b025cd8..2f77c6b 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.3'
+BF_PYTHON_VERSION = '3.4'
 WITH_OSX_STATICPYTHON = True
 
-# python 3.3 uses precompiled libraries in bf svn /lib by default
+# python 3.4 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}'




More information about the Bf-blender-cvs mailing list