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

@@ -27,8 +27,8 @@
FILE(GLOB SRC *.cpp)
SET(INC
.
../../../intern/moto/include
.
../../../intern/moto/include
)
BLENDERLIB(bf_scenegraph "${SRC}" "${INC}")

View File

@@ -6,10 +6,4 @@ sources = env.Glob('*.cpp')
incs = '. #intern/moto/include'
cxxflags = []
if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
cxxflags.append ('/GR')
cxxflags.append ('/O2')
cxxflags.append ('/EHsc')
env.BlenderLib ( 'bf_scenegraph', sources, Split(incs), [], libtype=['core','player'], priority=[325,125], cxx_compileflags = cxxflags )
env.BlenderLib ( 'bf_scenegraph', sources, Split(incs), [], libtype=['core','player'], priority=[325,85], cxx_compileflags=env['BGE_CXXFLAGS'])