diff options
author | Nathan Letwory <nathan@letworyinteractive.com> | 2008-11-07 22:21:52 +0300 |
---|---|---|
committer | Nathan Letwory <nathan@letworyinteractive.com> | 2008-11-07 22:21:52 +0300 |
commit | 6eaaf2ce7254235081d21cde3f2815f8050faf21 (patch) | |
tree | 47562719f6b91648c53f2e7670c5efd5b38c198d /source/blender | |
parent | 7e8ba5c84d4d35fe6ee4e3d73d08265ae931e2d3 (diff) |
=== SCons ===
* merge the recent scons changes from trunk, so this means that the same rules now apply:
- scons-local available
- platform default configs updated
- check your user-config.py if you have made a full copy of default config
Note: BGE and blenderplayer still not working, but that is normal ;) (so turn them off!)
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/makesdna/intern/SConscript | 4 | ||||
-rw-r--r-- | source/blender/makesrna/intern/SConscript | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/makesdna/intern/SConscript b/source/blender/makesdna/intern/SConscript index 65072d1fed2..23d6f84942f 100644 --- a/source/blender/makesdna/intern/SConscript +++ b/source/blender/makesdna/intern/SConscript @@ -10,8 +10,8 @@ root_build_dir=env['BF_BUILDDIR'] source_files = ['makesdna.c'] header_files = env.Glob('../*.h') -makesdna_tool = env.Copy() -dna = env.Copy() +makesdna_tool = env.Clone() +dna = env.Clone() makesdna_tool.Append(CCFLAGS = '-DBASE_HEADER="\\"source/blender/makesdna/\\"" ') makesdna_tool.Append (CPPPATH = ['#/intern/guardedalloc', diff --git a/source/blender/makesrna/intern/SConscript b/source/blender/makesrna/intern/SConscript index 01fbbb9856e..f8d623dfa2b 100644 --- a/source/blender/makesrna/intern/SConscript +++ b/source/blender/makesrna/intern/SConscript @@ -14,8 +14,8 @@ source_files = env.Glob('*.c') source_files.remove('rna_access.c') source_files.remove('rna_dependency.c') -makesrna_tool = env.Copy() -rna = env.Copy() +makesrna_tool = env.Clone() +rna = env.Clone() makesrna_tool.Append(CCFLAGS = '-DBASE_HEADER="\\"source/blender/makesrna/\\"" ') makesrna_tool.Append (CPPPATH = ['#/intern/guardedalloc', |