diff options
author | Ton Roosendaal <ton@blender.org> | 2004-11-14 16:44:47 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2004-11-14 16:44:47 +0300 |
commit | 4226715fc0ffcf599601488d71e5565db47dc73a (patch) | |
tree | 40e5982dde680912db92a30954cb527689b1c09f /source/nan_definitions.mk | |
parent | aeec917f0ce0904a1257c77d08755e89c20136db (diff) |
Update make system for darwin;
- using python framework (default on, set it off with define in
definitions.mk)
- not installing .bfont.tff
Diffstat (limited to 'source/nan_definitions.mk')
-rw-r--r-- | source/nan_definitions.mk | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk index 697c9093d58..721bb694b59 100644 --- a/source/nan_definitions.mk +++ b/source/nan_definitions.mk @@ -136,9 +136,19 @@ endif export ID = $(shell whoami) export HOST = $(shell hostname -s) - export NAN_PYTHON ?= /sw - export NAN_PYTHON_VERSION ?= 2.3 - export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION) + + export PY_FRAMEWORK = 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) + else + export NAN_PYTHON ?= /sw + export NAN_PYTHON_VERSION ?= 2.3 + export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION) + endif + export NAN_OPENAL ?= $(LCGDIR)/openal export NAN_FMOD ?= $(LCGDIR)/fmod export NAN_JPEG ?= /sw |