[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16939] branches/blender2.5/blender: * use env.Clone() instead of deprecated env.Copy()
Nathan Letwory
jesterking at letwory.net
Sun Oct 5 23:36:36 CEST 2008
Revision: 16939
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16939
Author: jesterking
Date: 2008-10-05 23:36:36 +0200 (Sun, 05 Oct 2008)
Log Message:
-----------
* use env.Clone() instead of deprecated env.Copy()
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/makesdna/intern/SConscript
branches/blender2.5/blender/tools/Blender.py
Modified: branches/blender2.5/blender/source/blender/makesdna/intern/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/makesdna/intern/SConscript 2008-10-05 21:33:23 UTC (rev 16938)
+++ branches/blender2.5/blender/source/blender/makesdna/intern/SConscript 2008-10-05 21:36:36 UTC (rev 16939)
@@ -9,8 +9,8 @@
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',
Modified: branches/blender2.5/blender/tools/Blender.py
===================================================================
--- branches/blender2.5/blender/tools/Blender.py 2008-10-05 21:33:23 UTC (rev 16938)
+++ branches/blender2.5/blender/tools/Blender.py 2008-10-05 21:36:36 UTC (rev 16939)
@@ -390,7 +390,7 @@
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 @@
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 @@
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']:
More information about the Bf-blender-cvs
mailing list