diff options
| author | Ton Roosendaal <ton@blender.org> | 2008-01-10 21:13:34 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2008-01-10 21:13:34 +0300 |
| commit | 42e2b4eddef62512030f8232d7dec3f0da0424f0 (patch) | |
| tree | c4ab4f7fca3eea3d6c03981a112898986f08ee49 /source/Makefile | |
| parent | 43cf3af8c07a534f06b14a003eef2fc65c3c937b (diff) | |
Two fixes in 2.5 branch:
- crash on start because of unitialized pointer
- Makefile had the python lib on weird location... I prefer all
blender/source/blender/ libs together on 1 place? The Make needs
cleaning... it assumes publisher stuff. :)
Diffstat (limited to 'source/Makefile')
| -rw-r--r-- | source/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/Makefile b/source/Makefile index 079d94d0008..93a251d22d7 100644 --- a/source/Makefile +++ b/source/Makefile @@ -85,7 +85,6 @@ 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 # nlin: the reason that some libraries appear more than once below is # to handle circular dependencies in linking among libraries... some @@ -229,6 +228,8 @@ PULIB += $(OCGDIR)/blender/ed_screen/libed_screen.a PULIB += $(OCGDIR)/blender/ed_interface/libed_interface.a PULIB += $(OCGDIR)/blender/ed_view3d/libed_view3d.a PULIB += $(OCGDIR)/blender/windowmanager/libwindowmanager.a +PULIB += $(OCGDIR)/blender/python/$(DEBUG_DIR)libpython.a + ifeq ($(NAN_NO_KETSJI),true) PULIB += $(NAN_MOTO)/lib/libmoto.a |