From 335b74a7143dc328e1c216176fb04b207ced8ee7 Mon Sep 17 00:00:00 2001 From: "Guillermo S. Romero" Date: Mon, 10 Aug 2009 02:43:03 +0000 Subject: [PATCH] Change linux makefiles to use system wide python lib. --- source/nan_definitions.mk | 3 ++- source/nan_link.mk | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk index d6701c6fa44..c98ccca307f 100644 --- a/source/nan_definitions.mk +++ b/source/nan_definitions.mk @@ -295,7 +295,8 @@ ifndef CONFIG_GUESS export NAN_PYTHON ?= /usr export NAN_PYTHON_VERSION ?= 3.1 export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION) - export NAN_PYTHON_LIB ?= $(NAN_PYTHON)/lib/python$(NAN_PYTHON_VERSION)/config/libpython$(NAN_PYTHON_VERSION).a + # Next line if for static python, nan_link.mk uses -lpython$(NAN_PYTHON_VERSION) + #export NAN_PYTHON_LIB ?= $(NAN_PYTHON)/lib/python$(NAN_PYTHON_VERSION)/config/libpython$(NAN_PYTHON_VERSION).a export NAN_OPENAL ?= /usr export NAN_JPEG ?= /usr export NAN_PNG ?= /usr diff --git a/source/nan_link.mk b/source/nan_link.mk index 3c84e62049b..a317c8a36ad 100644 --- a/source/nan_link.mk +++ b/source/nan_link.mk @@ -98,6 +98,7 @@ ifeq ($(OS),linux) LLIBS = -L$(NAN_MESA)/lib -L/usr/X11R6/lib -lXmu -lXext -lX11 -lXi LLIBS += -lutil -lc -lm -ldl -lpthread LLIBS += -lsamplerate + LLIBS += -lpython$(NAN_PYTHON_VERSION) LOPTS = -export-dynamic DADD = -lGL -lGLU SADD = $(NAN_MESA)/lib/libGL.a $(NAN_MESA)/lib/libGLU.a