[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40808] trunk/blender/SConstruct: scons flags were being set carelessly - CCFLAGS is like setting CFLAGS and CXXFLAGS - in a few cases this was being set redundantly .

Campbell Barton ideasman42 at gmail.com
Thu Oct 6 01:35:04 CEST 2011


Revision: 40808
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40808
Author:   campbellbarton
Date:     2011-10-05 23:35:03 +0000 (Wed, 05 Oct 2011)
Log Message:
-----------
scons flags were being set carelessly - CCFLAGS is like setting CFLAGS and CXXFLAGS - in a few cases this was being set redundantly.

there are more cases that chould be changed since CPPFLAGS and CCFLAGS are both being set where only one is needed but for now this is safe.

Modified Paths:
--------------
    trunk/blender/SConstruct

Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct	2011-10-05 23:19:24 UTC (rev 40807)
+++ trunk/blender/SConstruct	2011-10-05 23:35:03 UTC (rev 40808)
@@ -30,6 +30,7 @@
 # Then read all SConscripts and build
 #
 # TODO: fix /FORCE:MULTIPLE on windows to get proper debug builds.
+# TODO: cleanup CCFLAGS / CPPFLAGS use, often both are set when we only need one.
 
 import platform as pltfrm
 
@@ -283,26 +284,21 @@
         if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
                 env['CCFLAGS'].append('/openmp')
                 env['CPPFLAGS'].append('/openmp')
-                env['CXXFLAGS'].append('/openmp')
         else:
             if env['CC'].endswith('icc'): # to be able to handle CC=/opt/bla/icc case
                 env.Append(LINKFLAGS=['-openmp', '-static-intel'])
                 env['CCFLAGS'].append('-openmp')
                 env['CPPFLAGS'].append('-openmp')
-                env['CXXFLAGS'].append('-openmp')
             else:
                 env.Append(CCFLAGS=['-fopenmp']) 
                 env.Append(CPPFLAGS=['-fopenmp'])
-                env.Append(CXXFLAGS=['-fopenmp'])
 
 if env['WITH_GHOST_COCOA'] == True:
     env.Append(CFLAGS=['-DGHOST_COCOA']) 
-    env.Append(CXXFLAGS=['-DGHOST_COCOA'])
     env.Append(CPPFLAGS=['-DGHOST_COCOA'])
     
 if env['USE_QTKIT'] == True:
-    env.Append(CFLAGS=['-DUSE_QTKIT']) 
-    env.Append(CXXFLAGS=['-DUSE_QTKIT'])
+    env.Append(CFLAGS=['-DUSE_QTKIT'])
     env.Append(CPPFLAGS=['-DUSE_QTKIT'])
 
 #check for additional debug libnames
@@ -334,23 +330,19 @@
 # disable elbeem (fluidsim) compilation?
 if env['BF_NO_ELBEEM'] == 1:
     env['CPPFLAGS'].append('-DDISABLE_ELBEEM')
-    env['CXXFLAGS'].append('-DDISABLE_ELBEEM')
     env['CCFLAGS'].append('-DDISABLE_ELBEEM')
 
 
 if btools.ENDIAN == "big":
     env['CPPFLAGS'].append('-D__BIG_ENDIAN__')
-    env['CXXFLAGS'].append('-D__BIG_ENDIAN__')
     env['CCFLAGS'].append('-D__BIG_ENDIAN__')
 else:
     env['CPPFLAGS'].append('-D__LITTLE_ENDIAN__')
-    env['CXXFLAGS'].append('-D__LITTLE_ENDIAN__')
     env['CCFLAGS'].append('-D__LITTLE_ENDIAN__')	
 
 
 # TODO, make optional
 env['CPPFLAGS'].append('-DWITH_AUDASPACE')
-env['CXXFLAGS'].append('-DWITH_AUDASPACE')
 env['CCFLAGS'].append('-DWITH_AUDASPACE')
 
 # lastly we check for root_build_dir ( we should not do before, otherwise we might do wrong builddir




More information about the Bf-blender-cvs mailing list