From 45c1f23f19169a4bc2640db3fd2d7b67386609dc Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Fri, 27 Oct 2006 09:01:42 +0000 Subject: [PATCH] Apply patch #5127 by Joseph Eagar (joeedh) * This addresses the long command-line problem when building with SCons/MingW on windows through a dosbox (cmd.exe). My test buildpath was: C:\Documents and Settings\nathan\My Documents\blender\build\win32-mingw Should be rather long enough, don't you think? /Nathan --- extern/bullet/SConscript | 8 +++++++- source/blender/src/SConscript | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/extern/bullet/SConscript b/extern/bullet/SConscript index 5e1d107eabc..594690657e1 100644 --- a/extern/bullet/SConscript +++ b/extern/bullet/SConscript @@ -31,4 +31,10 @@ sources += env.Glob("BulletDynamics/Dynamics/*.cpp") incs = '. Bullet BulletDynamics LinearMath' -env.BlenderLib ( libname = 'extern_bullet', sources=sources, includes=Split(incs), defines=Split(defs), libtype=['game2', 'player'], priority=[20, 170], compileflags=cflags ) +if env['OURPLATFORM'] == 'win32-mingw': + s1 = sources[:len(sources)/2] + s2 = sources[len(sources)/2:len(sources)] + env.BlenderLib ( libname = 'extern_bullet1', sources=s1, includes=Split(incs), defines=Split(defs), libtype=['game2', 'player'], priority=[21, 170], compileflags=cflags ) + env.BlenderLib ( libname = 'extern_bullet2', sources=s2, includes=Split(incs), defines=Split(defs), libtype=['game2', 'player'], priority=[20, 170], compileflags=cflags ) +else: + env.BlenderLib ( libname = 'extern_bullet', sources=sources, includes=Split(incs), defines=Split(defs), libtype=['game2', 'player'], priority=[20, 170], compileflags=cflags ) diff --git a/source/blender/src/SConscript b/source/blender/src/SConscript index 2e0f632ca85..37522eb171c 100644 --- a/source/blender/src/SConscript +++ b/source/blender/src/SConscript @@ -47,4 +47,10 @@ if env['WITH_BF_VERSE']: if env['BF_BUILDINFO'] == 1: defs.append('NAN_BUILDINFO') -env.BlenderLib ( libname = 'src', sources = sources, includes = Split(incs), defines = defs, libtype=['core', 'intern'], priority = [5, 25] ) +if env['OURPLATFORM'] == 'win32-mingw': + s1 = sources[:len(sources)/2] + s2 = sources[len(sources)/2:len(sources)] + env.BlenderLib ( libname = 'src1', sources = s1, includes = Split(incs), defines = defs, libtype=['core', 'intern'], priority = [5, 25] ) + env.BlenderLib ( libname = 'src2', sources = s2, includes = Split(incs), defines = defs, libtype=['core', 'intern'], priority = [6, 26] ) +else: + env.BlenderLib ( libname = 'src', sources = sources, includes = Split(incs), defines = defs, libtype=['core', 'intern'], priority = [5, 25] )