Fixing scons compile on windows.

Since bli_threads.h now includes pthreads directly, we need to had instructions in SConscripts everywhere for proper include path.

Frankly, I feel like this should be done in a global manner and not in a per lib fashion, but that is for another day.

This commit also fixes more missing properties

diff --git a/source/blender/blenpluginapi/SConscript b/source/blender/blenpluginapi/SConscript
index af69b4519b4cd04ed02a4f24259fcc74faa446a1..b310bcb95ec5e033457c1b3ff6393d82a7070617 100644 (file)
--- a/source/blender/blenpluginapi/SConscript
+++ b/source/blender/blenpluginapi/SConscript
@@ -11,4 +11,11 @@ if env['WITH_BF_QUICKTIME']:
        defs.append('WITH_QUICKTIME')
        incs += ' ' + env['BF_QUICKTIME_INC']
 
+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']
+
 env.BlenderLib ( libname = 'bf_blenpluginapi', sources = sources, includes = Split(incs), defines = defs, libtype=['core'], priority = [170] )

diff --git a/source/blender/editors/armature/SConscript b/source/blender/editors/armature/SConscript
index f96d25b0fe0d1b372f9d8a9c8f4b236aefbd85c0..a7fa9d7071f7674430bc1390161cad0ce99a48ee 100644 (file)
--- a/source/blender/editors/armature/SConscript
+++ b/source/blender/editors/armature/SConscript
@@ -8,4 +8,11 @@ incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
 incs += ' ../../render/extern/include #/intern/guardedalloc'
 incs += ' ../../gpu ../../makesrna #/intern/opennl/extern'
 
+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']
+
 env.BlenderLib ( 'bf_editors_armature', sources, Split(incs), [], libtype=['core'], priority=[44] )

diff --git a/source/blender/editors/mesh/SConscript b/source/blender/editors/mesh/SConscript
index df1f297698d337fb3763b0a740dcfbe2f84fa560..00391b3474a369bcd015e8ec57b28955ec9424c9 100644 (file)
--- a/source/blender/editors/mesh/SConscript
+++ b/source/blender/editors/mesh/SConscript
@@ -8,4 +8,11 @@ incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
 incs += ' #/intern/guardedalloc ../../gpu'
 incs += ' ../../makesrna ../../render/extern/include  #/intern/elbeem/extern'
 
+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']
+
 env.BlenderLib ( 'bf_editors_mesh', sources, Split(incs), [], libtype=['core'], priority=[45] )

diff --git a/source/blender/editors/physics/SConscript b/source/blender/editors/physics/SConscript
index 5718ae0c2173e2142a5bd1ba2f95898701302079..60b992d2e07a559d0fcbdc1bfa07b74529a7009d 100644 (file)
--- a/source/blender/editors/physics/SConscript
+++ b/source/blender/editors/physics/SConscript
@@ -8,4 +8,11 @@ incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
 incs += ' #/intern/guardedalloc ../../gpu'
 incs += ' ../../makesrna ../../render/extern/include  #/intern/elbeem/extern'
 
+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']
+
 env.BlenderLib ( 'bf_editors_physics', sources, Split(incs), [], libtype=['core'], priority=[45] )

diff --git a/source/blender/editors/render/SConscript b/source/blender/editors/render/SConscript
index cca2ab9b2ab8a807a94833569e0e7644af11a614..bddc5ed10e032ad6b21805031d122553071525d4 100644 (file)
--- a/source/blender/editors/render/SConscript
+++ b/source/blender/editors/render/SConscript
@@ -9,4 +9,11 @@ incs += ' #/intern/guardedalloc ../../gpu'
 incs += ' ../../makesrna ../../render/extern/include  #/intern/elbeem/extern'
 incs += ' ../../blenloader'
 
+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']
+
 env.BlenderLib ( 'bf_editors_render', sources, Split(incs), [], libtype=['core'], priority=[45] )

diff --git a/source/blender/editors/screen/SConscript b/source/blender/editors/screen/SConscript
index a4f73cfea7e2286108e43704bca9871fd62a5f99..847a1cddfb47ac5222840c7883a8ad7e32c6bd9d 100644 (file)
--- a/source/blender/editors/screen/SConscript
+++ b/source/blender/editors/screen/SConscript
@@ -15,4 +15,11 @@ if not env['WITH_BF_PYTHON']:
 if env['WITH_BF_OPENEXR']:
        defs += ' WITH_OPENEXR'
 
+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']
+
 env.BlenderLib ( 'bf_editors_screen', sources, Split(incs), Split(defs), libtype=['core'], priority=[105] )

diff --git a/source/blender/editors/sculpt_paint/SConscript b/source/blender/editors/sculpt_paint/SConscript
index 01e1d80c24c409e437a80658f881a0cf0fb9f256..3d2ea89f506341bbf1528e3e8b536e6956f39b9f 100644 (file)
--- a/source/blender/editors/sculpt_paint/SConscript
+++ b/source/blender/editors/sculpt_paint/SConscript
@@ -8,4 +8,11 @@ incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
 incs += ' ../../render/extern/include #/intern/guardedalloc'
 incs += ' ../../gpu ../../makesrna'
 
+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']
+
 env.BlenderLib ( 'bf_editors_sculpt_paint', sources, Split(incs), [], libtype=['core'], priority=[40] )

