From e38614ce315f627d41a2d2d2acb6ea5c3be65765 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Thu, 11 Dec 2014 19:47:15 -0800 Subject: [PATCH] win: No longer support building with VS Express The Community edition can provide everything we need for Professional edition. --- atom.gyp | 26 -------------------------- common.gypi | 5 ----- script/update-external-binaries.py | 1 - 3 files changed, 32 deletions(-) diff --git a/atom.gyp b/atom.gyp index 9bb06cf0025e..b4cd71c4398e 100644 --- a/atom.gyp +++ b/atom.gyp @@ -932,31 +932,5 @@ }, # target generate_node_lib ], }], # OS==win - # Using Visual Studio Express. - ['msvs_express==1', { - 'target_defaults': { - 'defines!': [ - '_SECURE_ATL', - ], - 'msvs_settings': { - 'VCLibrarianTool': { - 'AdditionalLibraryDirectories': [ - '<(atom_source_root)/external_binaries/atl/lib', - ], - }, - 'VCLinkerTool': { - 'AdditionalLibraryDirectories': [ - '<(atom_source_root)/external_binaries/atl/lib', - ], - 'AdditionalDependencies': [ - 'atls.lib', - ], - }, - }, - 'msvs_system_include_dirs': [ - '<(atom_source_root)/external_binaries/atl/include', - ], - }, - }], # msvs_express==1 ], } diff --git a/common.gypi b/common.gypi index becb453a96ca..7ee6d494a4dc 100644 --- a/common.gypi +++ b/common.gypi @@ -6,11 +6,6 @@ ['OS=="mac" or OS=="linux"', { 'clang': 1, }], - ['OS=="win" and (MSVS_VERSION=="2013e" or MSVS_VERSION=="2012e" or MSVS_VERSION=="2010e")', { - 'msvs_express': 1, - },{ - 'msvs_express': 0, - }], ], # Required by breakpad. 'os_bsd': 0, diff --git a/script/update-external-binaries.py b/script/update-external-binaries.py index 7e134238fc53..80f0df5717b7 100755 --- a/script/update-external-binaries.py +++ b/script/update-external-binaries.py @@ -28,7 +28,6 @@ def main(): download_and_unzip('ReactiveCocoa') download_and_unzip('Squirrel') elif sys.platform in ['cygwin', 'win32']: - download_and_unzip('atl') download_and_unzip('directxsdk') download_and_unzip('vs2012_crt')