replace referenecs to python 2.x
authorCampbell Barton <ideasman42@gmail.com>
Tue, 20 Apr 2010 15:46:28 +0000 (15:46 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 20 Apr 2010 15:46:28 +0000 (15:46 +0000)
CMakeLists.txt
config/aix4-config.py
config/irix6-config.py
doc/blender-cmake.txt
source/gameengine/Converter/BL_ArmatureActuator.cpp
source/nan_definitions.mk
source/nan_link.mk

index 3daa389329038994b095dce9efad8418527664fa..71489ca69122134a5cb613a3abb69faaf37dade0 100644 (file)
@@ -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 "")
index 3a3db39494d9973636f684ae2572739532f2b553..32344cdabc8d99e8937e85748c45a4d6c90e57b2 100644 (file)
@@ -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'
index df18e0b511f6584208f78cb0310ed40c75d597e4..7c319f7b52070c36528bb6bfaf92e09632ed8b3c 100644 (file)
@@ -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'
index 05037a3ab2a9ed1e2f749d7759cc0e73d8f85f98..a49ff629b5bd862b0ba868b19f3a6b5c08bd06c4 100644 (file)
@@ -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.
 
index 47e1a50857ac5324985b78701880aea1d0bf019a..82b8307a2bc323e54299cb4ed60be57b07732701 100644 (file)
@@ -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,
index a3748ae247f8da8d2df0b7d75698e727deb1c6b2..5bd3c7aaafacfba8a7401d696fe947720e702c30 100644 (file)
@@ -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
index 3ab4f9710dbb38271c11838c86915a68bc4967b9..b88e835c54ad285484244ba0cf321ef9c7839c21 100644 (file)
@@ -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