merge with 2.5/trunk at r23271

This commit is contained in:
Joseph Eagar
2009-09-16 17:43:09 +00:00
parent 6b0679a399
commit deebf4f8f0
686 changed files with 43627 additions and 31602 deletions

View File

@@ -42,14 +42,8 @@ incs = ['.',
incs += Split(env['BF_PYTHON_INC'])
cxxflags = []
if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
cxxflags.append ('/GR')
cxxflags.append ('/O2')
cxxflags.append ('/EHsc')
defs = ''
defs = []
if env['WITH_BF_FFMPEG']:
defs += ' WITH_FFMPEG'
defs.append('WITH_FFMPEG')
env.BlenderLib (libname='gp_ghost', sources=source_files, includes = incs, defines = Split(defs), libtype='player',priority=5, cxx_compileflags=cxxflags)
env.BlenderLib (libname='gp_ghost', sources=source_files, includes = incs, defines = defs, libtype=['player'],priority=[0], cxx_compileflags=env['BGE_CXXFLAGS'])