Skip to content

Commit

Permalink
Merge pull request #1657 from atom/msvcrt
Browse files Browse the repository at this point in the history
Link with DLL version of VC++ runtime
  • Loading branch information
zcbenz committed May 12, 2015
2 parents 4ca8039 + 3bd54b7 commit ca623f1
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 3 deletions.
3 changes: 3 additions & 0 deletions atom.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,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',
],
},
{
Expand Down
3 changes: 3 additions & 0 deletions script/create-dist.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,15 @@
'icudtl.dat',
'libEGL.dll',
'libGLESv2.dll',
'msvcp120.dll',
'msvcr120.dll',
'node.dll',
'content_resources_200_percent.pak',
'ui_resources_200_percent.pak',
'xinput1_3.dll',
'natives_blob.bin',
'snapshot_blob.bin',
'vccorlib120.dll',
],
'linux': [
PROJECT_NAME, # 'electron'
Expand Down
2 changes: 1 addition & 1 deletion script/lib/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@


BASE_URL = 'http://gh-contractor-zcbenz.s3.amazonaws.com/libchromiumcontent'
LIBCHROMIUMCONTENT_COMMIT = '07a73a610496e4a1b4f3abc3c2fb0516187ec460'
LIBCHROMIUMCONTENT_COMMIT = '90a5b9c3792645067ad9517e60cf5eb99730e0f9'

PLATFORM = {
'cygwin': 'win32',
Expand Down
3 changes: 2 additions & 1 deletion script/update-external-binaries.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from lib.util import safe_mkdir, rm_rf, extract_zip, tempdir, download


VERSION = 'v0.6.0'
VERSION = 'v0.7.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
Expand All @@ -30,6 +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())

with open(version_file, 'w') as f:
f.write(VERSION)
Expand Down
2 changes: 1 addition & 1 deletion vendor/brightray

0 comments on commit ca623f1

Please sign in to comment.