archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Apply patch #5127 by Joseph Eagar (joeedh)

Browse Source 
* 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
This commit is contained in:
Nathan Letwory
2006-10-27 09:01:42 +00:00
parent a782b2179b
commit 45c1f23f19
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
extern/bullet/SConscript vendored
View File

@@ -31,4 +31,10 @@ sources += env.Glob("BulletDynamics/Dynamics/*.cpp")
incs = '. Bullet BulletDynamics LinearMath' 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 )

8
source/blender/src/SConscript
View File

@@ -47,4 +47,10 @@ if env['WITH_BF_VERSE']:
if env['BF_BUILDINFO'] == 1: if env['BF_BUILDINFO'] == 1:
defs.append('NAN_BUILDINFO') 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] )