From c5613de2d5664bd37ef0ceb2343050f314d6345a Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Tue, 7 Dec 2010 08:37:00 +0000 Subject: Remove redundant VC_REDIST code, since it's not used anymore. --- build_files/scons/tools/btools.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'build_files/scons/tools') diff --git a/build_files/scons/tools/btools.py b/build_files/scons/tools/btools.py index bc0beb422f0..1d716f9a093 100644 --- a/build_files/scons/tools/btools.py +++ b/build_files/scons/tools/btools.py @@ -92,8 +92,7 @@ def validate_arguments(args, bc): 'WITH_BF_RAYOPTIMIZATION', 'BF_RAYOPTIMIZATION_SSE_FLAGS', 'BF_NO_ELBEEM', - 'WITH_BF_CXX_GUARDEDALLOC', - 'BF_VCREDIST' # Windows-only, and useful only when creating installer + 'WITH_BF_CXX_GUARDEDALLOC' ] # Have options here that scons expects to be lists @@ -454,8 +453,7 @@ def read_opts(env, cfg, args): (BoolVariable('WITH_BF_RAYOPTIMIZATION', 'Enable raytracer SSE/SIMD optimization.', False)), ('BF_RAYOPTIMIZATION_SSE_FLAGS', 'SSE flags', ''), - (BoolVariable('WITH_BF_CXX_GUARDEDALLOC', 'Enable GuardedAlloc for C++ memory allocation tracking.', False)), - ('BF_VCREDIST', 'Full path to vcredist', '') + (BoolVariable('WITH_BF_CXX_GUARDEDALLOC', 'Enable GuardedAlloc for C++ memory allocation tracking.', False)) ) # end of opts.AddOptions() return localopts @@ -547,12 +545,6 @@ def NSIS_Installer(target=None, source=None, env=None): ns_cnt = string.replace(ns_cnt, "[DODATAFILES]", datafiles) - # Setup vcredist part - vcredist = "File \""+env['BF_VCREDIST'] + "\"\n" - vcredist += " ExecWait '\"$TEMP\\" + os.path.basename(env['BF_VCREDIST']) + "\" /q'\n" - vcredist += " Delete \"$TEMP\\" + os.path.basename(env['BF_VCREDIST'])+"\"" - ns_cnt = string.replace(ns_cnt, "[VCREDIST]", vcredist) - tmpnsi = os.path.normpath(install_base_dir+os.sep+env['BF_BUILDDIR']+os.sep+"00.blender_tmp.nsi") new_nsis = open(tmpnsi, 'w') new_nsis.write(ns_cnt) -- cgit v1.2.3