[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20413] trunk/blender/source/ nan_definitions.mk: IRIX: use python 2.5 by default

Stefan Gartner stefang at aon.at
Tue May 26 01:35:29 CEST 2009


Revision: 20413
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20413
Author:   sgefant
Date:     2009-05-26 01:35:29 +0200 (Tue, 26 May 2009)

Log Message:
-----------
IRIX: use python 2.5 by default

Modified Paths:
--------------
    trunk/blender/source/nan_definitions.mk

Modified: trunk/blender/source/nan_definitions.mk
===================================================================
--- trunk/blender/source/nan_definitions.mk	2009-05-25 23:20:38 UTC (rev 20412)
+++ trunk/blender/source/nan_definitions.mk	2009-05-25 23:35:29 UTC (rev 20413)
@@ -292,8 +292,12 @@
     export HOST = $(shell /usr/bsd/hostname -s)
     #export NAN_NO_KETSJI=true
     export NAN_JUST_BLENDERDYNAMIC=true
-    export NAN_PYTHON ?= $(LCGDIR)/python
-    export NAN_PYTHON_VERSION ?= 2.3
+    export NAN_PYTHON_VERSION ?= 2.5
+    ifeq ($(IRIX_USE_GCC), true)
+        export NAN_PYTHON ?= $(LCGDIR)/python_gcc
+    else
+        export NAN_PYTHON ?= $(LCGDIR)/python
+    endif
     export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION)
     export NAN_PYTHON_LIB ?= $(NAN_PYTHON)/lib/python$(NAN_PYTHON_VERSION)/config/libpython$(NAN_PYTHON_VERSION).a -lpthread
     export NAN_OPENAL ?= $(LCGDIR)/openal





More information about the Bf-blender-cvs mailing list