diff --git a/source/blender/editors/space_file/SConscript b/source/blender/editors/space_file/SConscript
index e6fba38fb8fbdaad6d055c5378cc34692d0d5564..b22a265dcbc05df02a3ee7136da0dc5abaf9aa98 100644 (file)
--- a/source/blender/editors/space_file/SConscript
+++ b/source/blender/editors/space_file/SConscript
@@ -15,4 +15,11 @@ if env['WITH_BF_OPENJPEG']:
 if env['WITH_BF_OPENEXR']:
        defs.append('WITH_OPENEXR')
 
+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']
+    
 env.BlenderLib ( 'bf_editors_space_file', sources, Split(incs), defs, libtype=['core'], priority=[115] )

diff --git a/source/blender/editors/space_node/SConscript b/source/blender/editors/space_node/SConscript
index 5453aa7dd44235f09e43222261e6e5e4b8e2111d..fd0dfe83852c9462455288b11b5c6008b8414f99 100644 (file)
--- a/source/blender/editors/space_node/SConscript
+++ b/source/blender/editors/space_node/SConscript
@@ -14,5 +14,12 @@ if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
 if env['CC'] == 'gcc':
        #cf.append('-Werror')
        pass
-       
+
+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']
+
 env.BlenderLib ( 'bf_editors_space_node', sources, Split(incs), defs, libtype=['core'], priority=[55], compileflags=cf )

diff --git a/source/blender/makesrna/SConscript b/source/blender/makesrna/SConscript
index 8fc9df0fbf63c657f0287c5ce94c301e7761c429..72dc6be683c291d0d9ddd47ec41c5677602c83d1 100644 (file)
--- a/source/blender/makesrna/SConscript
+++ b/source/blender/makesrna/SConscript
@@ -40,4 +40,12 @@ if env['WITH_BF_GAMEENGINE']:
 if env['BF_UNIT_TEST']:
        defs.append('UNIT_TEST')
 
+
+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']
+
 env.BlenderLib ( 'bf_rna', objs, Split(incs), defines=defs, libtype=['core','player'], priority = [165,20] )

diff --git a/source/blender/makesrna/intern/SConscript b/source/blender/makesrna/intern/SConscript
index 0f8bc752f090f0a166ce02fdee791e6dad2fa8e7..c63b63ce5f7302f25987f25965f22fb937aa03f1 100644 (file)
--- a/source/blender/makesrna/intern/SConscript
+++ b/source/blender/makesrna/intern/SConscript
@@ -74,6 +74,14 @@ if env['WITH_BF_JACK']:
 if env['BF_UNIT_TEST']:
        defs.append('UNIT_TEST')
 
+
+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']
+
 makesrna_tool.Append(CPPDEFINES=defs)
 
 makesrna_tool.Append (CPPPATH = Split(incs))
@@ -126,7 +134,7 @@ rna.Depends (generated_files, makesrna)
 
 # this seems bad, how to retrieve it from scons?
 build_dir = root_build_dir + os.sep +'source' + os.sep + 'blender' + os.sep + 'makesrna' + os.sep + 'intern' + os.sep
-
+       
 if env['OURPLATFORM'] != 'linuxcross':
        if env['OURPLATFORM'] in ('win32-vc', 'win64-vc', 'win32-mingw'):
                rna.Command (generated_files, '', "\"" + root_build_dir+os.sep+"makesrna.exe\" \""  + build_dir )

diff --git a/source/blender/nodes/SConscript b/source/blender/nodes/SConscript
index 771ce42e1dc3312944bfe61887c256bfeabea94e..01319dc1eb4b9a644c5226bb3b6c0cea36104e4b 100644 (file)
--- a/source/blender/nodes/SConscript
+++ b/source/blender/nodes/SConscript
@@ -38,6 +38,13 @@ if env['WITH_BF_QUICKTIME']:
        defs.append('WITH_QUICKTIME')
        incs += ' ' + env['BF_QUICKTIME_INC']
 
+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']
+
 env.BlenderLib ( libname = 'bf_nodes', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [190,105] )
 env.BlenderLib ( libname = 'bf_cmpnodes', sources = cmpsources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [175,101] )
 env.BlenderLib ( libname = 'bf_shdnodes', sources = shdsources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [175,101] )

diff --git a/source/blender/render/SConscript b/source/blender/render/SConscript
index db151775b966691edc4780eac2f767d13245a8bf..f6193c29eba78d066e5e4e8e102663cca75ddc38 100644 (file)
--- a/source/blender/render/SConscript
+++ b/source/blender/render/SConscript
@@ -23,4 +23,12 @@ if env['WITH_BF_OPENEXR']:
 if env['OURPLATFORM']=='linux2':
     cflags='-pthread'
 
+
+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']
+
 env.BlenderLib ( libname = 'bf_render', sources = sources, includes = Split(incs), defines=defs, libtype='core', priority=145, compileflags=cflags )

diff --git a/source/blender/windowmanager/SConscript b/source/blender/windowmanager/SConscript
index 91635904524c87fc47c7298a1f48ba48aa798ce8..08a291871f1398f2b558c26b0c0662e8880df2e2 100644 (file)
--- a/source/blender/windowmanager/SConscript
+++ b/source/blender/windowmanager/SConscript
@@ -19,4 +19,11 @@ defs = []
 if not env['WITH_BF_PYTHON']:
        defs.append('DISABLE_PYTHON')
 
+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']
+
 env.BlenderLib ( 'bf_windowmanager', sources, Split(incs), defs, libtype=['core'], priority=[5] )