== SCons ==
authorNathan Letwory <nathan@letworyinteractive.com>
Fri, 4 Sep 2009 10:40:41 +0000 (10:40 +0000)
committerNathan Letwory <nathan@letworyinteractive.com>
Fri, 4 Sep 2009 10:40:41 +0000 (10:40 +0000)
* 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

40 files changed:
CMakeLists.txt
SConstruct
intern/guardedalloc/SConscript
intern/memutil/SConscript
source/SConscript
source/blender/blenkernel/SConscript
source/blender/blenlib/SConscript
source/blender/blenlib/intern/util.c
source/blender/blenloader/SConscript
source/blender/blenpluginapi/SConscript
source/blender/gpu/SConscript
source/blender/imbuf/intern/cineon/SConscript
source/blender/imbuf/intern/dds/SConscript
source/blender/makesdna/SConscript
source/blender/python/SConscript
source/blender/readblenfile/SConscript
source/blenderplayer/CMakeLists.txt [moved from blenderplayer/CMakeLists.txt with 100% similarity]
source/blenderplayer/bad_level_call_stubs/CMakeLists.txt [moved from blenderplayer/bad_level_call_stubs/CMakeLists.txt with 100% similarity]
source/blenderplayer/bad_level_call_stubs/Makefile [moved from blenderplayer/bad_level_call_stubs/Makefile with 100% similarity]
source/blenderplayer/bad_level_call_stubs/SConscript [moved from blenderplayer/bad_level_call_stubs/SConscript with 53% similarity]
source/blenderplayer/bad_level_call_stubs/stubs.c [moved from blenderplayer/bad_level_call_stubs/stubs.c with 100% similarity]
source/gameengine/BlenderRoutines/SConscript
source/gameengine/Converter/SConscript
source/gameengine/Expressions/SConscript
source/gameengine/GameLogic/SConscript
source/gameengine/GamePlayer/common/SConscript
source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
source/gameengine/GamePlayer/ghost/SConscript
source/gameengine/Ketsji/KXNetwork/SConscript
source/gameengine/Ketsji/SConscript
source/gameengine/Network/LoopBackNetwork/SConscript
source/gameengine/Network/SConscript
source/gameengine/Physics/Bullet/SConscript
source/gameengine/Physics/Dummy/SConscript
source/gameengine/Physics/common/SConscript
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
source/gameengine/Rasterizer/SConscript
source/gameengine/SceneGraph/SConscript
source/gameengine/VideoTexture/SConscript
source/kernel/SConscript

index 529d65b0dfe859381572083a8180f686daea7438..5000ecfac5c6ebef69ccdc5888e8bb0fbd22cb88 100644 (file)
@@ -574,6 +574,6 @@ ADD_SUBDIRECTORY(source/creator)
 #-----------------------------------------------------------------------------
 # Blender Player
 IF(WITH_PLAYER)
-  ADD_SUBDIRECTORY(blenderplayer)
+  ADD_SUBDIRECTORY(source/blenderplayer)
 ENDIF(WITH_PLAYER)
 
index a66587695f314b6d764d27c47e7a5dfaab2d3c77..b3291c37e1a94255c35e409fca15cef69ccbbe84 100644 (file)
@@ -390,7 +390,7 @@ SConscript(B.root_build_dir+'/source/SConscript')
 # 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 @@ if 'blender' in B.targets or not env['WITH_BF_NOBLENDER']:
        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
index 0184ddd9785edccc967880261623b4f0117ca264..a93e12bebda563f0fe0d25b94f9b57901317b853 100644 (file)
@@ -5,4 +5,4 @@ Import('env')
 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] )
index 4528de814f3ac11392f49768f5d2d6e290e0b9ab..3e15dde885571895da55273a0fd88b6b451d9cff 100644 (file)
@@ -5,4 +5,4 @@ sources = env.Glob('intern/*.cpp')
 
 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] )
index d3a9373b4d8391820f11c2f6e77cccc59a2413ad..e4e89671653027646ce89bcc965ec95c0e503a06 100644 (file)
@@ -6,6 +6,9 @@ SConscript(['blender/SConscript',
                        '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'])
