replace referenecs to python 2.x
This commit is contained in:
Campbell Barton
parent
716e9c5f47
commit
ed4377faa7
|
|
@ -102,9 +102,9 @@ ENDIF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
|
|||
|
||||
# For alternate Python locations the commandline can be used to override detected/default cache settings, e.g:
|
||||
# On Unix:
|
||||
# cmake -D PYTHON_LIB=/usr/local/lib/python2.3/config/libpython2.3.so -D PYTHON_INC=/usr/local/include/python2.3 -D PYTHON_BINARY=/usr/local/bin/python2.3 -G "Unix Makefiles" ../blender
|
||||
# cmake -D PYTHON_LIB=/usr/local/lib/python3.1/config/libpython3.1.so -D PYTHON_INC=/usr/local/include/python3.1 -G "Unix Makefiles" ../blender
|
||||
# On Macs:
|
||||
# cmake -D PYTHON_INC=/System/Library/Frameworks/Python.framework/Versions/2.5/include/python2.5 -D PYTHON_LIBPATH=/System/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/config -D PYTHON_BINARY=/System/Library/Frameworks/Python.framework/Versions/2.5/bin/python2.5 -G Xcode ../blender
|
||||
# cmake -D PYTHON_INC=/System/Library/Frameworks/Python.framework/Versions/3.1/include/python3.1 -D PYTHON_LIBPATH=/System/Library/Frameworks/Python.framework/Versions/3.1/lib/python3.1/config -G Xcode ../blender
|
||||
#
|
||||
# When changing any of this remember to update the notes in doc/blender-cmake.txt
|
||||
|
||||
|
|
@ -479,7 +479,7 @@ IF(APPLE)
|
|||
# otherwise, use custom system framework
|
||||
|
||||
SET(PYTHON /System/Library/Frameworks/Python.framework/Versions/)
|
||||
SET(PYTHON_VERSION 2.5)
|
||||
SET(PYTHON_VERSION 3.1)
|
||||
SET(PYTHON_INC "${PYTHON}${PYTHON_VERSION}/include/python${PYTHON_VERSION}")
|
||||
# SET(PYTHON_BINARY ${PYTHON}${PYTHON_VERSION}/bin/python${PYTHON_VERSION}) # not used yet
|
||||
SET(PYTHON_LIB "")
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
|
|||
BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
|
||||
BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}' #BF_PYTHON+'/lib/python'+BF_PYTHON_VERSION+'/config/libpython'+BF_PYTHON_VERSION+'.a'
|
||||
BF_PYTHON_LINKFLAGS = ['-Xlinker', '-export-dynamic']
|
||||
BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/python2.5/config/libpython${BF_PYTHON_VERSION}.a'
|
||||
BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/python${BF_PYTHON_VERSION}/config/libpython${BF_PYTHON_VERSION}.a'
|
||||
|
||||
WITH_BF_OPENAL = 'false'
|
||||
WITH_BF_STATICOPENAL = 'false'
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
|
|||
BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
|
||||
BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}' #BF_PYTHON+'/lib/python'+BF_PYTHON_VERSION+'/config/libpython'+BF_PYTHON_VERSION+'.a'
|
||||
BF_PYTHON_LINKFLAGS = ['-Xlinker', '-export-dynamic']
|
||||
BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/python2.5/config/libpython${BF_PYTHON_VERSION}.a'
|
||||
BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/python${BF_PYTHON_VERSION}/config/libpython${BF_PYTHON_VERSION}.a'
|
||||
|
||||
WITH_BF_OPENAL = 'true'
|
||||
WITH_BF_STATICOPENAL = 'true'
|
||||
|
|
|
|||
|
|
@ -132,9 +132,9 @@ $Id$
|
|||
The commandline can be used to override detected/default settings, e.g:
|
||||
|
||||
On Unix:
|
||||
cmake -D PYTHON_LIB=/usr/local/lib/python2.3/config/libpython2.3.so -D PYTHON_INC=/usr/local/include/python2.3 -D PYTHON_BINARY=/usr/local/bin/python2.3 -G "Unix Makefiles" ../blender
|
||||
cmake -D PYTHON_LIB=/usr/local/lib/python3.1/config/libpython3.1.so -D PYTHON_INC=/usr/local/include/python3.1 -G "Unix Makefiles" ../blender
|
||||
On Macs:
|
||||
cmake -D PYTHON_INC=/System/Library/Frameworks/Python.framework/Versions/2.5/include/python2.5 -D PYTHON_LIBPATH=/System/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/config -D PYTHON_BINARY=/System/Library/Frameworks/Python.framework/Versions/2.5/bin/python2.5 -G Xcode ../blender
|
||||
cmake -D PYTHON_INC=/System/Library/Frameworks/Python.framework/Versions/3.1/include/python3.1 -G Xcode ../blender
|
||||
|
||||
Mote that this should only be needed once per build directory generation because it will keep the overrides in CMakeCache.txt for subsequent runs.
|
||||
|
||||
|
|
|
|||
|
|
@ -182,13 +182,7 @@ bool BL_ArmatureActuator::Update(double curtime, bool frame)
|
|||
/* ------------------------------------------------------------------------- */
|
||||
|
||||
PyTypeObject BL_ArmatureActuator::Type = {
|
||||
#if (PY_VERSION_HEX >= 0x02060000)
|
||||
PyVarObject_HEAD_INIT(NULL, 0)
|
||||
#else
|
||||
/* python 2.5 and below */
|
||||
PyObject_HEAD_INIT( NULL ) /* required py macro */
|
||||
0, /* ob_size */
|
||||
#endif
|
||||
"BL_ArmatureActuator",
|
||||
sizeof(PyObjectPlus_Proxy),
|
||||
0,
|
||||
|
|
|
|||
|
|
@ -207,8 +207,8 @@ ifndef CONFIG_GUESS
|
|||
else
|
||||
export PY_FRAMEWORK ?= 1
|
||||
ifdef PY_FRAMEWORK
|
||||
export NAN_PYTHON ?= /System/Library/Frameworks/Python.framework/Versions/2.5
|
||||
export NAN_PYTHON_VERSION ?= 2.5
|
||||
export NAN_PYTHON_VERSION ?= 3.1
|
||||
export NAN_PYTHON ?= /System/Library/Frameworks/Python.framework/Versions/$(NAN_PYTHON_VERSION)
|
||||
export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION)
|
||||
export NAN_PYTHON_LIB ?= -framework Python
|
||||
else
|
||||
|
|
@ -538,7 +538,7 @@ ifndef CONFIG_GUESS
|
|||
ifeq ($(FREE_WINDOWS), true)
|
||||
export NAN_GETTEXT_LIB ?= $(NAN_GETTEXT)/lib/freegettext.a $(NAN_ICONV)/lib/freeiconv.a
|
||||
export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION)
|
||||
export NAN_PYTHON_LIB ?= $(NAN_PYTHON)/lib/lib25_vs2005/libpython25.a
|
||||
export NAN_PYTHON_LIB ?= $(NAN_PYTHON)/lib/lib25_vs2005/libpython31.a # NOT TESTED, PROBABLY BROKEN
|
||||
export NAN_FREETYPE ?= $(LCGDIR)/gcc/freetype
|
||||
export NAN_SDL ?= $(LCGDIR)/gcc/sdl
|
||||
export NAN_OPENEXR ?= $(LCGDIR)/gcc/openexr
|
||||
|
|
@ -548,7 +548,7 @@ ifndef CONFIG_GUESS
|
|||
else
|
||||
export NAN_GETTEXT_LIB ?= $(NAN_GETTEXT)/lib/gnu_gettext.lib $(NAN_ICONV)/lib/iconv.lib
|
||||
export NAN_PYTHON_BINARY ?= python
|
||||
export NAN_PYTHON_LIB ?= $(NAN_PYTHON)/lib/python23.lib
|
||||
export NAN_PYTHON_LIB ?= $(NAN_PYTHON)/lib/python31.lib # NOT TESTED, PROBABLY BROKEN
|
||||
export NAN_FREETYPE ?= $(LCGDIR)/freetype
|
||||
export NAN_SDL ?= $(LCGDIR)/sdl
|
||||
export NAN_OPENEXR ?= $(LCGDIR)/openexr
|
||||
|
|
|
|||
|
|
@ -155,7 +155,7 @@ ifeq ($(OS),windows)
|
|||
LOPTS += /NODEFAULTLIB:"libcd"
|
||||
LOPTS += /NODEFAULTLIB:"libcp"
|
||||
LOPTS += /NODEFAULTLIB:"libcpd"
|
||||
LOPTS += /NODEFAULTLIB:"python20"
|
||||
LOPTS += /NODEFAULTLIB:"python31"
|
||||
LOPTS += /NODEFAULTLIB:"msvcrt"
|
||||
LOPTS += /SUBSYSTEM:CONSOLE
|
||||
LDFLAGS += /MT
|
||||
|
|
|
|||
Loading…
Reference in New Issue