зеркало из https://github.com/electron/electron.git
Build with Visual Studio 2017
This commit is contained in:
Родитель
e6d38cb64e
Коммит
42938de973
|
@ -5,8 +5,8 @@ Follow the guidelines below for building Electron on Windows.
|
||||||
## Prerequisites
|
## Prerequisites
|
||||||
|
|
||||||
* Windows 7 / Server 2008 R2 or higher
|
* Windows 7 / Server 2008 R2 or higher
|
||||||
* Visual Studio 2015 Update 3 - [download VS 2015 Community Edition for
|
* Visual Studio 2017 Update 3 - [download VS 2017 Community Edition for
|
||||||
free](https://www.visualstudio.com/vs/older-downloads/)
|
free](https://www.visualstudio.com/vs/)
|
||||||
* [Python 2.7](http://www.python.org/download/releases/2.7/)
|
* [Python 2.7](http://www.python.org/download/releases/2.7/)
|
||||||
* [Node.js](https://nodejs.org/download/)
|
* [Node.js](https://nodejs.org/download/)
|
||||||
* [Git](http://git-scm.com)
|
* [Git](http://git-scm.com)
|
||||||
|
|
|
@ -63,9 +63,9 @@ def get_vs_env(vs_version, arch):
|
||||||
"""
|
"""
|
||||||
Returns the env object for VS building environment.
|
Returns the env object for VS building environment.
|
||||||
|
|
||||||
The vs_version can be strings like "12.0" (e.g. VS2013), the arch has to
|
The vs_version can be strings like "2017", the arch has to
|
||||||
be one of "x86", "amd64", "arm", "x86_amd64", "x86_arm", "amd64_x86",
|
be one of "x86", "amd64", "arm", "x86_amd64", "x86_arm", "amd64_x86",
|
||||||
"amd64_arm", e.g. the args passed to vcvarsall.bat.
|
"amd64_arm", e.g. the args passed to vcvarsall.bat.
|
||||||
"""
|
"""
|
||||||
vsvarsall = "C:\\Program Files (x86)\\Microsoft Visual Studio {0}\\VC\\vcvarsall.bat".format(vs_version)
|
vsvarsall = "C:\\Program Files (x86)\\Microsoft Visual Studio\\{0}\\Community\\VC\\Auxiliary\\Build\\vcvarsall.bat".format(vs_version)
|
||||||
return get_environment_from_batch_command([vsvarsall, arch])
|
return get_environment_from_batch_command([vsvarsall, arch])
|
||||||
|
|
|
@ -246,7 +246,7 @@ def import_vs_env(target_arch):
|
||||||
vs_arch = 'amd64_x86'
|
vs_arch = 'amd64_x86'
|
||||||
else:
|
else:
|
||||||
vs_arch = 'x86_amd64'
|
vs_arch = 'x86_amd64'
|
||||||
env = get_vs_env('14.0', vs_arch)
|
env = get_vs_env('2017', vs_arch)
|
||||||
os.environ.update(env)
|
os.environ.update(env)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -61,7 +61,7 @@ def run_gyp(target_arch, component):
|
||||||
if PLATFORM == 'linux' and target_arch != get_host_arch():
|
if PLATFORM == 'linux' and target_arch != get_host_arch():
|
||||||
env['GYP_CROSSCOMPILE'] = '1'
|
env['GYP_CROSSCOMPILE'] = '1'
|
||||||
elif PLATFORM == 'win32':
|
elif PLATFORM == 'win32':
|
||||||
env['GYP_MSVS_VERSION'] = '2015'
|
env['GYP_MSVS_VERSION'] = '2017'
|
||||||
python = sys.executable
|
python = sys.executable
|
||||||
if sys.platform == 'cygwin':
|
if sys.platform == 'cygwin':
|
||||||
# Force using win32 python on cygwin.
|
# Force using win32 python on cygwin.
|
||||||
|
|
Загрузка…
Ссылка в новой задаче