Revision: 25625 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25625 Author: sirdude Date: 2009-12-30 17:18:06 +0100 (Wed, 30 Dec 2009)
Log Message: ----------- Fix for poor negliected Makefiles. Kent Modified Paths: -------------- trunk/blender/intern/opennl/superlu/get_perm_c.c trunk/blender/intern/opennl/superlu/sgstrf.c trunk/blender/source/Makefile trunk/blender/source/blender/editors/object/Makefile trunk/blender/source/nan_link.mk Modified: trunk/blender/intern/opennl/superlu/get_perm_c.c =================================================================== --- trunk/blender/intern/opennl/superlu/get_perm_c.c 2009-12-30 15:58:59 UTC (rev 25624) +++ trunk/blender/intern/opennl/superlu/get_perm_c.c 2009-12-30 16:18:06 UTC (rev 25625) @@ -439,8 +439,6 @@ /* Transform perm_c into 0-based indexing. */ for (i = 0; i < n; ++i) --perm_c[i]; - SUPERLU_FREE(b_colptr); - SUPERLU_FREE(b_rowind); SUPERLU_FREE(invp); SUPERLU_FREE(dhead); SUPERLU_FREE(qsize); @@ -453,5 +451,6 @@ } else { /* Empty adjacency structure */ for (i = 0; i < n; ++i) perm_c[i] = i; } - + SUPERLU_FREE(b_colptr); + SUPERLU_FREE(b_rowind); } Modified: trunk/blender/intern/opennl/superlu/sgstrf.c =================================================================== --- trunk/blender/intern/opennl/superlu/sgstrf.c 2009-12-30 15:58:59 UTC (rev 25624) +++ trunk/blender/intern/opennl/superlu/sgstrf.c 2009-12-30 16:18:06 UTC (rev 25625) @@ -231,7 +231,10 @@ /* Allocate storage common to the factor routines */ *info = sLUMemInit(fact, work, lwork, m, n, Astore->nnz, panel_size, L, U, &Glu, &iwork, &swork); - if ( *info ) return; + if ( *info ) { + if ( *iwork) SUPERLU_FREE (iwork); + return; + } xsup = Glu.xsup; supno = Glu.supno; Modified: trunk/blender/source/Makefile =================================================================== --- trunk/blender/source/Makefile 2009-12-30 15:58:59 UTC (rev 25624) +++ trunk/blender/source/Makefile 2009-12-30 16:18:06 UTC (rev 25625) @@ -196,8 +196,6 @@ ifeq ($(WITH_OPENJPEG), true) ifndef BF_OPENJPEG_LIBS COMLIB += $(OCGDIR)/extern/openjpeg/$(DEBUG_DIR)libopenjpeg.a - else - COMLIB += $(BF_OPENJPEG_LIBS) endif endif Modified: trunk/blender/source/blender/editors/object/Makefile =================================================================== --- trunk/blender/source/blender/editors/object/Makefile 2009-12-30 15:58:59 UTC (rev 25624) +++ trunk/blender/source/blender/editors/object/Makefile 2009-12-30 16:18:06 UTC (rev 25625) @@ -48,6 +48,8 @@ CPPFLAGS += -I../../python CPPFLAGS += -I../../imbuf CPPFLAGS += -I../../ikplugin +CPPFLAGS += -I../../gpu +CPPFLAGS += -I../../render/extern/include # own include Modified: trunk/blender/source/nan_link.mk =================================================================== --- trunk/blender/source/nan_link.mk 2009-12-30 15:58:59 UTC (rev 25624) +++ trunk/blender/source/nan_link.mk 2009-12-30 16:18:06 UTC (rev 25625) @@ -177,4 +177,10 @@ LLIBS += $(BF_FFTW3_LIBS) endif +ifeq ($(WITH_OPENJPEG),true) + ifneq (x$(BF_OPENJPEG_LIBS), x) + LLIBS += $(BF_OPENJPEG_LIBS) + endif +endif + LLIBS += $(NAN_PYTHON_LIB) _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs