No tabs in scons! Sorry for that..
authorAntony Riakiotakis <kalast@gmail.com>
Wed, 9 Nov 2011 14:00:24 +0000 (14:00 +0000)
committerAntony Riakiotakis <kalast@gmail.com>
Wed, 9 Nov 2011 14:00:24 +0000 (14:00 +0000)
build_files/scons/tools/Blender.py
intern/cycles/SConscript

index 76fa8ee74893ffbccbdddb71bd80c4bfeb651720..434f52dac87d8b89e8f001934b452cb221357b17 100644 (file)
@@ -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']
index 725553e6d5b25b5b9db48ab611424d56b36e746d..27943ed6ac6ab5e67d1ee8114e1d0587051bc494 100644 (file)
@@ -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())