[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13159] branches/blender2.5/blender/source /Makefile: New linking order for the 2.5 editor/wm libs

[Ton Roosendaal]

Revision: 13159
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13159
Author:   ton
Date:     2008-01-07 19:35:06 +0100 (Mon, 07 Jan 2008)

Log Message:
-----------
New linking order for the 2.5 editor/wm libs

Modified Paths:
--------------
    branches/blender2.5/blender/source/Makefile

Modified: branches/blender2.5/blender/source/Makefile
===================================================================
--- branches/blender2.5/blender/source/Makefile	2008-01-07 18:15:57 UTC (rev 13158)
+++ branches/blender2.5/blender/source/Makefile	2008-01-07 18:35:06 UTC (rev 13159)
@@ -88,7 +88,7 @@
 GRPLIB += $(OCGDIR)/blender/radiosity/$(DEBUG_DIR)libradiosity.a
 GRPLIB += $(NAN_OPENNL)/lib/$(DEBUG_DIR)libopennl.a
 GRPLIB += $(NAN_SUPERLU)/lib/$(DEBUG_DIR)libsuperlu.a	
-#GRPLIB += $(OCGDIR)/blender/python/$(DEBUG_DIR)libpython.a
+GRPLIB += $(OCGDIR)/blender/python/$(DEBUG_DIR)libpython.a
 
 # nlin: the reason that some libraries appear more than once below is
 # to handle circular dependencies in linking among libraries... some
@@ -227,10 +227,11 @@
 PULIB += $(NAN_MOTO)/lib/libmoto.a
 PULIB += $(NAN_ELBEEM)/lib/$(DEBUG_DIR)libelbeem.a
 PULIB += $(OCGDIR)/blender/readblenfile/$(DEBUG_DIR)libreadblenfile.a
-PULIB += $(OCGDIR)/blender/windowmanager/$(DEBUG_DIR)libwindowmanager.a
 PULIB += $(OCGDIR)/blender/ed_datafiles/libed_datafiles.a
 PULIB += $(OCGDIR)/blender/ed_screen/libed_screen.a
-PULIB += $(OCGDIR)/blender/ed_area/libed_area.a
+PULIB += $(OCGDIR)/blender/ed_interface/libed_interface.a
+PULIB += $(OCGDIR)/blender/ed_view3d/libed_view3d.a
+PULIB += $(OCGDIR)/blender/windowmanager/libwindowmanager.a
 
 ifeq ($(NAN_NO_KETSJI),true)
     PULIB += $(NAN_MOTO)/lib/libmoto.a