forked from bartvdbraak/blender
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
This commit is contained in:
parent
3bc9dda799
commit
efb524d53f
@ -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
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user