From ba97d47df429509594be87429b734ec2c0c76012 Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Sun, 5 Feb 2006 20:38:40 +0000 Subject: [PATCH] ==SCons== * Changing linking order of a few libs, hopefully it solves a unresolved issue. --- intern/container/SConscript | 2 +- intern/guardedalloc/SConscript | 2 +- intern/memutil/SConscript | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/intern/container/SConscript b/intern/container/SConscript index c58cf72ff89..d05104da562 100644 --- a/intern/container/SConscript +++ b/intern/container/SConscript @@ -4,4 +4,4 @@ Import ('env') sources = env.Glob('intern/*.cpp') incs = '.' -env.BlenderLib ('blender_CTR', sources, Split(incs) , [], libtype='intern', priority = 5 ) +env.BlenderLib ('blender_CTR', sources, Split(incs) , [], libtype='intern', priority = 10 ) diff --git a/intern/guardedalloc/SConscript b/intern/guardedalloc/SConscript index 519dbe8eedf..62688394361 100644 --- a/intern/guardedalloc/SConscript +++ b/intern/guardedalloc/SConscript @@ -5,4 +5,4 @@ Import('env') sources = env.Glob('intern/*.c') incs = '.' -env.BlenderLib ('blender_guardedalloc', sources, Split(incs), [], libtype='intern', priority = 0 ) +env.BlenderLib ('blender_guardedalloc', sources, Split(incs), [], libtype='intern', priority = 10 ) diff --git a/intern/memutil/SConscript b/intern/memutil/SConscript index dace305e91d..0c541108434 100644 --- a/intern/memutil/SConscript +++ b/intern/memutil/SConscript @@ -5,4 +5,4 @@ sources = env.Glob('intern/*.cpp') incs = '. ..' -env.BlenderLib ('blender_MEM', sources, Split(incs), [], libtype='intern', priority = 10 ) +env.BlenderLib ('blender_MEM', sources, Split(incs), [], libtype='intern', priority = 0 )