archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merged changes in the trunk up to revision 32684.

Browse Source
This commit is contained in:
Tamito Kajiyama
2010-10-24 13:05:09 +00:00
parent 86e433728d a301d2c898
commit 3b2515ba0e
362 changed files with 4293 additions and 22486 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/blenkernel/SConscript
View File

@@ -89,4 +89,7 @@ if env['WITH_BF_LZMA']:
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','player'], priority = [166,25] )
if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
env.BlenderLib ( libname = 'bf_blenkernel', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [166,25], cc_compileflags = ['/WX'] )
else:
env.BlenderLib ( libname = 'bf_blenkernel', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [166,25] )