bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Windows: Add VS2015 Update 3 build support

This commit is contained in:
Marshall Greenblatt 2016-08-05 13:24:27 +03:00
parent 6b6edcc19c
commit eac4425c21
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
patch/patch.cfg
View File

@ -27,6 +27,9 @@ patches = [
# #
# Support custom VS toolchain on Windows. # Support custom VS toolchain on Windows.
# https://bugs.chromium.org/p/chromium/issues/detail?id=623342 # https://bugs.chromium.org/p/chromium/issues/detail?id=623342
#
# Write environment.* files with the correct SDK version on Windows.
# https://bugs.chromium.org/p/chromium/issues/detail?id=634788
'name': 'gn_config', 'name': 'gn_config',
'path': '../', 'path': '../',
}, },

8
patch/patches/gn_config.patch
View File

@ -89,10 +89,11 @@ index 5bfa9a7..5e6e05d 100644
+ "studio path") + "studio path")
} }
diff --git build/toolchain/win/setup_toolchain.py build/toolchain/win/setup_toolchain.py diff --git build/toolchain/win/setup_toolchain.py build/toolchain/win/setup_toolchain.py
index d58cb85..fd608ba 100644 diff --git build/toolchain/win/setup_toolchain.py build/toolchain/win/setup_toolchain.py
index d58cb85..c7384b9 100644
--- build/toolchain/win/setup_toolchain.py --- build/toolchain/win/setup_toolchain.py
+++ build/toolchain/win/setup_toolchain.py +++ build/toolchain/win/setup_toolchain.py
@@ -124,11 +124,14 @@ def _LoadToolchainEnv(cpu, sdk_dir): @@ -124,11 +124,15 @@ def _LoadToolchainEnv(cpu, sdk_dir):
script_path = os.path.normpath(os.path.join( script_path = os.path.normpath(os.path.join(
os.environ['GYP_MSVS_OVERRIDE_PATH'], os.environ['GYP_MSVS_OVERRIDE_PATH'],
'VC/vcvarsall.bat')) 'VC/vcvarsall.bat'))
@ -102,7 +103,8 @@ index d58cb85..fd608ba 100644
- args = [script_path, 'amd64_x86' if cpu == 'x86' else 'amd64'] - args = [script_path, 'amd64_x86' if cpu == 'x86' else 'amd64']
- variables = _LoadEnvFromBat(args) - variables = _LoadEnvFromBat(args)
+ if os.path.exists(script_path): + if os.path.exists(script_path):
+ args = [script_path, 'amd64_x86' if cpu == 'x86' else 'amd64'] + args = [script_path, 'amd64_x86' if cpu == 'x86' else 'amd64', \
+ '10.0.10586.0']
+ variables = _LoadEnvFromBat(args) + variables = _LoadEnvFromBat(args)
+ else: + else:
+ variables = [] + variables = []