diff options
| -rw-r--r-- | source/nan_definitions.mk | 4 | ||||
| -rw-r--r-- | source/nan_link.mk | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk index 3b89a425b07..63ea38296d2 100644 --- a/source/nan_definitions.mk +++ b/source/nan_definitions.mk @@ -275,7 +275,11 @@ endif export ID = $(shell whoami) export HOST = $(shell hostname -s) export NAN_PYTHON ?= /usr + ifeq ($(CPU),ia64) + export NAN_PYTHON_VERSION ?= 2.2 + else export NAN_PYTHON_VERSION ?= 2.3 + endif export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION) export NAN_OPENAL ?= /usr export NAN_FMOD ?= $(LCGDIR)/fmod diff --git a/source/nan_link.mk b/source/nan_link.mk index f4fb8951a16..17c51074acf 100644 --- a/source/nan_link.mk +++ b/source/nan_link.mk @@ -93,7 +93,7 @@ ifeq ($(OS),linux) LLIBS += -lc -lm -ldl -lutil LOPTS = -export-dynamic endif - ifeq ($(CPU),$(findstring $(CPU), "i386 x86_64")) + ifeq ($(CPU),$(findstring $(CPU), "i386 x86_64 ia64")) COMMENT = "MESA 3.1" LLIBS = -L$(NAN_MESA)/lib -L/usr/X11R6/lib -lXmu -lXext -lX11 -lXi LLIBS += -lutil -lc -lm -ldl -lpthread |