index 0c7922de6ff6132d20acc17e3a5d0ee6f2e8525a..a5bb843cbef31967a937b9aabfc976622d7d6e63 100644 (file)
@@ -65,4 +65,4 @@ if env['WITH_BF_LCMS']:
 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] )
index 3d7d6b63e64f1b659fed2d36a3b766f3eece6471..b6c549fd14509a38c6590144ac51e2e85c32c454 100644 (file)
@@ -16,4 +16,4 @@ if env['OURPLATFORM'] == 'linux2':
 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 )
index 3c441a81d6bb723ccb7fe91f905183c8c99c7309..acf236d382b96cf9fd03c2a04c63360a1422693e 100644 (file)
@@ -54,6 +54,8 @@
 #include "BKE_utildefines.h"
 
 
+
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
index 19a89b7e60476ccc557725248fa677bf327b7034..1bc834ab9f414f2f76817a19c89e80658a067a7a 100644 (file)
@@ -11,4 +11,4 @@ incs += ' ' + env['BF_ZLIB_INC']
 
 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] )
index 776c188d73bc6e1d3636584a4316a2090bcab49b..af69b4519b4cd04ed02a4f24259fcc74faa446a1 100644 (file)
@@ -11,4 +11,4 @@ if env['WITH_BF_QUICKTIME']:
        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] )
index 63f5fe532388c4d73519d9a5c085c607af0e771e..d40f3a97874b20dcb95f3a206b72bbc6d1dbc95b 100644 (file)
@@ -8,4 +8,4 @@ incs += ' #/extern/glew/include #intern/guardedalloc ../imbuf .'
 
 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] )
index ef9c44b85c8333b1348511b2a1d87a562349d5e3..371e4cff9eb8d55fece63d2b9974d717d83e95f2 100644 (file)
@@ -14,4 +14,4 @@ incs = ['.',
 
 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])
index cec6023648bbb0d2873f5af50aaf37b829438d8b..6cabc3f7d79bbb1bfa7e1d51d909a08fcf8358fb 100644 (file)
@@ -16,4 +16,4 @@ incs = ['.',
 
 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])
index f91cf166f62cda2a8a527e096500386852fb2c5b..6d96811e1cb2a6b6cc70c4c0674ad0416d7dccb3 100644 (file)
@@ -8,4 +8,4 @@ objs += o
 
 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] )
index d44cf762a0f2b42ecfac2c5c0851bfe66dacb799..c681c5bdc393a2fef700b568dc9d043b7c79849d 100644 (file)
@@ -13,9 +13,9 @@ defs = []
 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
index 59771aa0829f3091c83a2c2c54a5be103cfe41f4..534ab0f7d4c0dc505daf62bc0fdcf9edc9e323c7 100644 (file)
@@ -5,4 +5,4 @@ sources = env.Glob('intern/*.c')
 
 incs = '.  ../blenloader ../blenloader/intern ../blenkernel ../blenlib ../makesdna ../../kernel/gen_messaging'
 
-env.BlenderLib ( 'bf_readblenfile', sources, Split(incs), [], libtype=['core','player'], priority = [0, 220] )
+env.BlenderLib ( 'bf_readblenfile', sources, Split(incs), [], libtype=['core','player'], priority = [0, 0] )
similarity index 53%
rename from blenderplayer/bad_level_call_stubs/SConscript
rename to source/blenderplayer/bad_level_call_stubs/SConscript
index bd3df38b557266c1c8752babcb0cc7eaa8683c74..ce502af57be9f5fbd852df9190f15455757668d8 100644 (file)
@@ -3,12 +3,11 @@ Import ('env')
 
 sources = 'stubs.c'
 
-incs = '. ..'
-incs += '../../source/blender/makesdna'
-incs += '../../source/blender/makesrna'
+incs = '#/source/blender/makesdna'
+incs += ' #/source/blender/makesrna'
 
 defs = ''
 if env['WITH_BF_INTERNATIONAL']:
     defs += 'WITH_FREETYPE2'
 
