diff options
| author | Maarten Gribnau <mail@maartengribnau.com> | 2002-12-22 01:26:46 +0300 |
|---|---|---|
| committer | Maarten Gribnau <mail@maartengribnau.com> | 2002-12-22 01:26:46 +0300 |
| commit | efb524d53f2576172349440b30ceb6d87569f072 (patch) | |
| tree | 99e5dd9c1ee8b156fd9d2ff5f0c0b8f1d519ff7b /source | |
| parent | 3bc9dda7992cf69ab6e242e9ed2b22e659a4a1c4 (diff) | |
Rewired python for OSX. The Makefiles now use the Python that comes with OSX
in /usr/local.
mxTextTools is still disabled because of a link error.
Maarten
Diffstat (limited to 'source')
| -rw-r--r-- | source/Makefile | 4 | ||||
| -rw-r--r-- | source/nan_definitions.mk | 12 |
2 files changed, 10 insertions, 6 deletions
diff --git a/source/Makefile b/source/Makefile index 57a69704953..57452b17976 100644 --- a/source/Makefile +++ b/source/Makefile @@ -296,9 +296,9 @@ ifeq ($(OS),beos) endif ifeq ($(OS),darwin) - # Python PYLIB = $(NAN_PYTHON)/lib/python$(NAN_PYTHON_VERSION)/config/libpython$(NAN_PYTHON_VERSION).a - # The only target right now... + # Next line would enable MxTextTools (for VRML2 import) but results in a link error + # PYLIB += $(NAN_MXTEXTTOOLS) BINTARGETS = blendercreator.app BINTARGETS += blenderpublisher.app BINTARGETS += blenderplayer.app diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk index 6b49de0c029..6d640a1b908 100644 --- a/source/nan_definitions.mk +++ b/source/nan_definitions.mk @@ -108,14 +108,18 @@ all debug:: ifeq ($(OS),darwin) ID = $(shell whoami) HOST = $(shell hostname -s) - # MAART: override libraries locations to use fink installed libraries + # Override libraries locations to use fink installed libraries export NAN_OPENSSL = /sw export NAN_JPEG = /sw export NAN_PNG = /sw - export NAN_PYTHON = $(LCGDIR)/python - export NAN_PYTHON_VERSION = 2.2 export NAN_ODE = $(LCGDIR)/ode - endif + # Override common python settings so that the python that comes with + # OSX 10.2 in /usr/local/ is used. + export NAN_PYTHON = /usr/local + export NAN_PYTHON_VERSION = 2.2 + export NAN_PYTHON_BINARY = $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION) + export NAN_MXTEXTTOOLS = $(shell $(NAN_PYTHON_BINARY) -c 'import mx; print mx.__path__[0]')/TextTools/mxTextTools/mxTextTools.so + endif ifeq ($(OS),freebsd) ID = $(shell whoami) HOST = $(shell hostname -s) |