Revision: 22333
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22333
Author: gsrb3d
Date: 2009-08-10 04:43:03 +0200 (Mon, 10 Aug 2009)
Log Message:
-----------
Change linux makefiles to use system wide python lib.
Modified Paths:
--------------
branches/blender2.5/blender/source/nan_definitions.mk
branches/blender2.5/blender/source/nan_link.mk
Modified: branches/blender2.5/blender/source/nan_definitions.mk
===================================================================
--- branches/blender2.5/blender/source/nan_definitions.mk 2009-08-10
02:07:34 UTC (rev 22332)
+++ branches/blender2.5/blender/source/nan_definitions.mk 2009-08-10
02:43:03 UTC (rev 22333)
@@ -295,7 +295,8 @@
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
Modified: branches/blender2.5/blender/source/nan_link.mk
===================================================================
--- branches/blender2.5/blender/source/nan_link.mk 2009-08-10 02:07:34 UTC
(rev 22332)
+++ branches/blender2.5/blender/source/nan_link.mk 2009-08-10 02:43:03 UTC
(rev 22333)
@@ -98,6 +98,7 @@
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
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
