diff --git a/atom.gyp b/atom.gyp index c263e42a5b..07f857b80b 100644 --- a/atom.gyp +++ b/atom.gyp @@ -379,9 +379,10 @@ '<(libchromiumcontent_resources_dir)/ui_resources_200_percent.pak', '<(libchromiumcontent_resources_dir)/webkit_resources_200_percent.pak', 'external_binaries/d3dcompiler_43.dll', + 'external_binaries/msvcp120.dll', + 'external_binaries/msvcr120.dll', + 'external_binaries/vccorlib120.dll', 'external_binaries/xinput1_3.dll', - 'vendor/third_party/microsoft/msvcp100.dll', - 'vendor/third_party/microsoft/msvcr100.dll', ], }, { diff --git a/script/create-dist.py b/script/create-dist.py index b1cfc28796..2a91fd927b 100755 --- a/script/create-dist.py +++ b/script/create-dist.py @@ -36,12 +36,15 @@ TARGET_BINARIES = { 'atom.exe', 'chromiumcontent.dll', 'content_shell.pak', + 'd3dcompiler_43.dll', 'ffmpegsumo.dll', 'icudtl.dat', 'libEGL.dll', 'libGLESv2.dll', - 'd3dcompiler_43.dll', + 'msvcp120.dll', + 'msvcr120.dll', 'ui_resources_200_percent.pak', + 'vccorlib120.dll', 'webkit_resources_200_percent.pak', 'xinput1_3.dll', ], diff --git a/script/update-external-binaries.py b/script/update-external-binaries.py index 5d8014f55c..8b7c15bbd3 100755 --- a/script/update-external-binaries.py +++ b/script/update-external-binaries.py @@ -4,10 +4,10 @@ import errno import sys import os -from lib.util import safe_mkdir, extract_zip, tempdir, download +from lib.util import safe_mkdir, rm_rf, extract_zip, tempdir, download -VERSION = 'v0.0.3' +VERSION = 'v0.1.0' SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__))) FRAMEWORKS_URL = 'https://github.com/atom/atom-shell-frameworks/releases' \ '/download/' + VERSION @@ -17,10 +17,12 @@ def main(): os.chdir(SOURCE_ROOT) version_file = os.path.join(SOURCE_ROOT, 'external_binaries', '.version') - safe_mkdir('external_binaries') if (is_updated(version_file, VERSION)): return + rm_rf('external_binaries') + safe_mkdir('external_binaries') + with open(version_file, 'w') as f: f.write(VERSION) @@ -30,6 +32,7 @@ def main(): download_and_unzip('Squirrel') elif sys.platform in ['cygwin', 'win32']: download_and_unzip('directxsdk') + download_and_unzip('vs2012_crt') def is_updated(version_file, version): diff --git a/vendor/third_party/microsoft/msvcp100.dll b/vendor/third_party/microsoft/msvcp100.dll deleted file mode 100644 index 0285593bfc..0000000000 Binary files a/vendor/third_party/microsoft/msvcp100.dll and /dev/null differ diff --git a/vendor/third_party/microsoft/msvcr100.dll b/vendor/third_party/microsoft/msvcr100.dll deleted file mode 100644 index 6d6af7ebef..0000000000 Binary files a/vendor/third_party/microsoft/msvcr100.dll and /dev/null differ