diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-05-20 22:55:08 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-05-20 22:55:08 +0400 |
commit | 7b36dea11546e5de0568c609d4d450b46ffa100b (patch) | |
tree | aaeffa0cf8d9a3f103c5834d78acf4c1574c2ff9 /source | |
parent | 6de829cb7a2b78657d3aa1d1ced04ac98cd8ebac (diff) |
code cleanup: scons - binreloc include was copied all over the place for no reason, -pthread too.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenlib/SConscript | 1 | ||||
-rw-r--r-- | source/blender/editors/armature/SConscript | 4 | ||||
-rw-r--r-- | source/blender/editors/mesh/SConscript | 4 | ||||
-rw-r--r-- | source/blender/editors/object/SConscript | 4 | ||||
-rw-r--r-- | source/blender/editors/physics/SConscript | 4 | ||||
-rw-r--r-- | source/blender/editors/render/SConscript | 4 | ||||
-rw-r--r-- | source/blender/editors/screen/SConscript | 4 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/SConscript | 4 | ||||
-rw-r--r-- | source/blender/editors/space_file/SConscript | 4 | ||||
-rw-r--r-- | source/blender/editors/space_node/SConscript | 4 | ||||
-rw-r--r-- | source/blender/freestyle/SConscript | 4 | ||||
-rw-r--r-- | source/blender/makesrna/SConscript | 1 | ||||
-rw-r--r-- | source/blender/makesrna/intern/SConscript | 1 | ||||
-rw-r--r-- | source/blender/nodes/SConscript | 4 | ||||
-rw-r--r-- | source/blender/render/SConscript | 1 | ||||
-rw-r--r-- | source/blender/windowmanager/SConscript | 4 |
16 files changed, 0 insertions, 52 deletions
diff --git a/source/blender/blenlib/SConscript b/source/blender/blenlib/SConscript index 76b1c522b64..b712d2032bf 100644 --- a/source/blender/blenlib/SConscript +++ b/source/blender/blenlib/SConscript @@ -45,7 +45,6 @@ incs = ' '.join(incs) defs = [] if env['WITH_BF_BINRELOC']: - cflags='-pthread' incs += ' ../../../extern/binreloc/include' defs.append('WITH_BINRELOC') diff --git a/source/blender/editors/armature/SConscript b/source/blender/editors/armature/SConscript index 96098ee2085..768f0834ae1 100644 --- a/source/blender/editors/armature/SConscript +++ b/source/blender/editors/armature/SConscript @@ -50,10 +50,6 @@ incs = ' '.join(incs) 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'] diff --git a/source/blender/editors/mesh/SConscript b/source/blender/editors/mesh/SConscript index e36c46ee534..fef3f00546f 100644 --- a/source/blender/editors/mesh/SConscript +++ b/source/blender/editors/mesh/SConscript @@ -51,10 +51,6 @@ incs = [ ] 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'] diff --git a/source/blender/editors/object/SConscript b/source/blender/editors/object/SConscript index 44c3c33c0d9..a46fd04489d 100644 --- a/source/blender/editors/object/SConscript +++ b/source/blender/editors/object/SConscript @@ -52,10 +52,6 @@ incs = ' '.join(incs) 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'] diff --git a/source/blender/editors/physics/SConscript b/source/blender/editors/physics/SConscript index 8c77cd13179..59a54f4ab05 100644 --- a/source/blender/editors/physics/SConscript +++ b/source/blender/editors/physics/SConscript @@ -51,10 +51,6 @@ incs = ' '.join(incs) 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'] diff --git a/source/blender/editors/render/SConscript b/source/blender/editors/render/SConscript index 4d0e81fdee1..7406d42f416 100644 --- a/source/blender/editors/render/SConscript +++ b/source/blender/editors/render/SConscript @@ -50,10 +50,6 @@ incs = ' '.join(incs) 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'] diff --git a/source/blender/editors/screen/SConscript b/source/blender/editors/screen/SConscript index 3b6963ec88d..506933042c6 100644 --- a/source/blender/editors/screen/SConscript +++ b/source/blender/editors/screen/SConscript @@ -49,10 +49,6 @@ incs = ' '.join(incs) 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'] diff --git a/source/blender/editors/sculpt_paint/SConscript b/source/blender/editors/sculpt_paint/SConscript index 63a1525adcc..b2e936058a0 100644 --- a/source/blender/editors/sculpt_paint/SConscript +++ b/source/blender/editors/sculpt_paint/SConscript @@ -50,10 +50,6 @@ incs = [ ] 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'] diff --git a/source/blender/editors/space_file/SConscript b/source/blender/editors/space_file/SConscript index c220da3de05..e1eadb66a11 100644 --- a/source/blender/editors/space_file/SConscript +++ b/source/blender/editors/space_file/SConscript @@ -61,10 +61,6 @@ if env['WITH_BF_INTERNATIONAL']: 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'] diff --git a/source/blender/editors/space_node/SConscript b/source/blender/editors/space_node/SConscript index e423d39cba4..3f69260b25d 100644 --- a/source/blender/editors/space_node/SConscript +++ b/source/blender/editors/space_node/SConscript @@ -57,10 +57,6 @@ if env['CC'] == 'gcc': #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'] diff --git a/source/blender/freestyle/SConscript b/source/blender/freestyle/SConscript index 37213ab856a..eb38b69278e 100644 --- a/source/blender/freestyle/SConscript +++ b/source/blender/freestyle/SConscript @@ -25,10 +25,6 @@ incs = ' '.join(incs) 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'] diff --git a/source/blender/makesrna/SConscript b/source/blender/makesrna/SConscript index 3bc56b017b3..9410bced37b 100644 --- a/source/blender/makesrna/SConscript +++ b/source/blender/makesrna/SConscript @@ -124,7 +124,6 @@ if env['WITH_BF_JACK']: 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'] diff --git a/source/blender/makesrna/intern/SConscript b/source/blender/makesrna/intern/SConscript index 857cebd78b4..316c3fde5d5 100644 --- a/source/blender/makesrna/intern/SConscript +++ b/source/blender/makesrna/intern/SConscript @@ -143,7 +143,6 @@ if env['WITH_BF_CYCLES']: 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'] diff --git a/source/blender/nodes/SConscript b/source/blender/nodes/SConscript index 9a72ab28c03..fd4ed027f21 100644 --- a/source/blender/nodes/SConscript +++ b/source/blender/nodes/SConscript @@ -69,10 +69,6 @@ if env['WITH_BF_PYTHON']: 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'] diff --git a/source/blender/render/SConscript b/source/blender/render/SConscript index 109558c71ce..4303a51f983 100644 --- a/source/blender/render/SConscript +++ b/source/blender/render/SConscript @@ -83,7 +83,6 @@ if env['OURPLATFORM'] == 'linux': 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']: diff --git a/source/blender/windowmanager/SConscript b/source/blender/windowmanager/SConscript index 62c00c0897d..89da9abaa8f 100644 --- a/source/blender/windowmanager/SConscript +++ b/source/blender/windowmanager/SConscript @@ -65,10 +65,6 @@ if env['WITH_BF_PYTHON']: 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' |