kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Committing LarstiQ's patch for NAN_PYTHON_BINARY and NAN_MXTEXTTOOLS

Browse Source 
It worked on my system and no one else has said anything.

Kent
--
mein@cs.umn.edu
This commit is contained in:
Kent Mein 2002-11-13 16:09:38 +00:00
parent b4c622d4ba
commit 05dd7ff3fb
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/Makefile
View File

@ -312,7 +312,7 @@ ifeq ($(OS),freebsd)
endif
endif
PYLIB = $(NAN_PYTHON)/lib/python$(NAN_PYTHON_VERSION)/config/libpython$(NAN_PYTHON_VERSION).a
PYLIB += $(NAN_PYTHON)/mxTextTools/libmxtexttools.a
PYLIB += $(NAN_MXTEXTTOOLS)
endif
ifeq ($(OS),irix)
@ -321,7 +321,7 @@ ifeq ($(OS),irix)
BINTARGETS += blenderplayer
BINTARGETS += plugin
PYLIB = $(NAN_PYTHON)/lib/python$(NAN_PYTHON_VERSION)/config/libpython$(NAN_PYTHON_VERSION).a
PYLIB += $(NAN_PYTHON)/mxTextTools/libmxtexttools.a
PYLIB += $(NAN_MXTEXTTOOLS)
endif
ifeq ($(OS),linux)
@ -344,7 +344,7 @@ ifeq ($(OS),linux)
BINTARGETS += blenderpublisher
endif
PYLIB = $(NAN_PYTHON)/lib/python$(NAN_PYTHON_VERSION)/config/libpython$(NAN_PYTHON_VERSION).a
PYLIB += $(NAN_PYTHON)/mxTextTools/libmxtexttools.a
PYLIB += $(NAN_MXTEXTTOOLS)
endif
ifeq ($(OS),openbsd)
@ -361,7 +361,7 @@ ifeq ($(OS),solaris)
BINTARGETS += blenderssr
endif
PYLIB = $(NAN_PYTHON)/lib/python$(NAN_PYTHON_VERSION)/config/libpython$(NAN_PYTHON_VERSION).a
PYLIB += $(NAN_PYTHON)/mxTextTools/libmxtexttools.a
PYLIB += $(NAN_MXTEXTTOOLS)
PYLIB += $(NAN_ZLIB)/lib/libz.a
BCLIB += $(NAN_ZLIB)/lib/libz.a

2
source/nan_definitions.mk
View File

@ -46,6 +46,8 @@ all debug::
export NAN_OBJDIR ?= $(NANBLENDERHOME)/obj
export NAN_PYTHON ?= $(LCGDIR)/python
export NAN_PYTHON_VERSION ?= 2.0
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
export NAN_OPENAL ?= $(LCGDIR)/openal
export NAN_FMOD ?= $(LCGDIR)/fmod
export NAN_JPEG ?= $(LCGDIR)/jpeg