diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2010-09-07 09:47:34 +0400 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2010-09-07 09:47:34 +0400 |
| commit | 82432d0d99f2101ee2ceba86bdc49669b5fa306f (patch) | |
| tree | ada47d0a65cb7614ead93fcdbb3421e5398ff3dc /source/blender/makesrna/intern/SConscript | |
| parent | 859c5a42f0fe8b9bec0d3ddce1612942942619a7 (diff) | |
| parent | 8a320974f1b3e6004db3b3ad64f97742f878cbee (diff) | |
merge from trunk at r31523
Diffstat (limited to 'source/blender/makesrna/intern/SConscript')
| -rw-r--r-- | source/blender/makesrna/intern/SConscript | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/SConscript b/source/blender/makesrna/intern/SConscript index cdb9cdd3126..88b29e10d1d 100644 --- a/source/blender/makesrna/intern/SConscript +++ b/source/blender/makesrna/intern/SConscript @@ -138,9 +138,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', 'bf_blenlib']) + makesrna = makesrna_tool.Program (target = targetpath, source = source_files, LIBS=['bf_intern_guardedalloc', 'bf_dna', 'bf_blenlib']) else: - makesrna = makesrna_tool.Program (target = targetpath, source = source_files, LIBS=['bf_guardedalloc', 'bf_dna', 'bf_blenlib']) + makesrna = makesrna_tool.Program (target = targetpath, source = source_files, LIBS=['bf_intern_guardedalloc', 'bf_dna', 'bf_blenlib']) rna_dict = rna.Dictionary() rna.Depends (generated_files, makesrna) |