[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41697] trunk/blender: No tabs in scons! Sorry for that..

Antony Riakiotakis kalast at gmail.com
Wed Nov 9 15:00:27 CET 2011


Revision: 41697
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41697
Author:   psy-fi
Date:     2011-11-09 14:00:24 +0000 (Wed, 09 Nov 2011)
Log Message:
-----------
No tabs in scons! Sorry for that..

Modified Paths:
--------------
    trunk/blender/build_files/scons/tools/Blender.py
    trunk/blender/intern/cycles/SConscript

Modified: trunk/blender/build_files/scons/tools/Blender.py
===================================================================
--- trunk/blender/build_files/scons/tools/Blender.py	2011-11-09 11:49:39 UTC (rev 41696)
+++ trunk/blender/build_files/scons/tools/Blender.py	2011-11-09 14:00:24 UTC (rev 41697)
@@ -282,7 +282,7 @@
     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']

Modified: trunk/blender/intern/cycles/SConscript
===================================================================
--- trunk/blender/intern/cycles/SConscript	2011-11-09 11:49:39 UTC (rev 41696)
+++ trunk/blender/intern/cycles/SConscript	2011-11-09 14:00:24 UTC (rev 41697)
@@ -24,9 +24,9 @@
 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())




More information about the Bf-blender-cvs mailing list