diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2008-10-06 01:36:36 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2008-10-06 01:36:36 +0400 |
| commit | 9d77cc922225f5a3409c4a734c30836069efea17 (patch) | |
| tree | ac6ae92a6e7e9a1ec8bc6825cefcd0d71a45cdb7 | |
| parent | 7bdb62900988b23a244ddcee516554d9f2916b85 (diff) | |
* use env.Clone() instead of deprecated env.Copy()
| -rw-r--r-- | source/blender/makesdna/intern/SConscript | 4 | ||||
| -rw-r--r-- | tools/Blender.py | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/makesdna/intern/SConscript b/source/blender/makesdna/intern/SConscript index 762f999fac6..417c6e8feb1 100644 --- a/source/blender/makesdna/intern/SConscript +++ b/source/blender/makesdna/intern/SConscript @@ -9,8 +9,8 @@ root_build_dir=env['BF_BUILDDIR'] source_files = ['makesdna.c'] -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/tools/Blender.py b/tools/Blender.py index 47bc5e9fa72..228f5cb6edc 100644 --- a/tools/Blender.py +++ b/tools/Blender.py @@ -390,7 +390,7 @@ class BlenderEnvironment(SConsEnvironment): self.Exit() print bc.HEADER+'Configuring resource '+bc.ENDC+bc.OKGREEN+libname+bc.ENDC - lenv = self.Copy() + lenv = self.Clone() res = lenv.RES('#'+root_build_dir+'lib/'+libname, source) SConsEnvironment.Default(self, res) @@ -405,7 +405,7 @@ class BlenderEnvironment(SConsEnvironment): print bc.HEADER+'Configuring library '+bc.ENDC+bc.OKGREEN+libname +bc.ENDC+bc.OKBLUE+ " (debug mode)" + bc.ENDC else: print bc.HEADER+'Configuring library '+bc.ENDC+bc.OKGREEN+libname + bc.ENDC - lenv = self.Copy() + lenv = self.Clone() lenv.Append(CPPPATH=includes) lenv.Append(CPPDEFINES=defines) if lenv['WITH_BF_GAMEENGINE']: @@ -439,7 +439,7 @@ class BlenderEnvironment(SConsEnvironment): def BlenderProg(self=None, builddir=None, progname=None, sources=None, includes=None, libs=None, libpath=None, binarykind=''): print bc.HEADER+'Configuring program '+bc.ENDC+bc.OKGREEN+progname+bc.ENDC - lenv = self.Copy() + lenv = self.Clone() if lenv['OURPLATFORM'] in ['win32-vc', 'cygwin']: lenv.Append(LINKFLAGS = Split(lenv['PLATFORM_LINKFLAGS'])) if lenv['BF_DEBUG']: |