diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2011-11-09 18:00:24 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2011-11-09 18:00:24 +0400 |
| commit | ee1569b9330a231d8781045853f5f794518de492 (patch) | |
| tree | e7aec52ddf221f866712efc2c89891dd9d16eef8 | |
| parent | adf17b48d8b179aa02bee86f0b3dae771449d8c1 (diff) | |
No tabs in scons! Sorry for that..
| -rw-r--r-- | build_files/scons/tools/Blender.py | 2 | ||||
| -rw-r--r-- | intern/cycles/SConscript | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py index 76fa8ee7489..434f52dac87 100644 --- a/build_files/scons/tools/Blender.py +++ b/build_files/scons/tools/Blender.py @@ -282,7 +282,7 @@ def setup_syslibs(lenv): if lenv['WITH_BF_BOOST']: 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 += lenv['LLIBS'] diff --git a/intern/cycles/SConscript b/intern/cycles/SConscript index 725553e6d5b..27943ed6ac6 100644 --- a/intern/cycles/SConscript +++ b/intern/cycles/SConscript @@ -24,9 +24,9 @@ defs.append('WITH_MULTI') defs.append('WITH_CUDA') if env['OURPLATFORM'] in ('win32-mingw'): - cxxflags.append('-fno-rtti -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()) + cxxflags.append('-fno-rtti -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()) incs.extend('. bvh render device kernel kernel/osl kernel/svm util subd'.split()) incs.extend('#intern/guardedalloc #source/blender/makesrna #source/blender/makesdna'.split()) |