[Bf-blender-cvs] [e7644d3] hair_immediate_fixes: Fix scons build files for new hair edit code parts.

[Lukas Tönne]

Commit: e7644d3d0fd71736434bcb34a457bfafc95ff698
Author: Lukas Tönne
Date:   Fri Dec 5 16:18:57 2014 +0100
Branches: hair_immediate_fixes
https://developer.blender.org/rBe7644d3d0fd71736434bcb34a457bfafc95ff698

Fix scons build files for new hair edit code parts.

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

M	SConstruct
M	source/blender/editors/hair/SConscript

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

diff --git a/SConstruct b/SConstruct
index bdfa9dc..c3e1df6 100644
--- a/SConstruct
+++ b/SConstruct
@@ -794,6 +794,13 @@ if B.targets != ['cudakernels']:
     data_to_c_simple("release/datafiles/brushicons/fill.png")
     data_to_c_simple("release/datafiles/brushicons/flatten.png")
     data_to_c_simple("release/datafiles/brushicons/grab.png")
+    data_to_c_simple("release/datafiles/brushicons/hairadd.png")
+    data_to_c_simple("release/datafiles/brushicons/haircomb.png")
+    data_to_c_simple("release/datafiles/brushicons/haircut.png")
+    data_to_c_simple("release/datafiles/brushicons/hairlength.png")
+    data_to_c_simple("release/datafiles/brushicons/hairpuff.png")
+    data_to_c_simple("release/datafiles/brushicons/hairsmooth.png")
+    data_to_c_simple("release/datafiles/brushicons/hairweight.png")
     data_to_c_simple("release/datafiles/brushicons/inflate.png")
     data_to_c_simple("release/datafiles/brushicons/layer.png")
     data_to_c_simple("release/datafiles/brushicons/lighten.png")
diff --git a/source/blender/editors/hair/SConscript b/source/blender/editors/hair/SConscript
index ac8eaa3..2e715a0 100644
--- a/source/blender/editors/hair/SConscript
+++ b/source/blender/editors/hair/SConscript
@@ -31,18 +31,22 @@ sources = env.Glob('*.c')
 
 incs = [
     '#/intern/guardedalloc',
+    env['BF_GLEW_INC'],
+    '#/intern/glew-mx',
     '../include',
+    '../sculpt_paint',
     '../../blenfont',
     '../../blenkernel',
     '../../blenlib',
     '../../bmesh',
+    '../../gpu',
     '../../makesdna',
     '../../makesrna',
     '../../windowmanager',
     ]
 incs = ' '.join(incs)
 
-defs = []
+defs = ['BF_GL_DEFINITIONS']
 
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
     incs += ' ' + env['BF_PTHREADS_INC']