diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-08-25 08:30:47 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-08-25 08:30:47 +0400 |
| commit | 4b40d73bfbd5ff67db727746b992a66c910a9cac (patch) | |
| tree | d0b34dbad815103c815b041d4dc9051e0e7a4800 /source | |
| parent | b54d16858f54452361921629a150b5115235c5fa (diff) | |
rename most scons build targets to match cmake
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/makesdna/intern/SConscript | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/SConscript | 4 | ||||
| -rw-r--r-- | source/blender/modifiers/SConscript | 2 | ||||
| -rw-r--r-- | source/blender/python/SConscript | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/makesdna/intern/SConscript b/source/blender/makesdna/intern/SConscript index 116a9c40973..78f5fcaba69 100644 --- a/source/blender/makesdna/intern/SConscript +++ b/source/blender/makesdna/intern/SConscript @@ -50,7 +50,7 @@ targetdir = normpath(root_build_dir + '/makesdna') if not (root_build_dir[0]==os.sep or root_build_dir[1]==':'): targetdir = '#' + targetdir -makesdna = makesdna_tool.Program (target = targetdir, source = source_files, LIBS=['bf_guardedalloc', 'bf_blenlib']) +makesdna = makesdna_tool.Program (target = targetdir, source = source_files, LIBS=['bf_intern_guardedalloc', 'bf_blenlib']) dna_dict = dna.Dictionary() dna.Depends ('dna.c', makesdna) diff --git a/source/blender/makesrna/intern/SConscript b/source/blender/makesrna/intern/SConscript index fec4b1e693d..32ff64e609f 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) diff --git a/source/blender/modifiers/SConscript b/source/blender/modifiers/SConscript index dc1598fa6e9..78ee16a3690 100644 --- a/source/blender/modifiers/SConscript +++ b/source/blender/modifiers/SConscript @@ -15,6 +15,6 @@ defs = [] if env['BF_NO_ELBEEM']: defs.append('DISABLE_ELBEEM') -env.BlenderLib ( libname = 'modifiers', sources = sources, +env.BlenderLib ( libname = 'bf_modifiers', sources = sources, includes = Split(incs), defines=defs, libtype=['core','player'], priority = [180, 20] ) diff --git a/source/blender/python/SConscript b/source/blender/python/SConscript index f062f64249c..097f69155d5 100644 --- a/source/blender/python/SConscript +++ b/source/blender/python/SConscript @@ -21,4 +21,4 @@ env.BlenderLib( libname = 'bf_python', sources = Split(sources), includes = Spli # generic sources = env.Glob('generic/*.c') -env.BlenderLib( libname = 'bf_gen_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core','player'], priority = [362,165]) # ketsji is 360 +env.BlenderLib( libname = 'bf_python_ext', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core','player'], priority = [362,165]) # ketsji is 360 |