Merged changes in the trunk up to revision 54110.
[blender.git] / source / blender / makesrna / intern / SConscript
index 33d43e1e019e4aca1ccfbeca74a9427c62c46930..e159b9fd8ebe050552f5aed6d4bc0b54f795a3c8 100644 (file)
@@ -38,6 +38,8 @@ root_build_dir=normpath(env['BF_BUILDDIR'])
 
 source_files = env.Glob('*.c')
 source_files.remove('rna_access.c')
+if not env['WITH_BF_FREESTYLE']:
+    source_files.remove('rna_linestyle.c')
 
 generated_files = source_files[:]
 generated_files.remove('rna_define.c')
@@ -136,6 +138,10 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', '
 if env['WITH_BF_INTERNATIONAL']:
     defs.append('WITH_INTERNATIONAL')
 
+if env['WITH_BF_FREESTYLE']:
+    defs.append('WITH_FREESTYLE')
+    incs += ' ../../freestyle'
+
 if not env['BF_DEBUG']:
     defs.append('NDEBUG')