diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-04-20 19:46:28 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-04-20 19:46:28 +0400 |
| commit | ed4377faa76f67ee10fd7e374da0c6f5f120c0fe (patch) | |
| tree | 79f4411ae6470d801820a8946b46dabdb9871cb9 /source | |
| parent | 716e9c5f47df26d658baadc2b23e7216903a2847 (diff) | |
replace referenecs to python 2.x
Diffstat (limited to 'source')
| -rw-r--r-- | source/gameengine/Converter/BL_ArmatureActuator.cpp | 6 | ||||
| -rw-r--r-- | source/nan_definitions.mk | 8 | ||||
| -rw-r--r-- | source/nan_link.mk | 2 |
3 files changed, 5 insertions, 11 deletions
diff --git a/source/gameengine/Converter/BL_ArmatureActuator.cpp b/source/gameengine/Converter/BL_ArmatureActuator.cpp index 47e1a50857a..82b8307a2bc 100644 --- a/source/gameengine/Converter/BL_ArmatureActuator.cpp +++ b/source/gameengine/Converter/BL_ArmatureActuator.cpp @@ -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, diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk index a3748ae247f..5bd3c7aaafa 100644 --- a/source/nan_definitions.mk +++ b/source/nan_definitions.mk @@ -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 diff --git a/source/nan_link.mk b/source/nan_link.mk index 3ab4f9710db..b88e835c54a 100644 --- a/source/nan_link.mk +++ b/source/nan_link.mk @@ -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 |