[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22989] branches/blender2.5/blender: == SCons ==
Nathan Letwory
jesterking at letwory.net
Fri Sep 4 12:40:43 CEST 2009
Revision: 22989
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22989
Author: jesterking
Date: 2009-09-04 12:40:41 +0200 (Fri, 04 Sep 2009)
Log Message:
-----------
== SCons ==
* first working changes to get blenderplayer linking
* blenderplayer/ moved into source/ (CMakeLists.txt changed for that too)
* added externs for bprogname to gp_ghost, so that it links properly
Modified Paths:
--------------
branches/blender2.5/blender/CMakeLists.txt
branches/blender2.5/blender/SConstruct
branches/blender2.5/blender/intern/guardedalloc/SConscript
branches/blender2.5/blender/intern/memutil/SConscript
branches/blender2.5/blender/source/SConscript
branches/blender2.5/blender/source/blender/blenkernel/SConscript
branches/blender2.5/blender/source/blender/blenlib/SConscript
branches/blender2.5/blender/source/blender/blenlib/intern/util.c
branches/blender2.5/blender/source/blender/blenloader/SConscript
branches/blender2.5/blender/source/blender/blenpluginapi/SConscript
branches/blender2.5/blender/source/blender/gpu/SConscript
branches/blender2.5/blender/source/blender/imbuf/intern/cineon/SConscript
branches/blender2.5/blender/source/blender/imbuf/intern/dds/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/blenderplayer/bad_level_call_stubs/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/GamePlayer/common/SConscript
branches/blender2.5/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/blender2.5/blender/source/gameengine/GamePlayer/ghost/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/kernel/SConscript
Added Paths:
-----------
branches/blender2.5/blender/source/blenderplayer/
Removed Paths:
-------------
branches/blender2.5/blender/blenderplayer/
Modified: branches/blender2.5/blender/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/CMakeLists.txt 2009-09-04 10:22:42 UTC (rev 22988)
+++ branches/blender2.5/blender/CMakeLists.txt 2009-09-04 10:40:41 UTC (rev 22989)
@@ -574,6 +574,6 @@
#-----------------------------------------------------------------------------
# Blender Player
IF(WITH_PLAYER)
- ADD_SUBDIRECTORY(blenderplayer)
+ ADD_SUBDIRECTORY(source/blenderplayer)
ENDIF(WITH_PLAYER)
Modified: branches/blender2.5/blender/SConstruct
===================================================================
--- branches/blender2.5/blender/SConstruct 2009-09-04 10:22:42 UTC (rev 22988)
+++ branches/blender2.5/blender/SConstruct 2009-09-04 10:40:41 UTC (rev 22989)
@@ -390,7 +390,7 @@
# libraries to give as objects to linking phase
mainlist = []
for tp in B.possible_types:
- if not tp == 'player' and not tp == 'player2':
+ if not tp == 'player':
mainlist += B.create_blender_liblist(env, tp)
if B.arguments.get('BF_PRIORITYLIST', '0')=='1':
@@ -404,6 +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]]
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/intern/guardedalloc/SConscript
===================================================================
--- branches/blender2.5/blender/intern/guardedalloc/SConscript 2009-09-04 10:22:42 UTC (rev 22988)
+++ branches/blender2.5/blender/intern/guardedalloc/SConscript 2009-09-04 10:40:41 UTC (rev 22989)
@@ -5,4 +5,4 @@
sources = env.Glob('intern/*.c')
incs = '.'
-env.BlenderLib ('bf_guardedalloc', sources, Split(incs), defines=[], libtype=['intern', 'player'], priority = [5, 175] )
+env.BlenderLib ('bf_guardedalloc', sources, Split(incs), defines=[], libtype=['intern', 'player'], priority = [5, 130] )
Modified: branches/blender2.5/blender/intern/memutil/SConscript
===================================================================
--- branches/blender2.5/blender/intern/memutil/SConscript 2009-09-04 10:22:42 UTC (rev 22988)
+++ branches/blender2.5/blender/intern/memutil/SConscript 2009-09-04 10:40:41 UTC (rev 22989)
@@ -5,4 +5,4 @@
incs = '. ..'
-env.BlenderLib ('bf_memutil', sources, Split(incs), [], libtype=['intern', 'player'], priority = [0, 180] )
+env.BlenderLib ('bf_memutil', sources, Split(incs), [], libtype=['intern', 'player'], priority = [0, 135] )
Modified: branches/blender2.5/blender/source/SConscript
===================================================================
--- branches/blender2.5/blender/source/SConscript 2009-09-04 10:22:42 UTC (rev 22988)
+++ branches/blender2.5/blender/source/SConscript 2009-09-04 10:40:41 UTC (rev 22989)
@@ -6,6 +6,9 @@
'creator/SConscript'])
if env['WITH_BF_GAMEENGINE']:
SConscript (['gameengine/SConscript'])
-
+
+if env['WITH_BF_PLAYER']:
+ SConscript (['blenderplayer/bad_level_call_stubs/SConscript'])
+
if env['OURPLATFORM'] in ('win64-vc', 'win32-vc', 'win32-mingw'):
SConscript (['icons/SConscript'])
Modified: branches/blender2.5/blender/source/blender/blenkernel/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/SConscript 2009-09-04 10:22:42 UTC (rev 22988)
+++ branches/blender2.5/blender/source/blender/blenkernel/SConscript 2009-09-04 10:40:41 UTC (rev 22989)
@@ -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'], priority = [165] )
+env.BlenderLib ( libname = 'bf_blenkernel', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [165,137] )
Modified: branches/blender2.5/blender/source/blender/blenlib/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/blenlib/SConscript 2009-09-04 10:22:42 UTC (rev 22988)
+++ branches/blender2.5/blender/source/blender/blenlib/SConscript 2009-09-04 10:40:41 UTC (rev 22989)
@@ -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'], priority = [180], compileflags =cflags )
+env.BlenderLib ( 'bf_blenlib', sources, Split(incs), Split(defs), libtype=['core','player'], priority = [180,120], compileflags =cflags )
Modified: branches/blender2.5/blender/source/blender/blenlib/intern/util.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenlib/intern/util.c 2009-09-04 10:22:42 UTC (rev 22988)
+++ branches/blender2.5/blender/source/blender/blenlib/intern/util.c 2009-09-04 10:40:41 UTC (rev 22989)
@@ -54,6 +54,8 @@
#include "BKE_utildefines.h"
+
+
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
Modified: branches/blender2.5/blender/source/blender/blenloader/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/blenloader/SConscript 2009-09-04 10:22:42 UTC (rev 22988)
+++ branches/blender2.5/blender/source/blender/blenloader/SConscript 2009-09-04 10:40:41 UTC (rev 22989)
@@ -11,4 +11,4 @@
defs = []
-env.BlenderLib ( 'bf_blenloader', sources, Split(incs), defs, libtype=['core','player'], priority = [135, 30] )
+env.BlenderLib ( 'bf_blenloader', sources, Split(incs), defs, libtype=['core','player'], priority = [135, 20] )
Modified: branches/blender2.5/blender/source/blender/blenpluginapi/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/blenpluginapi/SConscript 2009-09-04 10:22:42 UTC (rev 22988)
+++ branches/blender2.5/blender/source/blender/blenpluginapi/SConscript 2009-09-04 10:40:41 UTC (rev 22989)
@@ -11,4 +11,4 @@
defs.append('WITH_QUICKTIME')
incs += ' ' + env['BF_QUICKTIME_INC']
-env.BlenderLib ( libname = 'bf_blenpluginapi', sources = sources, includes = Split(incs), defines = defs, libtype=['core', 'player'], priority = [170, 35] )
+env.BlenderLib ( libname = 'bf_blenpluginapi', sources = sources, includes = Split(incs), defines = defs, libtype=['core'], priority = [170] )
Modified: branches/blender2.5/blender/source/blender/gpu/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/gpu/SConscript 2009-09-04 10:22:42 UTC (rev 22988)
+++ branches/blender2.5/blender/source/blender/gpu/SConscript 2009-09-04 10:40:41 UTC (rev 22989)
@@ -8,4 +8,4 @@
incs += ' ' + env['BF_OPENGL_INC']
-env.BlenderLib ( 'bf_gpu', sources, Split(incs), [], libtype=['core', 'player'], priority=[160, 20] )
+env.BlenderLib ( 'bf_gpu', sources, Split(incs), [], libtype=['core', 'player'], priority=[160, 35] )
Modified: branches/blender2.5/blender/source/blender/imbuf/intern/cineon/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/imbuf/intern/cineon/SConscript 2009-09-04 10:22:42 UTC (rev 22988)
+++ branches/blender2.5/blender/source/blender/imbuf/intern/cineon/SConscript 2009-09-04 10:40:41 UTC (rev 22989)
@@ -14,4 +14,4 @@
defs = []
-env.BlenderLib ('bf_cineon', source_files, incs, defs, libtype=['core','player'], priority = [220, 75])
+env.BlenderLib ('bf_cineon', source_files, incs, defs, libtype=['core'], priority = [220])
Modified: branches/blender2.5/blender/source/blender/imbuf/intern/dds/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/imbuf/intern/dds/SConscript 2009-09-04 10:22:42 UTC (rev 22988)
+++ branches/blender2.5/blender/source/blender/imbuf/intern/dds/SConscript 2009-09-04 10:40:41 UTC (rev 22989)
@@ -16,4 +16,4 @@
defs = ['WITH_DDS']
-env.BlenderLib ('bf_dds', source_files, incs, defs, libtype=['core','player'], priority = [230, 105])
+env.BlenderLib ('bf_dds', source_files, incs, defs, libtype=['core'], priority = [230])
Modified: branches/blender2.5/blender/source/blender/makesdna/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/makesdna/SConscript 2009-09-04 10:22:42 UTC (rev 22988)
+++ branches/blender2.5/blender/source/blender/makesdna/SConscript 2009-09-04 10:40:41 UTC (rev 22989)
@@ -8,4 +8,4 @@
incs = '#/intern/guardedalloc .'
-env.BlenderLib ( 'bf_dna', objs, Split(incs), [], libtype=['core','player'], priority = [215, 215] )
+env.BlenderLib ( 'bf_dna', objs, Split(incs), [], libtype=['core','player'], priority = [215, 140] )
Modified: branches/blender2.5/blender/source/blender/python/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/python/SConscript 2009-09-04 10:22:42 UTC (rev 22988)
+++ branches/blender2.5/blender/source/blender/python/SConscript 2009-09-04 10:40:41 UTC (rev 22989)
@@ -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'], priority = [140])
+env.BlenderLib( libname = 'bf_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core','player'], priority = [140,10])
# generic
sources = env.Glob('generic/*.c')
-env.BlenderLib( libname = 'bf_gen_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core'], priority = [361]) # ketsji is 360
+env.BlenderLib( libname = 'bf_gen_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core','player'], priority = [361,85]) # ketsji is 360
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list