[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56932] trunk/blender/source/blender: code cleanup: scons - binreloc include was copied all over the place for no reason, -pthread too.

Campbell Barton ideasman42 at gmail.com
Mon May 20 20:55:09 CEST 2013 

Revision: 56932
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56932
Author:   campbellbarton
Date:     2013-05-20 18:55:08 +0000 (Mon, 20 May 2013)
Log Message:
-----------
code cleanup: scons - binreloc include was copied all over the place for no reason, -pthread too.

Modified Paths:
--------------
    trunk/blender/source/blender/blenlib/SConscript
    trunk/blender/source/blender/editors/armature/SConscript
    trunk/blender/source/blender/editors/mesh/SConscript
    trunk/blender/source/blender/editors/object/SConscript
    trunk/blender/source/blender/editors/physics/SConscript
    trunk/blender/source/blender/editors/render/SConscript
    trunk/blender/source/blender/editors/screen/SConscript
    trunk/blender/source/blender/editors/sculpt_paint/SConscript
    trunk/blender/source/blender/editors/space_file/SConscript
    trunk/blender/source/blender/editors/space_node/SConscript
    trunk/blender/source/blender/freestyle/SConscript
    trunk/blender/source/blender/makesrna/SConscript
    trunk/blender/source/blender/makesrna/intern/SConscript
    trunk/blender/source/blender/nodes/SConscript
    trunk/blender/source/blender/render/SConscript
    trunk/blender/source/blender/windowmanager/SConscript

Modified: trunk/blender/source/blender/blenlib/SConscript
===================================================================
--- trunk/blender/source/blender/blenlib/SConscript	2013-05-20 18:42:28 UTC (rev 56931)
+++ trunk/blender/source/blender/blenlib/SConscript	2013-05-20 18:55:08 UTC (rev 56932)
@@ -45,7 +45,6 @@
 defs = []
 
 if env['WITH_BF_BINRELOC']:
-    cflags='-pthread'
     incs += ' ../../../extern/binreloc/include'
     defs.append('WITH_BINRELOC')
 

Modified: trunk/blender/source/blender/editors/armature/SConscript
===================================================================
--- trunk/blender/source/blender/editors/armature/SConscript	2013-05-20 18:42:28 UTC (rev 56931)
+++ trunk/blender/source/blender/editors/armature/SConscript	2013-05-20 18:55:08 UTC (rev 56932)
@@ -50,10 +50,6 @@
 
 defs = []
 
-if env['OURPLATFORM'] == 'linux':
-    cflags='-pthread'
-    incs += ' ../../../extern/binreloc/include'
-
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
     incs += ' ' + env['BF_PTHREADS_INC']
 

Modified: trunk/blender/source/blender/editors/mesh/SConscript
===================================================================
--- trunk/blender/source/blender/editors/mesh/SConscript	2013-05-20 18:42:28 UTC (rev 56931)
+++ trunk/blender/source/blender/editors/mesh/SConscript	2013-05-20 18:55:08 UTC (rev 56932)
@@ -51,10 +51,6 @@
     ]
 incs = ' '.join(incs)
 
-if env['OURPLATFORM'] == 'linux':
-    cflags='-pthread'
-    incs += ' ../../../extern/binreloc/include'
-
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
     incs += ' ' + env['BF_PTHREADS_INC']
 

Modified: trunk/blender/source/blender/editors/object/SConscript
===================================================================
--- trunk/blender/source/blender/editors/object/SConscript	2013-05-20 18:42:28 UTC (rev 56931)
+++ trunk/blender/source/blender/editors/object/SConscript	2013-05-20 18:55:08 UTC (rev 56932)
@@ -52,10 +52,6 @@
 
 defs = []
 
-if env['OURPLATFORM'] == 'linux':
-    cflags='-pthread'
-    incs += ' ../../../extern/binreloc/include'
-
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
     incs += ' ' + env['BF_PTHREADS_INC']
 

