From 4d9252640139401be5a67fc2d267176be95eaca8 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 26 Feb 2009 12:43:24 +0000 Subject: build blenderplayer without opennl and decimation --- intern/opennl/SConscript | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'intern/opennl') diff --git a/intern/opennl/SConscript b/intern/opennl/SConscript index e46cefbff58..f68810d2f16 100644 --- a/intern/opennl/SConscript +++ b/intern/opennl/SConscript @@ -6,7 +6,7 @@ sources = env.Glob('intern/*.c') + env.Glob('superlu/*.c') incs = 'extern superlu' if (env['OURPLATFORM'] == 'win32-mingw'): - env.BlenderLib ('blender_ONL', sources, Split(incs), [], libtype=['core','intern','player'], priority=[1,80,22] ) + env.BlenderLib ('blender_ONL', sources, Split(incs), [], libtype=['core','intern'], priority=[1,80] ) else: - env.BlenderLib ('blender_ONL', sources, Split(incs), [], libtype=['core','player'], priority=[55,22] ) + env.BlenderLib ('blender_ONL', sources, Split(incs), [], libtype=['core'], priority=[55] ) -- cgit v1.2.3 From 28f6d223d079b1e5cb67e3fc22fb7f818deb8dcb Mon Sep 17 00:00:00 2001 From: Kent Mein Date: Mon, 16 Mar 2009 17:02:19 +0000 Subject: This is patch: [#17974] two small fix for blender 2.48 (memory leak and uninitalized vars) Submitted By: Pavel Nemec (nemecp) (changes delete to [] and sets to vars to NULL) Kent --- intern/opennl/superlu/get_perm_c.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'intern/opennl') diff --git a/intern/opennl/superlu/get_perm_c.c b/intern/opennl/superlu/get_perm_c.c index e255b4a76bd..4c0ee95c4c6 100644 --- a/intern/opennl/superlu/get_perm_c.c +++ b/intern/opennl/superlu/get_perm_c.c @@ -366,6 +366,10 @@ get_perm_c(int ispec, SuperMatrix *A, int *perm_c) int *b_rowind, *dhead, *qsize, *llist, *marker; double t, SuperLU_timer_(); + /* make gcc happy */ + b_rowind=NULL; + b_colptr=NULL; + m = A->nrow; n = A->ncol; -- cgit v1.2.3