Merge pull request #5538 from electron/vs2015-runtime
Ship with runtime libraries of Visual Studio 2015
This commit is contained in:
commit
195a4bb3c1
4 changed files with 9 additions and 9 deletions
|
@ -157,9 +157,9 @@
|
|||
'<(libchromiumcontent_dir)/snapshot_blob.bin',
|
||||
'external_binaries/d3dcompiler_47.dll',
|
||||
'external_binaries/xinput1_3.dll',
|
||||
'external_binaries/msvcp120.dll',
|
||||
'external_binaries/msvcr120.dll',
|
||||
'external_binaries/vccorlib120.dll',
|
||||
'external_binaries/msvcp140.dll',
|
||||
'external_binaries/vccorlib140.dll',
|
||||
'external_binaries/vcruntime140.dll',
|
||||
],
|
||||
},
|
||||
],
|
||||
|
|
|
@ -122,7 +122,7 @@ def check_root():
|
|||
|
||||
|
||||
def update_submodules():
|
||||
execute_stdout(['git', 'submodule', 'sync'])
|
||||
execute_stdout(['git', 'submodule', 'sync', '--recursive'])
|
||||
execute_stdout(['git', 'submodule', 'update', '--init', '--recursive'])
|
||||
|
||||
|
||||
|
|
|
@ -36,8 +36,7 @@ TARGET_BINARIES = {
|
|||
'icudtl.dat',
|
||||
'libEGL.dll',
|
||||
'libGLESv2.dll',
|
||||
'msvcp120.dll',
|
||||
'msvcr120.dll',
|
||||
'msvcp140.dll',
|
||||
'ffmpeg.dll',
|
||||
'node.dll',
|
||||
'content_resources_200_percent.pak',
|
||||
|
@ -45,7 +44,8 @@ TARGET_BINARIES = {
|
|||
'xinput1_3.dll',
|
||||
'natives_blob.bin',
|
||||
'snapshot_blob.bin',
|
||||
'vccorlib120.dll',
|
||||
'vccorlib140.dll',
|
||||
'vcruntime140.dll',
|
||||
],
|
||||
'linux': [
|
||||
PROJECT_NAME, # 'electron'
|
||||
|
|
|
@ -8,7 +8,7 @@ from lib.config import get_target_arch
|
|||
from lib.util import safe_mkdir, rm_rf, extract_zip, tempdir, download
|
||||
|
||||
|
||||
VERSION = 'v0.8.0'
|
||||
VERSION = 'v1.0.0'
|
||||
SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
|
||||
FRAMEWORKS_URL = 'http://github.com/atom/atom-shell-frameworks/releases' \
|
||||
'/download/' + VERSION
|
||||
|
@ -30,7 +30,7 @@ def main():
|
|||
download_and_unzip('Squirrel')
|
||||
elif sys.platform in ['cygwin', 'win32']:
|
||||
download_and_unzip('directxsdk-' + get_target_arch())
|
||||
download_and_unzip('vs2012-crt-' + get_target_arch())
|
||||
download_and_unzip('vs2015-crt-' + get_target_arch())
|
||||
|
||||
with open(version_file, 'w') as f:
|
||||
f.write(VERSION)
|
||||
|
|
Loading…
Reference in a new issue