| Index: tools/gyp/configurations_msvs.gypi
|
| diff --git a/tools/gyp/configurations_msvs.gypi b/tools/gyp/configurations_msvs.gypi
|
| index 488091378d74e74b05f83ac7fb0dc96ac29d9fad..64176f7ad877fe2ec3fd68b61680c3ae27fb761e 100644
|
| --- a/tools/gyp/configurations_msvs.gypi
|
| +++ b/tools/gyp/configurations_msvs.gypi
|
| @@ -39,9 +39,6 @@
|
| 'DebugInformationFormat': '3',
|
| 'ExceptionHandling': '0',
|
| 'RuntimeTypeInfo': 'false',
|
| - # Uncomment the following line and pass --profile-vm to enable
|
| - # profiling of C++ code within Observatory.
|
| - # 'OmitFramePointers': 'false',
|
| 'RuntimeLibrary': '1', # /MTd - Multi-threaded, static (debug)
|
| },
|
| 'VCLinkerTool': {
|
| @@ -55,6 +52,18 @@
|
| ],
|
| },
|
| },
|
| + 'conditions': [
|
| + ['c_frame_pointers==1', {
|
| + 'msvs_settings': {
|
| + 'VCCLCompilerTool': {
|
| + 'OmitFramePointers': 'false',
|
| + },
|
| + },
|
| + 'defines': [
|
| + 'PROFILE_NATIVE_CODE'
|
| + ],
|
| + }],
|
| + ],
|
| # C4351 warns MSVC follows the C++ specification regarding array
|
| # initialization in member initializers. Code that expects the
|
| # specified behavior should silence this warning.
|
| @@ -71,9 +80,6 @@
|
| 'FavorSizeOrSpeed': '0',
|
| 'ExceptionHandling': '0',
|
| 'RuntimeTypeInfo': 'false',
|
| - # Uncomment the following line and pass --profile-vm to enable
|
| - # profiling of C++ code within Observatory.
|
| - # 'OmitFramePointers': 'false',
|
| 'StringPooling': 'true',
|
| 'RuntimeLibrary': '0', # /MT - Multi-threaded, static
|
| },
|
| @@ -90,6 +96,18 @@
|
| ],
|
| },
|
| },
|
| + 'conditions': [
|
| + ['c_frame_pointers==1', {
|
| + 'msvs_settings': {
|
| + 'VCCLCompilerTool': {
|
| + 'OmitFramePointers': 'false',
|
| + },
|
| + },
|
| + 'defines': [
|
| + 'PROFILE_NATIVE_CODE'
|
| + ],
|
| + }],
|
| + ],
|
| # C4351 warns MSVC follows the C++ specification regarding array
|
| # initialization in member initializers. Code that expects the
|
| # specified behavior should silence this warning.
|
|
|