[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25251] trunk/blender/source/Makefile: Move libpython.a to COMLIB (before was PULIB).
gsr b3d
gsr.b3d at infernal-iceberg.com
Wed Dec 9 18:53:52 CET 2009
Revision: 25251
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25251
Author: gsrb3d
Date: 2009-12-09 18:53:52 +0100 (Wed, 09 Dec 2009)
Log Message:
-----------
Move libpython.a to COMLIB (before was PULIB).
Modified Paths:
--------------
trunk/blender/source/Makefile
Modified: trunk/blender/source/Makefile
===================================================================
--- trunk/blender/source/Makefile 2009-12-09 17:32:54 UTC (rev 25250)
+++ trunk/blender/source/Makefile 2009-12-09 17:53:52 UTC (rev 25251)
@@ -177,6 +177,7 @@
COMLIB += $(NAN_GUARDEDALLOC)/lib/libguardedalloc.a
COMLIB += $(NAN_MEMUTIL)/lib/libmemutil.a
COMLIB += $(NAN_PNG)/lib/libpng.a
+COMLIB += $(OCGDIR)/blender/python/$(DEBUG_DIR)libpython.a # This was a PULIB up to circa r25248
COMLIB += $(OCGDIR)/blender/gen_python/$(DEBUG_DIR)libgen_python.a
ifeq ($(WITH_QUICKTIME), true)
@@ -276,13 +277,12 @@
PULIB += $(OCGDIR)/blender/ed_gpencil/$(DEBUG_DIR)libed_gpencil.a
PULIB += $(OCGDIR)/blender/ed_opsound/$(DEBUG_DIR)libed_opsound.a
PULIB += $(OCGDIR)/blender/windowmanager/$(DEBUG_DIR)libwindowmanager.a
-PULIB += $(OCGDIR)/blender/python/$(DEBUG_DIR)libpython.a
PULIB += $(OCGDIR)/blender/makesrna/$(DEBUG_DIR)librna.a
# note, no idea but it suddenly doesn't compile :(
PULIB += $(OCGDIR)/blender/blenlib/$(DEBUG_DIR)libblenlib.a
PULIB += $(NAN_OPENNL)/lib/$(DEBUG_DIR)libopennl.a
PULIB += $(NAN_ELBEEM)/lib/$(DEBUG_DIR)libelbeem.a
-PULIB += $(NAN_SMOKE)/lib/$(DEBUG_DIR)/libsmoke.a
+PULIB += $(NAN_SMOKE)/lib/$(DEBUG_DIR)libsmoke.a
ifeq ($(NAN_NO_KETSJI),true)
PULIB += $(NAN_MOTO)/lib/$(DEBUG_DIR)libmoto.a
More information about the Bf-blender-cvs
mailing list