2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r18677:19317
Notes: * Sequence transform strip uses G.scene global, this is commented out now, should be fixed. * Etch-a-ton code was most difficult to merge. The files already in 2.5 got merged, but no new files were added. Calls to these files are commented out with "XXX etch-a-ton". editarmature.c and transform_snap.c were complex to merge. Martin, please check? * Game engine compiles and links again here for scons/make/cmake (player still fails to link).
This commit is contained in:
@@ -6,4 +6,9 @@ sources = env.Glob('*.cpp')
|
||||
incs ='. #source/kernel/gen_system #intern/string #intern/moto/include'
|
||||
incs += ' ' + env['BF_PYTHON_INC']
|
||||
|
||||
env.BlenderLib ( 'bf_expressions', sources, Split(incs), [], libtype=['core','player'], priority = [310,120] )
|
||||
cxxflags = []
|
||||
if env['OURPLATFORM']=='win32-vc':
|
||||
cxxflags.append ('/GR')
|
||||
cxxflags.append ('/O2')
|
||||
|
||||
env.BlenderLib ( 'bf_expressions', sources, Split(incs), [], libtype=['core','player'], priority = [360,120], cxx_compileflags=cxxflags)
|
||||
|
||||
Reference in New Issue
Block a user