diff options
Diffstat (limited to 'source/Makefile')
-rw-r--r-- | source/Makefile | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/source/Makefile b/source/Makefile index 9e344f38ad6..3158498ba8f 100644 --- a/source/Makefile +++ b/source/Makefile @@ -88,10 +88,10 @@ PYPLAYERLIB ?= $(PYLIB) GRPLIB += $(OCGDIR)/blender/render/$(DEBUG_DIR)librender.a GRPLIB += $(OCGDIR)/blender/radiosity/$(DEBUG_DIR)libradiosity.a GRPLIB += $(NAN_OPENNL)/lib/$(DEBUG_DIR)libopennl.a - GRPLIB += $(NAN_SUPERLU)/lib/$(DEBUG_DIR)libsuperlu.a - + GRPLIB += $(NAN_SUPERLU)/lib/$(DEBUG_DIR)libsuperlu.a GRPLIB += $(OCGDIR)/blender/python/$(DEBUG_DIR)libpython.a + # nlin: the reason that some libraries appear more than once below is # to handle circular dependencies in linking among libraries... some # linkers (e.g. under Linux) need libs to be specified multiple times @@ -282,10 +282,12 @@ endif ifeq ($(OS),darwin) BINTARGETS = blenderdynamic.app BINTARGETS += blenderplayer.app - PYLIB = $(NAN_PYTHON)/lib/python$(NAN_PYTHON_VERSION)/config/libpython$(NAN_PYTHON_VERSION).a - # Next line would enable MxTextTools (for VRML2 import) - # but results in a link error - # PYLIB += $(NAN_MXTEXTTOOLS) + + ifdef PY_FRAMEWORK + PYLIB = -framework Python + else + PYLIB = $(NAN_PYTHON)/lib/python$(NAN_PYTHON_VERSION)/config/libpython$(NAN_PYTHON_VERSION).a + endif endif ifeq ($(OS),freebsd) |