[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22992] branches/blender2.5/blender: == SCons ==
Nathan Letwory
jesterking at letwory.net
Fri Sep 4 14:56:30 CEST 2009
Revision: 22992
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22992
Author: jesterking
Date: 2009-09-04 14:56:30 +0200 (Fri, 04 Sep 2009)
Log Message:
-----------
== SCons ==
* further cleaning of 'player' stuff. Now only 3 libs are remaining, of which ideally the stubs lib will be fixed at some point, fading away into the dark history of not-so-nice code. The current blenderplayer part is still a little bit hackish, I'll see if I can find a better alternative, for now it works good enough.
Modified Paths:
--------------
branches/blender2.5/blender/SConstruct
branches/blender2.5/blender/extern/ffmpeg/SConscript
branches/blender2.5/blender/extern/libmp3lame/SConscript
branches/blender2.5/blender/extern/libredcode/SConscript
branches/blender2.5/blender/extern/x264/SConscript
branches/blender2.5/blender/extern/xvidcore/SConscript
branches/blender2.5/blender/intern/guardedalloc/SConscript
branches/blender2.5/blender/intern/memutil/SConscript
branches/blender2.5/blender/source/blender/blenkernel/SConscript
branches/blender2.5/blender/source/blender/blenlib/SConscript
branches/blender2.5/blender/source/blender/blenloader/SConscript
branches/blender2.5/blender/source/blender/gpu/SConscript
branches/blender2.5/blender/source/blender/imbuf/intern/openexr/SConscript
branches/blender2.5/blender/source/blender/makesdna/SConscript
branches/blender2.5/blender/source/blender/python/SConscript
branches/blender2.5/blender/source/blender/readblenfile/SConscript
branches/blender2.5/blender/source/gameengine/BlenderRoutines/SConscript
branches/blender2.5/blender/source/gameengine/Converter/SConscript
branches/blender2.5/blender/source/gameengine/Expressions/SConscript
branches/blender2.5/blender/source/gameengine/GameLogic/SConscript
branches/blender2.5/blender/source/gameengine/Ketsji/KXNetwork/SConscript
branches/blender2.5/blender/source/gameengine/Ketsji/SConscript
branches/blender2.5/blender/source/gameengine/Network/LoopBackNetwork/SConscript
branches/blender2.5/blender/source/gameengine/Network/SConscript
branches/blender2.5/blender/source/gameengine/Physics/Bullet/SConscript
branches/blender2.5/blender/source/gameengine/Physics/Dummy/SConscript
branches/blender2.5/blender/source/gameengine/Physics/common/SConscript
branches/blender2.5/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
branches/blender2.5/blender/source/gameengine/Rasterizer/SConscript
branches/blender2.5/blender/source/gameengine/SceneGraph/SConscript
branches/blender2.5/blender/source/gameengine/VideoTexture/SConscript
branches/blender2.5/blender/source/icons/SConscript
branches/blender2.5/blender/source/kernel/SConscript
Modified: branches/blender2.5/blender/SConstruct
===================================================================
--- branches/blender2.5/blender/SConstruct 2009-09-04 11:19:12 UTC (rev 22991)
+++ branches/blender2.5/blender/SConstruct 2009-09-04 12:56:30 UTC (rev 22992)
@@ -404,7 +404,7 @@
env.BlenderProg(B.root_build_dir, "blender", dobj + mainlist, [], thestatlibs + thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender')
if env['WITH_BF_PLAYER']:
playerlist = B.create_blender_liblist(env, 'player')
- playerlist = playerlist[0:2] + [playerlist[3]] + mainlist[2:] + [playerlist[29]]
+ playerlist = [mainlist[0]] + playerlist[0:2] + mainlist[2:] + [playerlist[2]]
env.BlenderProg(B.root_build_dir, "blenderplayer", dobj + playerlist, [], thestatlibs + thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blenderplayer')
##### Now define some targets
Modified: branches/blender2.5/blender/extern/ffmpeg/SConscript
===================================================================
--- branches/blender2.5/blender/extern/ffmpeg/SConscript 2009-09-04 11:19:12 UTC (rev 22991)
+++ branches/blender2.5/blender/extern/ffmpeg/SConscript 2009-09-04 12:56:30 UTC (rev 22992)
@@ -182,6 +182,6 @@
ff_env.BlenderLib (libname="extern_" + lib, sources=sources,
includes=["."] + all_libs + extra_includes,
defines=Split(defs),
- libtype=['core', 'intern', 'player'],
- priority = [5, 5, 200],
+ libtype=['core', 'intern'],
+ priority = [5, 5],
compileflags = Split(cflags))
Modified: branches/blender2.5/blender/extern/libmp3lame/SConscript
===================================================================
--- branches/blender2.5/blender/extern/libmp3lame/SConscript 2009-09-04 11:19:12 UTC (rev 22991)
+++ branches/blender2.5/blender/extern/libmp3lame/SConscript 2009-09-04 12:56:30 UTC (rev 22992)
@@ -89,6 +89,6 @@
includes=[".", "${SOURCE.dir}"],
defines=["HAVE_INTTYPES_H", "STDC_HEADERS",
"ieee754_float32_t=float", "BRHIST"],
- libtype=['core', 'intern', 'player'],
- priority = [10, 10, 300],
+ libtype=['core', 'intern'],
+ priority = [10, 10],
compileflags = [])
Modified: branches/blender2.5/blender/extern/libredcode/SConscript
===================================================================
--- branches/blender2.5/blender/extern/libredcode/SConscript 2009-09-04 11:19:12 UTC (rev 22991)
+++ branches/blender2.5/blender/extern/libredcode/SConscript 2009-09-04 12:56:30 UTC (rev 22992)
@@ -12,5 +12,5 @@
env.BlenderLib ( libname='extern_redcode',
sources=sources, includes=Split(incs),
defines=[],
- libtype=['core','intern','player'],
- priority=[5, 5, 200], compileflags = [])
+ libtype=['core','intern'],
+ priority=[5, 5], compileflags = [])
Modified: branches/blender2.5/blender/extern/x264/SConscript
===================================================================
--- branches/blender2.5/blender/extern/x264/SConscript 2009-09-04 11:19:12 UTC (rev 22991)
+++ branches/blender2.5/blender/extern/x264/SConscript 2009-09-04 12:56:30 UTC (rev 22992)
@@ -147,6 +147,6 @@
x264_env.BlenderLib (libname="extern_x264", sources=sources,
includes=["."],
defines=Split(defs),
- libtype=['core', 'intern', 'player'],
- priority = [10, 10, 300],
+ libtype=['core', 'intern'],
+ priority = [10, 10],
compileflags = Split(cflags))
Modified: branches/blender2.5/blender/extern/xvidcore/SConscript
===================================================================
--- branches/blender2.5/blender/extern/xvidcore/SConscript 2009-09-04 11:19:12 UTC (rev 22991)
+++ branches/blender2.5/blender/extern/xvidcore/SConscript 2009-09-04 12:56:30 UTC (rev 22992)
@@ -132,6 +132,6 @@
xvidcore_env.BlenderLib (libname="extern_xvidcore", sources=Split(sources),
includes=["."],
defines=Split(defs),
- libtype=['core', 'intern', 'player'],
- priority = [10, 10, 300],
+ libtype=['core', 'intern'],
+ priority = [10, 10],
compileflags = Split(cflags))
Modified: branches/blender2.5/blender/intern/guardedalloc/SConscript
===================================================================
--- branches/blender2.5/blender/intern/guardedalloc/SConscript 2009-09-04 11:19:12 UTC (rev 22991)
+++ branches/blender2.5/blender/intern/guardedalloc/SConscript 2009-09-04 12:56:30 UTC (rev 22992)
@@ -5,4 +5,4 @@
sources = env.Glob('intern/*.c')
incs = '.'
-env.BlenderLib ('bf_guardedalloc', sources, Split(incs), defines=[], libtype=['intern', 'player'], priority = [5, 130] )
+env.BlenderLib ('bf_guardedalloc', sources, Split(incs), defines=[], libtype=['intern'], priority = [5] )
Modified: branches/blender2.5/blender/intern/memutil/SConscript
===================================================================
--- branches/blender2.5/blender/intern/memutil/SConscript 2009-09-04 11:19:12 UTC (rev 22991)
+++ branches/blender2.5/blender/intern/memutil/SConscript 2009-09-04 12:56:30 UTC (rev 22992)
@@ -5,4 +5,4 @@
incs = '. ..'
-env.BlenderLib ('bf_memutil', sources, Split(incs), [], libtype=['intern', 'player'], priority = [0, 135] )
+env.BlenderLib ('bf_memutil', sources, Split(incs), [], libtype=['intern'], priority = [0] )
Modified: branches/blender2.5/blender/source/blender/blenkernel/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/SConscript 2009-09-04 11:19:12 UTC (rev 22991)
+++ branches/blender2.5/blender/source/blender/blenkernel/SConscript 2009-09-04 12:56:30 UTC (rev 22992)
@@ -65,4 +65,4 @@
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
incs += ' ' + env['BF_PTHREADS_INC']
-env.BlenderLib ( libname = 'bf_blenkernel', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [165,137] )
+env.BlenderLib ( libname = 'bf_blenkernel', sources = sources, includes = Split(incs), defines = defs, libtype=['core'], priority = [165] )
Modified: branches/blender2.5/blender/source/blender/blenlib/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/blenlib/SConscript 2009-09-04 11:19:12 UTC (rev 22991)
+++ branches/blender2.5/blender/source/blender/blenlib/SConscript 2009-09-04 12:56:30 UTC (rev 22992)
@@ -16,4 +16,4 @@
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
incs += ' ' + env['BF_PTHREADS_INC']
-env.BlenderLib ( 'bf_blenlib', sources, Split(incs), Split(defs), libtype=['core','player'], priority = [180,120], compileflags =cflags )
+env.BlenderLib ( 'bf_blenlib', sources, Split(incs), Split(defs), libtype=['core'], priority = [180], compileflags =cflags )
Modified: branches/blender2.5/blender/source/blender/blenloader/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/blenloader/SConscript 2009-09-04 11:19:12 UTC (rev 22991)
+++ branches/blender2.5/blender/source/blender/blenloader/SConscript 2009-09-04 12:56:30 UTC (rev 22992)
@@ -11,4 +11,4 @@
defs = []
-env.BlenderLib ( 'bf_blenloader', sources, Split(incs), defs, libtype=['core','player'], priority = [135, 20] )
+env.BlenderLib ( 'bf_blenloader', sources, Split(incs), defs, libtype=['core'], priority = [135] )
Modified: branches/blender2.5/blender/source/blender/gpu/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/gpu/SConscript 2009-09-04 11:19:12 UTC (rev 22991)
+++ branches/blender2.5/blender/source/blender/gpu/SConscript 2009-09-04 12:56:30 UTC (rev 22992)
@@ -8,4 +8,4 @@
incs += ' ' + env['BF_OPENGL_INC']
-env.BlenderLib ( 'bf_gpu', sources, Split(incs), [], libtype=['core', 'player'], priority=[160, 35] )
+env.BlenderLib ( 'bf_gpu', sources, Split(incs), [], libtype=['core'], priority=[160] )
Modified: branches/blender2.5/blender/source/blender/imbuf/intern/openexr/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/imbuf/intern/openexr/SConscript 2009-09-04 11:19:12 UTC (rev 22991)
+++ branches/blender2.5/blender/source/blender/imbuf/intern/openexr/SConscript 2009-09-04 12:56:30 UTC (rev 22992)
@@ -15,4 +15,4 @@
defs = ['WITH_OPENEXR']
-env.BlenderLib ('bf_openexr', source_files, incs, defs, libtype=['core','player'], priority = [225, 85])
+env.BlenderLib ('bf_openexr', source_files, incs, defs, libtype=['core'], priority = [225])
Modified: branches/blender2.5/blender/source/blender/makesdna/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/makesdna/SConscript 2009-09-04 11:19:12 UTC (rev 22991)
+++ branches/blender2.5/blender/source/blender/makesdna/SConscript 2009-09-04 12:56:30 UTC (rev 22992)
@@ -8,4 +8,4 @@
incs = '#/intern/guardedalloc .'
-env.BlenderLib ( 'bf_dna', objs, Split(incs), [], libtype=['core','player'], priority = [215, 140] )
+env.BlenderLib ( 'bf_dna', objs, Split(incs), [], libtype=['core'], priority = [215] )
Modified: branches/blender2.5/blender/source/blender/python/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/python/SConscript 2009-09-04 11:19:12 UTC (rev 22991)
+++ branches/blender2.5/blender/source/blender/python/SConscript 2009-09-04 12:56:30 UTC (rev 22992)
@@ -13,9 +13,9 @@
if env['OURPLATFORM'] in ('win32-mingw', 'win32-vc','win64-vc') and env['BF_DEBUG']:
defs.append('_DEBUG')
-env.BlenderLib( libname = 'bf_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core','player'], priority = [140,10])
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list