[Bf-blender-cvs] [fe059ab] hair_system: Fix for scons build files.

[Lukas Tönne]

Commit: fe059ab955c8255d5df3b9413ae7ec4b2c7887ce
Author: Lukas Tönne
Date:   Fri Aug 1 17:43:55 2014 +0200
Branches: hair_system
https://developer.blender.org/rBfe059ab955c8255d5df3b9413ae7ec4b2c7887ce

Fix for scons build files.

===================================================================

M	source/blender/SConscript
M	source/blender/blenkernel/SConscript
M	source/blender/editors/physics/SConscript
M	source/blender/editors/space_view3d/SConscript
A	source/blender/hair/SConscript
M	source/blender/modifiers/SConscript

===================================================================

diff --git a/source/blender/SConscript b/source/blender/SConscript
index de052f2..9146794 100644
--- a/source/blender/SConscript
+++ b/source/blender/SConscript
@@ -42,7 +42,8 @@ SConscript(['avi/SConscript',
             'modifiers/SConscript',
             'ikplugin/SConscript',
             'windowmanager/SConscript',
-            'blenfont/SConscript'])
+            'blenfont/SConscript',
+            'hair/SConscript'])
 
 makesrna = SConscript('makesrna/SConscript')
 
diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript
index 25f8422..383bbaf 100644
--- a/source/blender/blenkernel/SConscript
+++ b/source/blender/blenkernel/SConscript
@@ -57,6 +57,7 @@ incs = [
     '../blenloader',
     '../bmesh',
     '../gpu',
+    '../hair',
     '../ikplugin',
     '../imbuf',
     '../makesdna',
diff --git a/source/blender/editors/physics/SConscript b/source/blender/editors/physics/SConscript
index 9436280..e49e7e6 100644
--- a/source/blender/editors/physics/SConscript
+++ b/source/blender/editors/physics/SConscript
@@ -38,6 +38,7 @@ incs = [
     '../../blenfont',
     '../../blenkernel',
     '../../blenlib',
+    '../../hair',
     '../../makesdna',
     '../../makesrna',
     '../../windowmanager',
diff --git a/source/blender/editors/space_view3d/SConscript b/source/blender/editors/space_view3d/SConscript
index e6658ab..0d6f208 100644
--- a/source/blender/editors/space_view3d/SConscript
+++ b/source/blender/editors/space_view3d/SConscript
@@ -41,6 +41,7 @@ incs = [
     '../../blenlib',
     '../../bmesh',
     '../../gpu',
+    '../../hair',
     '../../imbuf',
     '../../makesdna',
     '../../makesrna',
diff --git a/source/blender/editors/physics/SConscript b/source/blender/hair/SConscript
similarity index 62%
copy from source/blender/editors/physics/SConscript
copy to source/blender/hair/SConscript
index 9436280..29f4062 100644
--- a/source/blender/editors/physics/SConscript
+++ b/source/blender/hair/SConscript
@@ -16,40 +16,44 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
-# The Original Code is Copyright (C) 2006, Blender Foundation
+# The Original Code is Copyright (C) 2014, Blender Foundation
 # All rights reserved.
 #
 # The Original Code is: all of this file.
 #
-# Contributor(s): Nathan Letwory.
+# Contributor(s): Nathan Letwory
+#                 Lukas Toenne
 #
 # ***** END GPL LICENSE BLOCK *****
 
 Import ('env')
 
-sources = env.Glob('*.c')
+sources = env.Glob('*.cpp')
+sources += env.Glob('intern/*.cpp')
 
 incs = [
+    '.',
+    './intern',
+    '../blenkernel',
+    '../blenlib',
+    '../makesdna',
     '#/intern/guardedalloc',
-    '#/intern/rigidbody',
-    '#/extern/glew/include',
-    '#/intern/elbeem/extern',
-    '../include',
-    '../../blenfont',
-    '../../blenkernel',
-    '../../blenlib',
-    '../../makesdna',
-    '../../makesrna',
-    '../../windowmanager',
     ]
 incs = ' '.join(incs)
 
-defs = []
+defs = ['HAIR_NAMESPACE=hair', 'HAIR_NAMESPACE_BEGIN=namespace hair', 'HAIR_NAMESPACE_END=}'] 
 
-if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
-    incs += ' ' + env['BF_PTHREADS_INC']
+if env['WITH_BF_PYTHON']:
+    incs += ' ' + env['BF_PYTHON_INC']
+    incs += ' ../python'
+    defs.append('WITH_PYTHON')
+    if env['BF_DEBUG']:
+        defs.append('_DEBUG')
 
 if env['WITH_BF_INTERNATIONAL']:
     defs.append('WITH_INTERNATIONAL')
 
-env.BlenderLib ( 'bf_editors_physics', sources, Split(incs), defs, libtype=['core'], priority=[45] )
+if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
+    incs += ' ' + env['BF_PTHREADS_INC']
+
+env.BlenderLib ( libname = 'bf_hair', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [160,105] )
diff --git a/source/blender/modifiers/SConscript b/source/blender/modifiers/SConscript
index 0942bca..6a3aba9 100644
--- a/source/blender/modifiers/SConscript
+++ b/source/blender/modifiers/SConscript
@@ -45,6 +45,7 @@ incs = [
     '../makesrna',
     '../blenkernel',
     '../gpu',
+    '../hair',
     env['BF_ZLIB_INC'],
     ]