[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54338] trunk/blender: OSX/cmake/scons: python version foolproof
jens verwiebe
info at jensverwiebe.de
Tue Feb 5 20:49:54 CET 2013
Revision: 54338
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54338
Author: jensverwiebe
Date: 2013-02-05 19:49:53 +0000 (Tue, 05 Feb 2013)
Log Message:
-----------
OSX/cmake/scons: python version foolproof
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/build_files/scons/config/darwin-config.py
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2013-02-05 18:24:26 UTC (rev 54337)
+++ trunk/blender/CMakeLists.txt 2013-02-05 19:49:53 UTC (rev 54338)
@@ -1485,7 +1485,7 @@
set(PYTHON_INCLUDE_DIR "/Library/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/include/python${PYTHON_VERSION}m")
set(PYTHON_BINARY "/Library/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/bin/python${PYTHON_VERSION}")
#set(PYTHON_LIBRARY python${PYTHON_VERSION})
- set(PYTHON_LIBPATH "/Library/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/lib/python${PYTHON_VERSION}/config-3.3m")
+ set(PYTHON_LIBPATH "/Library/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/lib/python${PYTHON_VERSION}/config-${PYTHON_VERSION}m")
#set(PYTHON_LINKFLAGS "-u _PyMac_Error -framework Python") # won't build with this enabled
endif()
Modified: trunk/blender/build_files/scons/config/darwin-config.py
===================================================================
--- trunk/blender/build_files/scons/config/darwin-config.py 2013-02-05 18:24:26 UTC (rev 54337)
+++ trunk/blender/build_files/scons/config/darwin-config.py 2013-02-05 19:49:53 UTC (rev 54338)
@@ -137,7 +137,7 @@
BF_PYTHON_INC = '${BF_PYTHON}${BF_PYTHON_VERSION}/include/python${BF_PYTHON_VERSION}m'
BF_PYTHON_BINARY = '${BF_PYTHON}${BF_PYTHON_VERSION}/bin/python${BF_PYTHON_VERSION}'
#BF_PYTHON_LIB = ''
- BF_PYTHON_LIBPATH = '${BF_PYTHON}${BF_PYTHON_VERSION}/lib/python${BF_PYTHON_VERSION}/config-3.2m'
+ BF_PYTHON_LIBPATH = '${BF_PYTHON}${BF_PYTHON_VERSION}/lib/python${BF_PYTHON_VERSION}/config-${BF_PYTHON_VERSION}m'
WITH_BF_OPENAL = True
#different lib must be used following version of gcc
More information about the Bf-blender-cvs
mailing list