griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Add directives to support multi dir lib.

Browse Source
This commit is contained in:
Guillermo S. Romero
2009-09-25 22:38:15 +00:00
parent 72c4c9da7a
commit da5ff2ca98
4 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
intern/itasc/Makefile
View File

@@ -40,15 +40,14 @@ include nan_compile.mk
CPPFLAGS += -I.
CPPFLAGS += -I../../extern/Eigen2
install: all debug
install: $(ALL_OR_DEBUG)
@[ -d $(NAN_ITASC) ] || mkdir $(NAN_ITASC)
@[ -d $(NAN_ITASC)/lib ] || mkdir $(NAN_ITASC)/lib
@[ -d $(NAN_ITASC)/lib/debug ] || mkdir $(NAN_ITASC)/lib/debug
@../tools/cpifdiff.sh $(DIR)/libitasc.a $(NAN_ITASC)/lib/
@../tools/cpifdiff.sh $(DIR)/debug/libitasc.a $(NAN_ITASC)/lib/debug/
@[ -d $(NAN_ITASC)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_ITASC)/lib/$(DEBUG_DIR)
@../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libitasc.a $(DIR)/$(DEBUG_DIR)libitasc_kdl.a $(DIR)/$(DEBUG_DIR)libitasc_kdl_util.a $(NAN_ITASC)/lib/$(DEBUG_DIR)
ifeq ($(OS),darwin)
ranlib $(NAN_ITASC)/lib/libitasc.a
ranlib $(NAN_ITASC)/lib/debug/libitasc.a
ranlib $(NAN_ITASC)/lib/$(DEBUG_DIR)libitasc.a
ranlib $(NAN_ITASC)/lib/$(DEBUG_DIR)libitasc_kdl.a
ranlib $(NAN_ITASC)/lib/$(DEBUG_DIR)libitasc_kdl_util.a
endif
##############################
include nan_subdirs.mk

5
intern/itasc/kdl/Makefile
View File

@@ -30,8 +30,9 @@
include nan_definitions.mk
LIBNAME = itasc
DIR = $(OCGDIR)/intern/$(LIBNAME)
LIBNAME = itasc_kdl
# Yep, same dir than parent (itasc instead of $(LIBNAME))
DIR = $(OCGDIR)/intern/itasc
DIRS = utilities
SOURCEDIR = intern/$(LIBNAME)/kdl

5
intern/itasc/kdl/utilities/Makefile
View File

@@ -30,8 +30,9 @@
include nan_definitions.mk
LIBNAME = itasc
DIR = $(OCGDIR)/intern/$(LIBNAME)
LIBNAME = itasc_kdl_util
# Same dir than parent (itasc instead of $(LIBNAME))
DIR = $(OCGDIR)/intern/itasc
include nan_compile.mk

2
source/Makefile
View File

@@ -101,6 +101,8 @@ 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_ITASC)/lib/$(DEBUG_DIR)libitasc_kdl.a
COMLIB += $(NAN_ITASC)/lib/$(DEBUG_DIR)libitasc_kdl_util.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