== 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
This commit is contained in:
parent
6ed49857a4
commit
bade641408
|
@ -574,6 +574,6 @@ ADD_SUBDIRECTORY(source/creator)
|
|||
#-----------------------------------------------------------------------------
|
||||
# Blender Player
|
||||
IF(WITH_PLAYER)
|
||||
ADD_SUBDIRECTORY(blenderplayer)
|
||||
ADD_SUBDIRECTORY(source/blenderplayer)
|
||||
ENDIF(WITH_PLAYER)
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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] )
|
||||
|
|
|
@ -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] )
|
||||
|
|
|
@ -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'])
|
||||
|
|
|
@ -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] )
|
||||
|
|
|
@ -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 )
|
||||
|
|
|
@ -54,6 +54,8 @@
|
|||
#include "BKE_utildefines.h"
|
||||
|
||||
|
||||
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
|
|
@ -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] )
|
||||
|
|
|
@ -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] )
|
||||
|
|
|
@ -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] )
|
||||
|
|
|
@ -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])
|
||||
|
|
|
@ -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])
|
||||
|
|
|
@ -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] )
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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] )
|
||||
|
|
|
@ -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] )
|
|
@ -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'])
|
||||
|
|
|
@ -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'])
|
||||
|
|
|
@ -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'])
|
||||
|
|
|
@ -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'])
|
||||
|
|
|
@ -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'])
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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'])
|
||||
|
|
|
@ -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'])
|
||||
|
|
|
@ -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'])
|
||||
|
|
|
@ -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] )
|
||||
|
|
|
@ -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] )
|
||||
|
|
|
@ -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'])
|
||||
|
|
|
@ -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] )
|
||||
|
|
|
@ -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'])
|
||||
|
|
|
@ -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'])
|
||||
|
|
|
@ -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'])
|
||||
|
|
|
@ -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'])
|
||||
|
|
|
@ -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'])
|
||||
|
|
|
@ -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] )
|
||||
|
|
Loading…
Reference in New Issue