diff options
| author | Kent Mein <mein@cs.umn.edu> | 2009-09-25 22:47:43 +0400 |
|---|---|---|
| committer | Kent Mein <mein@cs.umn.edu> | 2009-09-25 22:47:43 +0400 |
| commit | 72c4c9da7a4074f86f4ed59d87a6e50a98b9bb06 (patch) | |
| tree | 39d83f1c6ed161c82a7a3ce1ccadee168f186272 | |
| parent | aa989c1e8343cb761665129d44e03a4fc4c7cd95 (diff) | |
Fixing up Makefiles, its not fully working but its closer...
Kent
| -rw-r--r-- | intern/itasc/Makefile | 9 | ||||
| -rw-r--r-- | intern/itasc/kdl/Makefile | 10 | ||||
| -rw-r--r-- | intern/itasc/kdl/utilities/Makefile | 2 | ||||
| -rw-r--r-- | source/Makefile | 2 | ||||
| -rw-r--r-- | source/blender/ikplugin/intern/Makefile | 6 |
5 files changed, 18 insertions, 11 deletions
diff --git a/intern/itasc/Makefile b/intern/itasc/Makefile index 6ac0d142b72..2272cf2c6ac 100644 --- a/intern/itasc/Makefile +++ b/intern/itasc/Makefile @@ -28,10 +28,13 @@ # iksolver main makefile. # +include nan_definitions.mk LIBNAME = itasc -DIR = $(OCGDIR)/intern/$(SOURCEDIR) - +SOURCEDIR = intern/$(LIBNAME) +DIR = $(OCGDIR)/$(SOURCEDIR) +DIRS = kdl +include nan_subdirs.mk include nan_compile.mk CPPFLAGS += -I. @@ -48,6 +51,4 @@ ifeq ($(OS),darwin) ranlib $(NAN_ITASC)/lib/debug/libitasc.a endif ############################## -DIRS = kdl -SOURCEDIR = intern/$(LIBNAME) include nan_subdirs.mk diff --git a/intern/itasc/kdl/Makefile b/intern/itasc/kdl/Makefile index e34c991db38..9b152c27c7c 100644 --- a/intern/itasc/kdl/Makefile +++ b/intern/itasc/kdl/Makefile @@ -28,15 +28,15 @@ # iksolver main makefile. # +include nan_definitions.mk + LIBNAME = itasc DIR = $(OCGDIR)/intern/$(LIBNAME) +DIRS = utilities +SOURCEDIR = intern/$(LIBNAME)/kdl +include nan_subdirs.mk include nan_compile.mk CPPFLAGS += -I. CPPFLAGS += -I../../../extern/Eigen2 - -############################## -DIRS = utilities -SOURCEDIR = intern/$(LIBNAME)/kdl -include nan_subdirs.mk diff --git a/intern/itasc/kdl/utilities/Makefile b/intern/itasc/kdl/utilities/Makefile index 6dedc24181e..4397a80cef5 100644 --- a/intern/itasc/kdl/utilities/Makefile +++ b/intern/itasc/kdl/utilities/Makefile @@ -28,6 +28,8 @@ # iksolver main makefile. # +include nan_definitions.mk + LIBNAME = itasc DIR = $(OCGDIR)/intern/$(LIBNAME) diff --git a/source/Makefile b/source/Makefile index dab037d1749..b0c15c2eba1 100644 --- a/source/Makefile +++ b/source/Makefile @@ -98,7 +98,9 @@ COMLIB += $(OCGDIR)/blender/nodes_tex/$(DEBUG_DIR)libnodes_tex.a COMLIB += $(OCGDIR)/blender/nodes/$(DEBUG_DIR)libnodes.a COMLIB += $(OCGDIR)/blender/imbuf/$(DEBUG_DIR)libimbuf.a COMLIB += $(OCGDIR)/blender/blenlib/$(DEBUG_DIR)libblenlib.a +COMLIB += $(OCGDIR)/blender/ikplugin/$(DEBUG_DIR)libikplugin.a COMLIB += $(NAN_IKSOLVER)/lib/$(DEBUG_DIR)libiksolver.a +COMLIB += $(NAN_ITASC)/lib/$(DEBUG_DIR)libitasc.a COMLIB += $(NAN_MOTO)/lib/$(DEBUG_DIR)libmoto.a COMLIB += $(NAN_SUPERLU)/lib/$(DEBUG_DIR)libsuperlu.a COMLIB += $(OCGDIR)/blender/avi/$(DEBUG_DIR)libavi.a diff --git a/source/blender/ikplugin/intern/Makefile b/source/blender/ikplugin/intern/Makefile index 9254b65b7b7..0c54e5d1264 100644 --- a/source/blender/ikplugin/intern/Makefile +++ b/source/blender/ikplugin/intern/Makefile @@ -36,8 +36,8 @@ CFLAGS += -I../../makesdna CFLAGS += -I../../blenkernel CFLAGS += -I../../blenlib CFLAGS += -I../../include -CFLAGS += -I../../../intern/itasc -CFLAGS += -I../../../extern/Eigen2 +CFLAGS += -I../../../../intern/itasc +CFLAGS += -I../../../../extern/Eigen2 CFLAGS += -I.. CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include @@ -46,4 +46,6 @@ CPPFLAGS += -I../../makesdna CPPFLAGS += -I../../blenkernel CPPFLAGS += -I../../blenlib CPPFLAGS += -I../../include +CPPFLAGS += -I../../../../intern/itasc +CPPFLAGS += -I../../../../extern/Eigen2 CPPFLAGS += -I.. |