forked from bartvdbraak/blender
Change linux makefiles to use system wide python lib.
This commit is contained in:
parent
de759dd278
commit
335b74a714
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user