diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2010-03-09 07:32:40 +0300 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2010-03-09 07:32:40 +0300 |
| commit | 71003b9bcc88ecf6138c3debb9abba4637c8e61a (patch) | |
| tree | 7f85d40231311a36a72f731a7c07b8dbd6fff577 /source/blender/makesrna/intern/SConscript | |
| parent | ea540496c8281dcba899fb6b29c1bcfbb53a0482 (diff) | |
| parent | 790d6ca256e6b572826b2bf214c6fd6c8a623969 (diff) | |
merge with trunk at r27259 and commit of a patch by anthony jones to fix msvc (though further work may be needed because changes made by the merge
Diffstat (limited to 'source/blender/makesrna/intern/SConscript')
| -rw-r--r-- | source/blender/makesrna/intern/SConscript | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/SConscript b/source/blender/makesrna/intern/SConscript index c0a9089ab29..d757f6293a0 100644 --- a/source/blender/makesrna/intern/SConscript +++ b/source/blender/makesrna/intern/SConscript @@ -75,6 +75,8 @@ if env['WITH_BF_JACK']: if env['BF_UNIT_TEST']: defs.append('UNIT_TEST') +if not env['WITH_BF_PYTHON']: + defs.append('DISABLE_PYTHON') if env['OURPLATFORM'] == 'linux2': cflags='-pthread' @@ -126,9 +128,9 @@ if not (root_build_dir[0]==os.sep or root_build_dir[1]==':'): targetpath = '#' + targetpath if env['OURPLATFORM'] == 'linux2' and root_build_dir[0]==os.sep: - makesrna = makesrna_tool.Program (target = targetpath, source = source_files, LIBS=['bf_guardedalloc', 'bf_dna']) + makesrna = makesrna_tool.Program (target = targetpath, source = source_files, LIBS=['bf_guardedalloc', 'bf_dna', 'bf_blenlib']) else: - makesrna = makesrna_tool.Program (target = targetpath, source = source_files, LIBS=['bf_guardedalloc', 'bf_dna']) + makesrna = makesrna_tool.Program (target = targetpath, source = source_files, LIBS=['bf_guardedalloc', 'bf_dna', 'bf_blenlib']) rna_dict = rna.Dictionary() rna.Depends (generated_files, makesrna) |