Skip to content

A
angle
Commit cf5d48fa by Cooper Partin Committed by Geoff Lang
Options

Fixed WinRT compilation to use non static C runtime because of Windows Store requirements.

Change-Id: I310e4909aaa94c90eecd610e6c7cbbde3c19b777 Reviewed-on: https://chromium-review.googlesource.com/238532Tested-by: 's avatarCooper Partin <coopp@microsoft.com> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 7318b7cb
Showing with 40 additions and 6 deletions
build/common.gypi
...@@ -107,10 +107,28 @@ ...@@ -107,10 +107,28 @@
{ {
'Optimization': '0', # /Od 'Optimization': '0', # /Od
'BasicRuntimeChecks': '3', 'BasicRuntimeChecks': '3',
'conditions':
[
['angle_build_winrt==1',
{
# Use the dynamic C runtime to match
# Windows Application Store requirements
# The C runtime for Windows Store applications
# is a framework package that is managed by
# the Windows deployment model and can be
# shared by multiple packages.
# Use the static C runtime to match chromium and make sure we don't depend on 'RuntimeLibrary': '3', # /MDd (debug dll)
# the dynamic runtime's shared heaps },
'RuntimeLibrary': '1', # /MTd (debug static) {
# Use the static C runtime to
# match chromium and make sure
# we don't depend on the dynamic
# runtime's shared heaps
'RuntimeLibrary': '1', # /MTd (debug static)
}],
],
}, },
'VCLinkerTool': 'VCLinkerTool':
{ {
...@@ -148,10 +166,26 @@ ...@@ -148,10 +166,26 @@
'VCCLCompilerTool': 'VCCLCompilerTool':
{ {
'Optimization': '2', # /Os 'Optimization': '2', # /Os
'conditions':
[
['angle_build_winrt==1',
{
# Use the dynamic C runtime to match
# Windows Application Store requirements
# Use the static C runtime to match chromium and make sure we don't depend on # The C runtime for Windows Store applications
# the dynamic runtime's shared heaps # is a framework package that is managed by
'RuntimeLibrary': '0', # /MT (nondebug static) # the Windows deployment model and can be
# shared by multiple packages.
'RuntimeLibrary': '2', # /MD (nondebug dll)
},
{
# Use the static C runtime to
# match chromium and make sure
# we don't depend on the dynamic
'RuntimeLibrary': '0', # /MT (nondebug static)
}],
],
}, },
'VCLinkerTool': 'VCLinkerTool':
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment