Merged changes in the trunk up to revision 55357.
[blender-staging.git] / source / blender / blenlib / SConscript
index 2be06f7311da684e3d0ae4ddbe0be7b396864525..79e2a47aeb836a5d221a8715a206c2a5f6592d1b 100644 (file)
@@ -31,12 +31,15 @@ sources = env.Glob('intern/*.c')
 
 cflags=''
 # don't add ../blenkernel back!
-incs = '. ../makesdna #/intern/guardedalloc #/intern/ghost'
+incs = '. ../makesdna #/intern/guardedalloc #/intern/ghost #/extern/wcwidth'
 
 incs += ' ' + env['BF_FREETYPE_INC']
 incs += ' ' + env['BF_ZLIB_INC']
 defs = []
 
+if env['WITH_BF_FREESTYLE']:
+    defs.append('WITH_FREESTYLE')
+
 if env['WITH_BF_BINRELOC']:
     cflags='-pthread'
     incs += ' ../../../extern/binreloc/include'