mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Import build env from VS 2015

Browse source
This commit is contained in:
Cheng Zhao 2016-05-10 12:44:56 +09:00
parent 73223fe5c3
commit 2497c73009
4 changed files with 94 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
script/update.py
View file

@ -7,7 +7,7 @@ import subprocess
import sys
from lib.config import get_target_arch, PLATFORM
from lib.util import get_host_arch
from lib.util import get_host_arch, import_vs_env
SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
@ -49,11 +49,14 @@ def update_gyp():
def run_gyp(target_arch, component):
# Update the VS build env.
import_vs_env(target_arch)
env = os.environ.copy()
if PLATFORM == 'linux' and target_arch != get_host_arch():
env['GYP_CROSSCOMPILE'] = '1'
elif PLATFORM == 'win32':
env['GYP_MSVS_VERSION'] = '2013'
env['GYP_MSVS_VERSION'] = '2015'
python = sys.executable
if sys.platform == 'cygwin':
# Force using win32 python on cygwin.