Merged changes in the trunk up to revision 54110.
[blender.git] / source / blender / blenkernel / SConscript
index e53e4724071e765344b40522dc3305fbd39e2f41..bcdf37da1047627a598ccfe40fdfe077f92ac4d0 100644 (file)
@@ -148,6 +148,12 @@ if env['WITH_BF_FFTW3']:
 if env['WITH_BF_INTERNATIONAL']:
     defs.append('WITH_INTERNATIONAL')
 
+if env['WITH_BF_FREESTYLE']:
+    defs.append('WITH_FREESTYLE')
+    incs += ' ../freestyle'
+else:
+    sources.remove(os.path.join('intern', 'linestyle.c'))
+
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
     incs += ' ' + env['BF_PTHREADS_INC']