diff options
| author | Ton Roosendaal <ton@blender.org> | 2008-01-07 21:35:06 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2008-01-07 21:35:06 +0300 |
| commit | 0729ba96463d327cdc129ce9f615c9431e7864ab (patch) | |
| tree | 11dab7a0df41605e61790a65c25bd3038a9fd9a9 /source | |
| parent | 1363134dee60ce96ab0772b72283fb405b6a75ed (diff) | |
New linking order for the 2.5 editor/wm libs
Diffstat (limited to 'source')
| -rw-r--r-- | source/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/Makefile b/source/Makefile index 352bcf44dcd..d747c2d32df 100644 --- a/source/Makefile +++ b/source/Makefile @@ -88,7 +88,7 @@ GRPLIB += $(OCGDIR)/blender/render/$(DEBUG_DIR)librender.a 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_IKSOLVER)/lib/libiksolver.a 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 |