From 5a609daa7575dd3bda39d07d7704e7dcfd3e7ef4 Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Tue, 14 Nov 2006 05:47:52 +0000 Subject: [PATCH] * undo commit from 27th of October. Fixing the long-paths issue worked only on a number of boxes, so from now on the BF_BUILDDIR=c:\b -way is the only way to properly get Blender built with scons/mingw. --- extern/bullet/SConscript | 8 +------- source/blender/src/SConscript | 8 +------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/extern/bullet/SConscript b/extern/bullet/SConscript index 594690657e1..5e1d107eabc 100644 --- a/extern/bullet/SConscript +++ b/extern/bullet/SConscript @@ -31,10 +31,4 @@ sources += env.Glob("BulletDynamics/Dynamics/*.cpp") incs = '. Bullet BulletDynamics LinearMath' -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 ) +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 a90f36e1974..8ff1de1b751 100644 --- a/source/blender/src/SConscript +++ b/source/blender/src/SConscript @@ -51,10 +51,4 @@ if env['WITH_BF_VERSE']: if env['BF_BUILDINFO'] == 1: defs.append('NAN_BUILDINFO') -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] ) +env.BlenderLib ( libname = 'src', sources = sources, includes = Split(incs), defines = defs, libtype=['core', 'intern'], priority = [5, 25] )