diff options
Diffstat (limited to 'source/blender/makesrna/intern/SConscript')
| -rw-r--r-- | source/blender/makesrna/intern/SConscript | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/source/blender/makesrna/intern/SConscript b/source/blender/makesrna/intern/SConscript index 46f748f7c7c..a8cc452d350 100644 --- a/source/blender/makesrna/intern/SConscript +++ b/source/blender/makesrna/intern/SConscript @@ -11,17 +11,15 @@ defines = [] root_build_dir=normpath(env['BF_BUILDDIR']) source_files = env.Glob('*.c') - -# making rna_access.c part of both makesrna and blender seems to -# give conflict, how to solve? source_files.remove('rna_access.c') generated_files = source_files[:] generated_files.remove('rna_define.c') generated_files.remove('makesrna.c') - generated_files = [filename[:-2] + '_gen.c' for filename in generated_files] +source_files.extend(env.Glob('../../editors/*/*_api.c')) + makesrna_tool = env.Clone() rna = env.Clone() makesrna_tool.Append(CCFLAGS = '-DBASE_HEADER="\\"source/blender/makesrna/\\"" ') @@ -32,7 +30,7 @@ makesrna_tool.Append (CPPPATH = ['#/intern/guardedalloc', '../../makesdna', '../../makesrna', '../../windowmanager', - '../../editors']) + '../../editors/include']) if env['OURPLATFORM'] == 'linuxcross': USE_WINE = True # when cross compiling on linux 64bit this is useful |