Fixing up Makefiles, its not fully working but its closer...
authorKent Mein <mein@cs.umn.edu>
Fri, 25 Sep 2009 18:47:43 +0000 (18:47 +0000)
committerKent Mein <mein@cs.umn.edu>
Fri, 25 Sep 2009 18:47:43 +0000 (18:47 +0000)
Kent

intern/itasc/Makefile
intern/itasc/kdl/Makefile
intern/itasc/kdl/utilities/Makefile
source/Makefile
source/blender/ikplugin/intern/Makefile

index 6ac0d142b72902425e6d6844e874ff1d84a7c461..2272cf2c6acf7775bc11328766bc1e3d68334161 100644 (file)
 # 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
index e34c991db38c9d4f555a170f18a095eca5c814d8..9b152c27c7c8039668dc1c73baf9c12ac47771e9 100644 (file)
 # 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
index 6dedc24181e4ab5ef25b0d44eb97c68b76df9d67..4397a80cef53e77d20291bb0467fe460e564f946 100644 (file)
@@ -28,6 +28,8 @@
 # iksolver main makefile.
 #
 
+include nan_definitions.mk
+
 LIBNAME = itasc
 DIR = $(OCGDIR)/intern/$(LIBNAME)
 
index dab037d1749b8ac4c7f5bd83cd402cffd714b6a7..b0c15c2eba12fa1fe8f3c3825804134dbf990c4a 100644 (file)
@@ -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
index 9254b65b7b74dd53324791309457faa9a35c65a2..0c54e5d12644b154cd261f5869523001e67811b7 100644 (file)
@@ -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..