-env.BlenderLib ('blenkernel_blc', sources = Split(sources), includes=Split(incs), defines=Split(defs), libtype='player',priority=225 )
+env.BlenderLib ('blenkernel_blc', sources = Split(sources), includes=Split(incs), defines=Split(defs), libtype=['player'],priority=[145] )
index dc5a93a2e4816269d837075f8fe2c1c92bd3cc15..831f898853b9fe8709ef8d20cf83df54c89354c8 100644 (file)
@@ -28,4 +28,4 @@ incs += ' ' + env['BF_PYTHON_INC']
 incs += ' ' + env['BF_BULLET_INC']
 incs += ' ' + env['BF_OPENGL_INC']
 
-env.BlenderLib ( 'bf_bloutines', sources, Split(incs), defs, libtype=['core', 'player'], priority=[300, 45] , cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'bf_bloutines', sources, Split(incs), defs, libtype=['core', 'player'], priority=[300, 25] , cxx_compileflags=env['BGE_CXXFLAGS'])
index 9164a9f6d78f3506d8b7d624c84ad23ccb7f1a2e..2d1263104754ae25fda5c62d90934ed00f91af65 100644 (file)
@@ -23,4 +23,4 @@ incs += ' #source/blender/makesrna'
 incs += ' ' + env['BF_PYTHON_INC']
 incs += ' ' + env['BF_BULLET_INC']
 
-env.BlenderLib ( 'bf_converter', sources, Split(incs), defs, libtype=['core','player'], priority=[305,50], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'bf_converter', sources, Split(incs), defs, libtype=['core','player'], priority=[305,40], cxx_compileflags=env['BGE_CXXFLAGS'])
index dc9c184fd8a4c75ae0e285ab9098819806e4a034..51c3a0cc5afc29b333347a7dc6a52a7b41b7c967 100644 (file)
@@ -6,4 +6,4 @@ sources = env.Glob('*.cpp')
 incs ='. #source/kernel/gen_system #intern/string #intern/moto/include #source/gameengine/SceneGraph #source/blender/blenloader'
 incs += ' ' + env['BF_PYTHON_INC']
 
-env.BlenderLib ( 'bf_expressions', sources, Split(incs), [], libtype=['core','player'], priority = [360,120], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'bf_expressions', sources, Split(incs), [], libtype=['core','player'], priority = [360,75], cxx_compileflags=env['BGE_CXXFLAGS'])
index f259a338dc083e5312059d2ff90e34c133bf8546..442420a8876aba3db6c17d9912a62493f3626291 100644 (file)
@@ -21,4 +21,4 @@ if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
        if env['BF_DEBUG']:
                defs.append('_DEBUG')
 
-env.BlenderLib ( 'bf_logic', sources, Split(incs), defs, libtype=['core','player'], priority=[330, 100], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'bf_logic', sources, Split(incs), defs, libtype=['core','player'], priority=[330, 50], cxx_compileflags=env['BGE_CXXFLAGS'])
index 3ac2576b46d5b2b7abc49f153ea42ab814dbab25..6f37c2f769ebfecdaaf06c2b0fb342c4028ffde1 100644 (file)
@@ -62,4 +62,4 @@ incs += Split(env['BF_PYTHON_INC'])
 incs += Split(env['BF_PNG_INC'])
 incs += Split(env['BF_ZLIB_INC'])
 
-env.BlenderLib (libname='gp_common', sources=source_files, includes=incs, defines = [], libtype='player', priority=5, cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib (libname='gp_common', sources=source_files, includes=incs, defines = [], libtype=['player'], priority=[15], cxx_compileflags=env['BGE_CXXFLAGS'])
index d399d6b3443cd94b324e7a25928f64e3e99d2b36..b7677d295077784fef44926adea5c3266725f733 100644 (file)
@@ -68,6 +68,9 @@ extern "C"
        
        int GHOST_HACK_getFirstFile(char buf[]);
        
+extern char bprogname[];       /* holds a copy of argv[0], from creator.c */
+extern char btempdir[];                /* use this to store a valid temp directory */
+
 #ifdef __cplusplus
 }
 #endif // __cplusplus
index ce8b07b9393f7cf5e167e70e7efa65ecfc84117e..6c71eafa1dcde520ef04b53c4aa3fa2cb25ec7a1 100644 (file)
@@ -46,4 +46,4 @@ defs = []
 if env['WITH_BF_FFMPEG']:
     defs.append('WITH_FFMPEG')
 
