diff options
author | Matt Ebb <matt@mke3.net> | 2009-08-02 10:22:53 +0400 |
---|---|---|
committer | Matt Ebb <matt@mke3.net> | 2009-08-02 10:22:53 +0400 |
commit | a0e252c25f356e13149840eb922595d06cd58eea (patch) | |
tree | 68f066270386e4e340bfded4badc56bd421a4a57 /source/nan_definitions.mk | |
parent | 24d1cf7d5493c2fe8fbf72e0fb5d8ec77346d4aa (diff) |
NaN makefiles now support and build with precompiled Python 3.1 by default on Mac
Diffstat (limited to 'source/nan_definitions.mk')
-rw-r--r-- | source/nan_definitions.mk | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk index 4724c740ffc..a70bd057d38 100644 --- a/source/nan_definitions.mk +++ b/source/nan_definitions.mk @@ -136,18 +136,24 @@ endif export ID = $(shell whoami) export HOST = $(shell hostname -s) - export PY_FRAMEWORK ?= 1 + export NAN_PYTHON_VERSION = 3.1 - ifdef PY_FRAMEWORK - export NAN_PYTHON ?= /System/Library/Frameworks/Python.framework/Versions/2.3 - export NAN_PYTHON_VERSION ?= 2.3 - export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION) - export NAN_PYTHON_LIB ?= -framework Python + ifeq ($(NAN_PYTHON_VERSION),3.1) + export PY_FRAMEWORK ?= 0 + export NAN_PYTHON ?= $(LCGDIR)/python + export NAN_PYTHON_LIB ?= $(NAN_PYTHON)/lib/python$(NAN_PYTHON_VERSION)/libpython$(NAN_PYTHON_VERSION).a else - export NAN_PYTHON ?= /sw - export NAN_PYTHON_VERSION ?= 2.3 - 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 + 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_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION) + export NAN_PYTHON_LIB ?= -framework Python + else + export NAN_PYTHON ?= /sw + 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 + endif endif export NAN_OPENAL ?= $(LCGDIR)/openal @@ -171,13 +177,9 @@ endif export NAN_OPENEXR ?= $(LCGDIR)/openexr export NAN_OPENEXR_INC ?= -I$(NAN_OPENEXR)/include -I$(NAN_OPENEXR)/include/OpenEXR - ifeq ($(CPU),powerpc) - export NAN_OPENEXR_LIBS ?= $(NAN_OPENEXR)/lib/libIlmImf.a $(NAN_OPENEXR)/lib/libHalf.a $(NAN_OPENEXR)/lib/libIex.a - else - export NAN_OPENEXR_LIBS ?= $(NAN_OPENEXR)/lib/libIlmImf.a $(NAN_OPENEXR)/lib/libHalf.a $(NAN_OPENEXR)/lib/libIex.a $(NAN_OPENEXR)/lib/libIlmThread.a - endif - - # export NAN_NO_KETSJI=true + export NAN_OPENEXR_LIBS ?= $(NAN_OPENEXR)/lib/libIlmImf.a $(NAN_OPENEXR)/lib/libHalf.a $(NAN_OPENEXR)/lib/libIex.a $(NAN_OPENEXR)/lib/libIlmThread.a + + export NAN_NO_KETSJI=false ifeq ($(CPU), i386) export NAN_NO_OPENAL=true |