diff options
| author | Kent Mein <mein@cs.umn.edu> | 2002-11-13 19:09:38 +0300 |
|---|---|---|
| committer | Kent Mein <mein@cs.umn.edu> | 2002-11-13 19:09:38 +0300 |
| commit | 05dd7ff3fbe7d5c828a2634c5b675ac95b83c7e3 (patch) | |
| tree | 117f6f891bb5d0abe8012fe92d12d5445d7a0cd7 /source | |
| parent | b4c622d4ba3a03043d1f33e90b87e93f7d90589a (diff) | |
Committing LarstiQ's patch for NAN_PYTHON_BINARY and NAN_MXTEXTTOOLS
It worked on my system and no one else has said anything.
Kent
--
mein@cs.umn.edu
Diffstat (limited to 'source')
| -rw-r--r-- | source/Makefile | 8 | ||||
| -rw-r--r-- | source/nan_definitions.mk | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/source/Makefile b/source/Makefile index 5913787aec0..fefca92d031 100644 --- a/source/Makefile +++ b/source/Makefile @@ -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 diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk index eacd9b9d3a9..e7eb225b6ee 100644 --- a/source/nan_definitions.mk +++ b/source/nan_definitions.mk @@ -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 |