Modified: trunk/blender/source/blender/editors/physics/SConscript
===================================================================
--- trunk/blender/source/blender/editors/physics/SConscript	2013-05-20 18:42:28 UTC (rev 56931)
+++ trunk/blender/source/blender/editors/physics/SConscript	2013-05-20 18:55:08 UTC (rev 56932)
@@ -51,10 +51,6 @@
 
 defs = []
 
-if env['OURPLATFORM'] == 'linux':
-    cflags='-pthread'
-    incs += ' ../../../extern/binreloc/include'
-
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
     incs += ' ' + env['BF_PTHREADS_INC']
 

Modified: trunk/blender/source/blender/editors/render/SConscript
===================================================================
--- trunk/blender/source/blender/editors/render/SConscript	2013-05-20 18:42:28 UTC (rev 56931)
+++ trunk/blender/source/blender/editors/render/SConscript	2013-05-20 18:55:08 UTC (rev 56932)
@@ -50,10 +50,6 @@
 
 defs = []
 
-if env['OURPLATFORM'] == 'linux':
-    cflags='-pthread'
-    incs += ' ../../../extern/binreloc/include'
-
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
     incs += ' ' + env['BF_PTHREADS_INC']
 

Modified: trunk/blender/source/blender/editors/screen/SConscript
===================================================================
--- trunk/blender/source/blender/editors/screen/SConscript	2013-05-20 18:42:28 UTC (rev 56931)
+++ trunk/blender/source/blender/editors/screen/SConscript	2013-05-20 18:55:08 UTC (rev 56932)
@@ -49,10 +49,6 @@
 
 defs = []
 
-if env['OURPLATFORM'] == 'linux':
-    cflags='-pthread'
-    incs += ' ../../../extern/binreloc/include'
-
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
     incs += ' ' + env['BF_PTHREADS_INC']
 

Modified: trunk/blender/source/blender/editors/sculpt_paint/SConscript
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/SConscript	2013-05-20 18:42:28 UTC (rev 56931)
+++ trunk/blender/source/blender/editors/sculpt_paint/SConscript	2013-05-20 18:55:08 UTC (rev 56932)
@@ -50,10 +50,6 @@
     ]
 incs = ' '.join(incs)
 
-if env['OURPLATFORM'] == 'linux':
-    cflags='-pthread'
-    incs += ' ../../../extern/binreloc/include'
-
 if env['OURPLATFORM'] == 'linuxcross':
     if env['WITH_BF_OPENMP']:
         incs += ' ' + env['BF_OPENMP_INC']

Modified: trunk/blender/source/blender/editors/space_file/SConscript
===================================================================
--- trunk/blender/source/blender/editors/space_file/SConscript	2013-05-20 18:42:28 UTC (rev 56931)
+++ trunk/blender/source/blender/editors/space_file/SConscript	2013-05-20 18:55:08 UTC (rev 56932)
@@ -61,10 +61,6 @@
 if env['WITH_BF_FREESTYLE']:
     defs.append('WITH_FREESTYLE')
 
-if env['OURPLATFORM'] == 'linux':
-    cflags='-pthread'
-    incs += ' ../../../extern/binreloc/include'
-
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
     incs += ' ' + env['BF_PTHREADS_INC']
     

Modified: trunk/blender/source/blender/editors/space_node/SConscript
===================================================================
--- trunk/blender/source/blender/editors/space_node/SConscript	2013-05-20 18:42:28 UTC (rev 56931)
+++ trunk/blender/source/blender/editors/space_node/SConscript	2013-05-20 18:55:08 UTC (rev 56932)
@@ -57,10 +57,6 @@
     #cf.append('-Werror')
     pass
 
-if env['OURPLATFORM'] == 'linux':
-    cflags='-pthread'
-    incs += ' ../../../extern/binreloc/include'
-
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
     incs += ' ' + env['BF_PTHREADS_INC']
 

