griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

* 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.

Browse Source
This commit is contained in:
Nathan Letwory
2006-11-14 05:47:52 +00:00
parent 0597e17710
commit 5a609daa75
2 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
extern/bullet/SConscript vendored
View File

@@ -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 )

8
source/blender/src/SConscript
View File

@@ -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] )