diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-04-08 20:40:46 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-04-08 20:40:46 +0400 |
commit | 9b3b52dfd6229d5456d818e2b919acae9d6ab47b (patch) | |
tree | 32d2c028986cb56b921da16b5fffbd20ae56a49f /source/blender/makesrna/intern/SConscript | |
parent | 4b2072bec302c9e0b38337eebd0ba9ad9933841a (diff) |
RNA:
* Added the build system code to compile files named
editors/*/*_api.c into the makesrna preprocessing.
The reason to do this is to keep operators and API
close together, but it doesn't fit well with the build
system, especially Makefiles use an ugly hack here.
* Some fixes to pass an RNA AnyType through the API,
this will give a PointerRNA, for use in the interface
code for example.
* Added RNA wrapping of some UI template code as a test.
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 |