Modified: trunk/blender/source/blender/freestyle/SConscript
===================================================================
--- trunk/blender/source/blender/freestyle/SConscript	2013-05-20 18:42:28 UTC (rev 56931)
+++ trunk/blender/source/blender/freestyle/SConscript	2013-05-20 18:55:08 UTC (rev 56932)
@@ -25,10 +25,6 @@
 
 defs = ['WITH_FREESTYLE']
 
-if env['OURPLATFORM'] == 'linux2':
-    cflags='-pthread'
-    incs += ' ../../../extern/binreloc/include'
-
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
     incs += ' ' + env['BF_PTHREADS_INC']
 

Modified: trunk/blender/source/blender/makesrna/SConscript
===================================================================
--- trunk/blender/source/blender/makesrna/SConscript	2013-05-20 18:42:28 UTC (rev 56931)
+++ trunk/blender/source/blender/makesrna/SConscript	2013-05-20 18:55:08 UTC (rev 56932)
@@ -124,7 +124,6 @@
 
 if env['OURPLATFORM'] == 'linux':
     cflags='-pthread'
-    incs += ' ../../../extern/binreloc/include'
 
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
     incs += ' ' + env['BF_PTHREADS_INC']

Modified: trunk/blender/source/blender/makesrna/intern/SConscript
===================================================================
--- trunk/blender/source/blender/makesrna/intern/SConscript	2013-05-20 18:42:28 UTC (rev 56931)
+++ trunk/blender/source/blender/makesrna/intern/SConscript	2013-05-20 18:55:08 UTC (rev 56932)
@@ -143,7 +143,6 @@
 
 if env['OURPLATFORM'] == 'linux':
     cflags='-pthread'
-    incs += ' ../../../extern/binreloc/include'
 
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
     incs += ' ' + env['BF_PTHREADS_INC']

Modified: trunk/blender/source/blender/nodes/SConscript
===================================================================
--- trunk/blender/source/blender/nodes/SConscript	2013-05-20 18:42:28 UTC (rev 56931)
+++ trunk/blender/source/blender/nodes/SConscript	2013-05-20 18:55:08 UTC (rev 56932)
@@ -69,10 +69,6 @@
 if env['WITH_BF_INTERNATIONAL']:
     defs.append('WITH_INTERNATIONAL')
 
-if env['OURPLATFORM'] == 'linux':
-    cflags='-pthread'
-    incs += ' ../../../extern/binreloc/include'
-
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
     incs += ' ' + env['BF_PTHREADS_INC']
     

Modified: trunk/blender/source/blender/render/SConscript
===================================================================
--- trunk/blender/source/blender/render/SConscript	2013-05-20 18:42:28 UTC (rev 56931)
+++ trunk/blender/source/blender/render/SConscript	2013-05-20 18:55:08 UTC (rev 56932)
@@ -83,7 +83,6 @@
     if env['WITH_BF_RAYOPTIMIZATION']:
         cflags_raytrace = env['CCFLAGS'] +  env['BF_RAYOPTIMIZATION_SSE_FLAGS']
         cxxflags_raytrace = env['CXXFLAGS'] +  env['BF_RAYOPTIMIZATION_SSE_FLAGS']
-    incs += ' ../../../extern/binreloc/include'
 
 if env['OURPLATFORM'] == 'linuxcross':
     if env['WITH_BF_RAYOPTIMIZATION']:

Modified: trunk/blender/source/blender/windowmanager/SConscript
===================================================================
--- trunk/blender/source/blender/windowmanager/SConscript	2013-05-20 18:42:28 UTC (rev 56931)
+++ trunk/blender/source/blender/windowmanager/SConscript	2013-05-20 18:55:08 UTC (rev 56932)
@@ -65,10 +65,6 @@
 if env['WITH_BF_COLLADA']:
     defs.append('WITH_COLLADA')
 
-if env['OURPLATFORM'] == 'linux':
-    cflags='-pthread'
-    incs += ' ../../../extern/binreloc/include'
-
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
     incs += ' ' + env['BF_PTHREADS_INC']
     incs += ' ../../intern/utfconv'

More information about the Bf-blender-cvs mailing list