forked from bartvdbraak/blender
Remove redundant VC_REDIST code, since it's not used anymore.
This commit is contained in:
parent
8d284b7d02
commit
c5613de2d5
@ -92,8 +92,7 @@ def validate_arguments(args, bc):
|
|||||||
'WITH_BF_RAYOPTIMIZATION',
|
'WITH_BF_RAYOPTIMIZATION',
|
||||||
'BF_RAYOPTIMIZATION_SSE_FLAGS',
|
'BF_RAYOPTIMIZATION_SSE_FLAGS',
|
||||||
'BF_NO_ELBEEM',
|
'BF_NO_ELBEEM',
|
||||||
'WITH_BF_CXX_GUARDEDALLOC',
|
'WITH_BF_CXX_GUARDEDALLOC'
|
||||||
'BF_VCREDIST' # Windows-only, and useful only when creating installer
|
|
||||||
]
|
]
|
||||||
|
|
||||||
# Have options here that scons expects to be lists
|
# 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)),
|
(BoolVariable('WITH_BF_RAYOPTIMIZATION', 'Enable raytracer SSE/SIMD optimization.', False)),
|
||||||
('BF_RAYOPTIMIZATION_SSE_FLAGS', 'SSE flags', ''),
|
('BF_RAYOPTIMIZATION_SSE_FLAGS', 'SSE flags', ''),
|
||||||
(BoolVariable('WITH_BF_CXX_GUARDEDALLOC', 'Enable GuardedAlloc for C++ memory allocation tracking.', False)),
|
(BoolVariable('WITH_BF_CXX_GUARDEDALLOC', 'Enable GuardedAlloc for C++ memory allocation tracking.', False))
|
||||||
('BF_VCREDIST', 'Full path to vcredist', '')
|
|
||||||
) # end of opts.AddOptions()
|
) # end of opts.AddOptions()
|
||||||
|
|
||||||
return localopts
|
return localopts
|
||||||
@ -547,12 +545,6 @@ def NSIS_Installer(target=None, source=None, env=None):
|
|||||||
|
|
||||||
ns_cnt = string.replace(ns_cnt, "[DODATAFILES]", datafiles)
|
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")
|
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 = open(tmpnsi, 'w')
|
||||||
new_nsis.write(ns_cnt)
|
new_nsis.write(ns_cnt)
|
||||||
|
Loading…
Reference in New Issue
Block a user