diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2006-02-08 00:24:36 +0300 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2006-02-08 00:24:36 +0300 |
| commit | ef1b7a5735fea454f88f9d18cf9034279f8fb0b6 (patch) | |
| tree | 8606ed6ca4eeee76c1cd1840c06fcaf09519f311 /extern | |
| parent | b11c92c66e437166197fed77be698392f941b3a5 (diff) | |
==SCons==
+ 'scons blenderplayer' builds blender AND blenderplayer now (tested on Linux
only, but was only linking issue, so should work on other platforms too).
NOTE: I noticed some compileflags for GE specific libs that were left out -
I re-enabled them in the SConscripts, but I'm going to do a test build my-
self now, so if there are problems with them on win32, I probably already
know about them :)
Diffstat (limited to 'extern')
| -rw-r--r-- | extern/bFTGL/SConscript | 2 | ||||
| -rw-r--r-- | extern/bullet/SConscript | 2 | ||||
| -rw-r--r-- | extern/qhull/SConscript | 2 | ||||
| -rw-r--r-- | extern/solid/SConscript | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/extern/bFTGL/SConscript b/extern/bFTGL/SConscript index a201cbae125..28364193bf9 100644 --- a/extern/bFTGL/SConscript +++ b/extern/bFTGL/SConscript @@ -27,4 +27,4 @@ defs = '' sources = env.Glob('src/*.cpp') -env.BlenderLib ( 'extern_ftgl', sources, Split(incs), Split(defs), libtype='international', priority=5) +env.BlenderLib ( 'extern_ftgl', sources, Split(incs), Split(defs), libtype=['international','player'], priority=[5, 210]) diff --git a/extern/bullet/SConscript b/extern/bullet/SConscript index 7441ab29b24..70fb59334fe 100644 --- a/extern/bullet/SConscript +++ b/extern/bullet/SConscript @@ -103,4 +103,4 @@ sources = [ 'Bullet/BroadphaseCollision/BroadphaseProxy.cpp', incs = '. Bullet BulletDynamics LinearMath' -env.BlenderLib ( libname = 'extern_bullet', sources=sources, includes=Split(incs), defines=Split(defs), libtype='game2', priority=20, 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/extern/qhull/SConscript b/extern/qhull/SConscript index 2d767cfc58d..6b21d3694e0 100644 --- a/extern/qhull/SConscript +++ b/extern/qhull/SConscript @@ -32,4 +32,4 @@ sources = ['src/geom.c', incs = 'include src' -env.BlenderLib ( 'extern_qhull', sources, Split(incs), Split(defs), libtype='game2', priority=50, compileflags = cflags) +env.BlenderLib ( 'extern_qhull', sources, Split(incs), Split(defs), libtype=['game2','player'], priority=[50, 85], compileflags = cflags) diff --git a/extern/solid/SConscript b/extern/solid/SConscript index 673a9951ea4..00970f455e4 100644 --- a/extern/solid/SConscript +++ b/extern/solid/SConscript @@ -31,4 +31,4 @@ sources = env.Glob('src/*.cpp') + env.Glob('src/convex/*.cpp') + env.Glob('src/c incs = 'include src src/broad src/complex src/convex ../qhull/include' -env.BlenderLib ( libname='extern_solid', sources=sources, includes=Split(incs), defines=Split(defs), libtype='game2', priority=45 , compileflags = cflags) +env.BlenderLib ( libname='extern_solid', sources=sources, includes=Split(incs), defines=Split(defs), libtype=['game2','player'], priority=[45, 75] , compileflags = cflags) |