sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

No tabs in scons! Sorry for that..

Browse Source
This commit is contained in:
Antony Riakiotakis 2011-11-09 14:00:24 +00:00
parent adf17b48d8
commit ee1569b933
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_files/scons/tools/Blender.py
View File

@ -282,7 +282,7 @@ def setup_syslibs(lenv):
if lenv['WITH_BF_BOOST']: if lenv['WITH_BF_BOOST']:
syslibs += Split(lenv['BF_BOOST_LIB']) syslibs += Split(lenv['BF_BOOST_LIB'])
syslibs += Split(lenv['BF_JPEG_LIB']) syslibs += Split(lenv['BF_JPEG_LIB'])
syslibs += Split(lenv['BF_PNG_LIB']) syslibs += Split(lenv['BF_PNG_LIB'])
syslibs += lenv['LLIBS'] syslibs += lenv['LLIBS']

6
intern/cycles/SConscript
View File

@ -24,9 +24,9 @@ defs.append('WITH_MULTI')
defs.append('WITH_CUDA') defs.append('WITH_CUDA')
if env['OURPLATFORM'] in ('win32-mingw'): if env['OURPLATFORM'] in ('win32-mingw'):
cxxflags.append('-fno-rtti -ffast-math -msse -msse2 -msse3 -mtune=native'.split()) cxxflags.append('-fno-rtti -ffast-math -msse -msse2 -msse3 -mtune=native'.split())
ccflags.append('-ffast-math -msse -msse2 -msse3 -mtune=native'.split()) ccflags.append('-ffast-math -msse -msse2 -msse3 -mtune=native'.split())
defs.append('BOOST_NO_RTTI BOOST_NO_TYPEID'.split()) defs.append('BOOST_NO_RTTI BOOST_NO_TYPEID'.split())
incs.extend('. bvh render device kernel kernel/osl kernel/svm util subd'.split()) incs.extend('. bvh render device kernel kernel/osl kernel/svm util subd'.split())
incs.extend('#intern/guardedalloc #source/blender/makesrna #source/blender/makesdna'.split()) incs.extend('#intern/guardedalloc #source/blender/makesrna #source/blender/makesdna'.split())