diff options
| author | Kent Mein <mein@cs.umn.edu> | 2002-12-13 23:30:07 +0300 |
|---|---|---|
| committer | Kent Mein <mein@cs.umn.edu> | 2002-12-13 23:30:07 +0300 |
| commit | d37499537473bf3a2afcc3b7dc971088dcc1f5c9 (patch) | |
| tree | bb7d6f5f401c0799f74a59998d0cfbecba40661e | |
| parent | a64f137a37e72a2841340e8a213008b28bb749d0 (diff) | |
This might be a slight hack but Iksolver library was complaining about
some linking stuff that was in libmoto.a so I added a libmoto after it
in the link lines.
Hans got a better way to do this? :)
Kent
Here is the diff:
RCS file: /cvs01/blender/source/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- Makefile 2002/11/13 16:09:38 1.12
+++ Makefile 2002/12/13 20:28:13
@@ -165,6 +165,7 @@
COMLIB += $(NAN_PNG)/lib/libpng.a
BCLIB = $(NAN_IKSOLVER)/lib/libiksolver.a
+ BCLIB += $(NAN_MOTO)/lib/libmoto.a
BCLIB += $(OCGDIR)/blender/readblenfile/$(DEBUG_DIR)libreadblenfile.a
BCLIB += $(OCGDIR)/blender/readstreamglue/$(DEBUG_DIR)libreadstreamglue.a
BCLIB += $(OCGDIR)/blender/writestreamglueSTUB/$(DEBUG_DIR)libwritestreamglueSTUB.a
@@ -174,6 +175,7 @@
BCLIB += $(OCGDIR)/blender/src/$(DEBUG_DIR)libsrccreator.a
PULIB = $(NAN_IKSOLVER)/lib/libiksolver.a
+ PULIB += $(NAN_MOTO)/lib/libmoto.a
PULIB += $(OCGDIR)/blender/readblenfile/$(DEBUG_DIR)libreadblenfile.a
PULIB += $(OCGDIR)/blender/readstreamglue/$(DEBUG_DIR)libreadstreamglue.a
PULIB += $(OCGDIR)/blender/writestreamglue/$(DEBUG_DIR)libwritestreamglue.a
| -rw-r--r-- | source/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/Makefile b/source/Makefile index fefca92d031..041121acb07 100644 --- a/source/Makefile +++ b/source/Makefile @@ -165,6 +165,7 @@ PYPLAYERLIB ?= $(PYLIB) COMLIB += $(NAN_PNG)/lib/libpng.a BCLIB = $(NAN_IKSOLVER)/lib/libiksolver.a + BCLIB += $(NAN_MOTO)/lib/libmoto.a BCLIB += $(OCGDIR)/blender/readblenfile/$(DEBUG_DIR)libreadblenfile.a BCLIB += $(OCGDIR)/blender/readstreamglue/$(DEBUG_DIR)libreadstreamglue.a BCLIB += $(OCGDIR)/blender/writestreamglueSTUB/$(DEBUG_DIR)libwritestreamglueSTUB.a @@ -174,6 +175,7 @@ PYPLAYERLIB ?= $(PYLIB) BCLIB += $(OCGDIR)/blender/src/$(DEBUG_DIR)libsrccreator.a PULIB = $(NAN_IKSOLVER)/lib/libiksolver.a + PULIB += $(NAN_MOTO)/lib/libmoto.a PULIB += $(OCGDIR)/blender/readblenfile/$(DEBUG_DIR)libreadblenfile.a PULIB += $(OCGDIR)/blender/readstreamglue/$(DEBUG_DIR)libreadstreamglue.a PULIB += $(OCGDIR)/blender/writestreamglue/$(DEBUG_DIR)libwritestreamglue.a |