[Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23493] trunk/blender: Fixing up Makefiles , its not fully working but its closer...

[Kent Mein]

In reply to Diego B (bdiego at gmail.com):

> Hi Kent:
> 
> The problem is in itasc/Makefile, kdl/Makefile and utilities/Makefile,
> all have the same lib name, I want to do some change but I don't know
> if you are already working on this.

Go ahead.  I just didn't have time to finish it today.  You should be
able to look at the other Makefiles in intern as examples of how to do
it.  The old SoundSystem stuff is probably the best example for
how this is setup to look at if your looking for how to do it.  Note
if you add extra .a's then you need to add them to:
blender/source/Makefile

Kent
> 
> have you changes to commit ? can I go ahead and change this ?
> 
> On Fri, Sep 25, 2009 at 3:47 PM, Kent Mein <mein at cs.umn.edu> wrote:
> > Revision: 23493
> >          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23493
> > Author:   sirdude
> > Date:     2009-09-25 20:47:43 +0200 (Fri, 25 Sep 2009)
> >
> > Log Message:
> > -----------
> > Fixing up Makefiles, its not fully working but its closer...
> >
> > Kent
> >
> > Modified Paths:
> > --------------
> >    trunk/blender/intern/itasc/Makefile
> >    trunk/blender/intern/itasc/kdl/Makefile
> >    trunk/blender/intern/itasc/kdl/utilities/Makefile
> >    trunk/blender/source/Makefile
> >    trunk/blender/source/blender/ikplugin/intern/Makefile
> >
> > Modified: trunk/blender/intern/itasc/Makefile
> > ===================================================================
> > --- trunk/blender/intern/itasc/Makefile 2009-09-25 16:57:30 UTC (rev 23492)
> > +++ trunk/blender/intern/itasc/Makefile 2009-09-25 18:47:43 UTC (rev 23493)
> > @@ -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 @@
> >        ranlib $(NAN_ITASC)/lib/debug/libitasc.a
> >  endif
> >  ##############################
> > -DIRS = kdl
> > -SOURCEDIR = intern/$(LIBNAME)
> >  include nan_subdirs.mk
> >
> > Modified: trunk/blender/intern/itasc/kdl/Makefile
> > ===================================================================
> > --- trunk/blender/intern/itasc/kdl/Makefile     2009-09-25 16:57:30 UTC (rev 23492)
> > +++ trunk/blender/intern/itasc/kdl/Makefile     2009-09-25 18:47:43 UTC (rev 23493)
> > @@ -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
> >
> > Modified: trunk/blender/intern/itasc/kdl/utilities/Makefile
> > ===================================================================
> > --- trunk/blender/intern/itasc/kdl/utilities/Makefile   2009-09-25 16:57:30 UTC (rev 23492)
> > +++ trunk/blender/intern/itasc/kdl/utilities/Makefile   2009-09-25 18:47:43 UTC (rev 23493)
> > @@ -28,6 +28,8 @@
> >  # iksolver main makefile.
> >  #
> >
> > +include nan_definitions.mk
> > +
> >  LIBNAME = itasc
> >  DIR = $(OCGDIR)/intern/$(LIBNAME)
> >
> >
> > Modified: trunk/blender/source/Makefile
> > ===================================================================
> > --- trunk/blender/source/Makefile       2009-09-25 16:57:30 UTC (rev 23492)
> > +++ trunk/blender/source/Makefile       2009-09-25 18:47:43 UTC (rev 23493)
> > @@ -98,7 +98,9 @@
> >  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
> >
> > Modified: trunk/blender/source/blender/ikplugin/intern/Makefile
> > ===================================================================
> > --- trunk/blender/source/blender/ikplugin/intern/Makefile       2009-09-25 16:57:30 UTC (rev 23492)
> > +++ trunk/blender/source/blender/ikplugin/intern/Makefile       2009-09-25 18:47:43 UTC (rev 23493)
> > @@ -36,8 +36,8 @@
> >  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../../blenkernel
> >  CPPFLAGS += -I../../blenlib
> >  CPPFLAGS += -I../../include
> > +CPPFLAGS += -I../../../../intern/itasc
> > +CPPFLAGS += -I../../../../extern/Eigen2
> >  CPPFLAGS += -I..
> >
> >
> > _______________________________________________
> > Bf-blender-cvs mailing list
> > Bf-blender-cvs at blender.org
> > http://lists.blender.org/mailman/listinfo/bf-blender-cvs
> >
> _______________________________________________
> Bf-committers mailing list
> Bf-committers at blender.org
> http://lists.blender.org/mailman/listinfo/bf-committers

-- 
mein at cs.umn.edu
http://www.cs.umn.edu/~mein