scons + gcc linking fix for bullet softbodies:
authorJoshua Leung <aligorith@gmail.com>
Mon, 30 Nov 2009 02:28:50 +0000 (02:28 +0000)
committerJoshua Leung <aligorith@gmail.com>
Mon, 30 Nov 2009 02:28:50 +0000 (02:28 +0000)
Upped the priority for the softbody module so that gcc linkers (mingw, linux-gcc) would be able to resolve the dependencies. MSVC still worked though.

extern/bullet2/src/SConscript

index c0ee56045d815c043f189f1d6fab2bf2af4d640d..5cb9185d6a1903b15fd13ba0a8e8129fe6bd8b5b 100644 (file)
@@ -42,4 +42,4 @@ env.BlenderLib ( libname = 'extern_bullet2collision_dispatch', sources=collision
 env.BlenderLib ( libname = 'extern_bullet2collision_gimpact', sources=collision_gimpact_src, includes=Split(incs), defines=Split(defs), libtype=['extern','player'], priority=[20,138], compileflags=cflags )
 env.BlenderLib ( libname = 'extern_bullet2collision_shapes', sources=collision_shapes_src, includes=Split(incs), defines=Split(defs), libtype=['extern','player'], priority=[20,138], compileflags=cflags )
 env.BlenderLib ( libname = 'extern_bullet2collision_narrowphase', sources=collision_narrowphase_src, includes=Split(incs), defines=Split(defs), libtype=['extern','player'], priority=[20,138], compileflags=cflags )
-env.BlenderLib ( libname = 'extern_bullet2softbody', sources=softbody_src, includes=Split(incs), defines=Split(defs), libtype=['extern','player'], priority=[18,135], compileflags=cflags )
+env.BlenderLib ( libname = 'extern_bullet2softbody', sources=softbody_src, includes=Split(incs), defines=Split(defs), libtype=['extern','player'], priority=[30,135], compileflags=cflags )