diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-08-06 15:21:47 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-08-06 15:21:47 +0400 |
commit | ad5025ea258b0c7645e7c0da6fe37f0252599f1f (patch) | |
tree | 4d09afb79870b7365a9c6decb7afb95fd4df84c6 /source/blender/makesrna/intern/SConscript | |
parent | cf9dcb070931341612369700bc35262d87361c37 (diff) |
Fix for an link error in makesrna with SCons. Reported by Thomas Dinges, thanks!
Also removed some leftover of the Freestyle trunk merger in the makesrna subdirectory.
Diffstat (limited to 'source/blender/makesrna/intern/SConscript')
-rw-r--r-- | source/blender/makesrna/intern/SConscript | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/source/blender/makesrna/intern/SConscript b/source/blender/makesrna/intern/SConscript index 49528db0022..10b6a8c8d10 100644 --- a/source/blender/makesrna/intern/SConscript +++ b/source/blender/makesrna/intern/SConscript @@ -38,8 +38,6 @@ 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') @@ -149,10 +147,6 @@ 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']: - # TO BE REMOVED when the trunk merger is done - defs.append('WITH_FREESTYLE') - if not env['BF_DEBUG']: defs.append('NDEBUG') |