-env.BlenderLib (libname='gp_ghost', sources=source_files, includes = incs, defines = defs, libtype='player',priority=5, cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib (libname='gp_ghost', sources=source_files, includes = incs, defines = defs, libtype=['player'],priority=[5], cxx_compileflags=env['BGE_CXXFLAGS'])
index ce4a29b94921ff9575d887c6a4c6924beab5aaef..f2283f0b28d36b778c0108a9e64dc693155d91b0 100644 (file)
@@ -9,4 +9,4 @@ incs += ' #source/gameengine/Network #source/gameengine/SceneGraph'
 
 incs += ' ' + env['BF_PYTHON_INC']
 
-env.BlenderLib ( 'kx_network', Split(sources), Split(incs), defines=[],libtype=['core', 'player'], priority=[400, 145], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'bf_network', Split(sources), Split(incs), defines=[],libtype=['core', 'player'], priority=[400, 100], cxx_compileflags=env['BGE_CXXFLAGS'])
index ea9d32fa0bf29d64a10484d4240622fbc3f729fa..1f5df8dea000b8e7b3809fc48f713db5ba234019 100644 (file)
@@ -33,4 +33,4 @@ if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
        if env['BF_DEBUG']:
                defs.append('_DEBUG') # for Python
 
-env.BlenderLib ( 'bf_ketsji', sources, Split(incs), defs, libtype=['core','player'], priority=[320, 60], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'bf_ketsji', sources, Split(incs), defs, libtype=['core','player'], priority=[320, 80], cxx_compileflags=env['BGE_CXXFLAGS'])
index be6545b4fd6b26589ad2f5d89282f9c2d57cfbea..62b0a65a51409aaaa120506d46fd1f7f9c07b355 100644 (file)
@@ -5,4 +5,4 @@ sources = 'NG_LoopBackNetworkDeviceInterface.cpp'
 
 incs = '. #source/kernel/gen_system #intern/string #source/gameengine/Network'
 
-env.BlenderLib ( 'bf_loopbacknetwork', Split(sources), Split(incs), defines=[],libtype=['core', 'player'], priority=[400, 155] )
+env.BlenderLib ( 'bf_loopbacknetwork', Split(sources), Split(incs), defines=[],libtype=['core', 'player'], priority=[400, 115] )
index 804851973afb7786e142d76737e9effa418947c0..297cfdb67480ae5b12478059e472d6af9488b45b 100644 (file)
@@ -5,4 +5,4 @@ sources = env.Glob('*.cpp') #'NG_NetworkMessage.cpp NG_NetworkObject.cpp NG_Netw
 
 incs = '. #source/kernel/gen_system #intern/string #intern/moto/include'
 
-env.BlenderLib ( 'bf_ngnetwork', sources, Split(incs), [], libtype=['core', 'player'], priority=[400, 150] )
+env.BlenderLib ( 'bf_ngnetwork', sources, Split(incs), [], libtype=['core', 'player'], priority=[400, 110] )
index 0b797c2cb8be7d07a8ad369e3622fa680125bd62..1489e4c46f6293d6b76a9a15fd8241b9cb1b1d07 100644 (file)
@@ -21,4 +21,4 @@ incs += ' #intern/guardedalloc'
 incs += ' ' + env['BF_BULLET_INC']
 incs += ' ' + env['BF_PYTHON_INC']
 
-env.BlenderLib ( 'bf_bullet', Split(sources), Split(incs), [], libtype=['core','player'], priority=[350,80], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'bf_bullet', Split(sources), Split(incs), [], libtype=['core','player'], priority=[350,70], cxx_compileflags=env['BGE_CXXFLAGS'])
index 93d6ac364469bb403c0a65f435b722c49a7ffecf..cb4a09559be945aa95e33848f89f1eee50778a69 100644 (file)
@@ -5,4 +5,4 @@ sources = 'DummyPhysicsEnvironment.cpp'
 
 incs = '. ../common'
 
-env.BlenderLib ( 'bf_dummy', Split(sources), Split(incs), [], libtype=['core','player'], priority=[350,95] )
+env.BlenderLib ( 'bf_dummy', Split(sources), Split(incs), [], libtype=['core','player'], priority=[350,55] )
index 8b373ec830cb3b75a69b516c83a3f8b479f4a6a7..bbf2d345a3098c5bd9bb097d9b0cc97424a616ea 100644 (file)
@@ -5,4 +5,4 @@ sources = 'PHY_IMotionState.cpp PHY_IController.cpp PHY_IPhysicsController.cpp P
 
 incs = '. ../Dummy #intern/moto/include'
 
-env.BlenderLib ( 'bf_common', Split(sources), Split(incs), [], libtype=['core','player'], priority=[360, 90], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'bf_physics_common', Split(sources), Split(incs), [], libtype=['core','player'], priority=[360, 90], cxx_compileflags=env['BGE_CXXFLAGS'])
index 963c6616b64b08061a3f8224f7372bc9871a07b1..851ec0c47c366e05f6f394ad4e4fc1fafd13ad3f 100644 (file)
@@ -8,4 +8,4 @@ incs += ' #source/blender/gpu #extern/glew/include ' + env['BF_OPENGL_INC']
 incs += ' #source/blender/gameengine/Ketsji #source/gameengine/SceneGraph #source/blender/makesdna #source/blender/blenkernel'
 incs += ' #intern/guardedalloc #source/blender/blenlib'
 
-env.BlenderLib ( 'bf_oglrasterizer', Split(sources), Split(incs), [], libtype=['core','player'], priority=[350, 115], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'bf_oglrasterizer', Split(sources), Split(incs), [], libtype=['core','player'], priority=[350, 65], cxx_compileflags=env['BGE_CXXFLAGS'])
index c2af14e8ce5e1d95e3bab297d7c286d93a6ed18f..a1a1c7a40387afddd15b0eb1ed50afff59236868 100644 (file)
@@ -7,4 +7,4 @@ sources = env.Glob('*.cpp')
 incs = '. #source/kernel/gen_system #intern/string #intern/moto/include #source/gameengine/BlenderRoutines #extern/glew/include #source/gameengine/Expressions #source/gameengine/SceneGraph #source/blender/blenkernel #source/blender/makesdna'
 incs += ' ' + env['BF_PYTHON_INC']
 
-env.BlenderLib ( 'bf_rasterizer', sources, Split(incs), [], libtype=['core','player'], priority=[350,115], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'bf_rasterizer', sources, Split(incs), [], libtype=['core','player'], priority=[350,60], cxx_compileflags=env['BGE_CXXFLAGS'])
index 8f433a21e4958f459cdcbbdd727a606fdce28ff9..b7d8de450ab47a2482583bdfd135f91b08125b90 100644 (file)
@@ -6,4 +6,4 @@ sources = env.Glob('*.cpp')
 
 incs = '. #intern/moto/include'
 
-env.BlenderLib ( 'bf_scenegraph', sources, Split(incs), [], libtype=['core','player'], priority=[325,125], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'bf_scenegraph', sources, Split(incs), [], libtype=['core','player'], priority=[325,45], cxx_compileflags=env['BGE_CXXFLAGS'])
index 583ccf29dbd0359af77e88569b64c65df7925b39..ada878b74f23c6b39bc6603cc0a3403c5b02d5a5 100644 (file)
@@ -27,4 +27,4 @@ if env['WITH_BF_FFMPEG']:
     incs += ' ' + env['BF_FFMPEG_INC'] + ' ' + env['BF_PTHREADS_INC']
     defs.append('__STDC_CONSTANT_MACROS')
 
-env.BlenderLib ( 'bf_videotex', sources, Split(incs), defs, libtype=['core','player'], priority=[300, 72], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'bf_videotex', sources, Split(incs), defs, libtype=['core','player'], priority=[300, 30], cxx_compileflags=env['BGE_CXXFLAGS'])
index 908e059ceab0de07437decad771023499e8004d9..88fc58755c0cc546f663d7b3daa8867b1a093d2a 100644 (file)
@@ -7,4 +7,4 @@ sources += ' gen_system/SYS_System.cpp'
 
 incs = 'gen_messaging gen_system #/intern/string #/intern/moto/include #/source/blender/blenloader '
 
-env.BlenderLib ( 'bf_kernel', Split(sources), Split(incs), [], libtype = ['core', 'player'], priority = [400, 150] )
+env.BlenderLib ( 'bf_kernel', Split(sources), Split(incs), [], libtype = ['core', 'player'], priority = [400, 95] )