diff options
Diffstat (limited to 'JavaScriptCore/JavaScriptCore.gyp')
| -rw-r--r-- | JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp b/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp index 32270e8..ff7f0de 100644 --- a/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp +++ b/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp @@ -125,6 +125,16 @@ '../', '../wtf', ], + # Some warnings occur in JSC headers, so they must also be disabled + # in targets that use JSC. + 'msvs_disabled_warnings': [ + # Don't complain about calling specific versions of templatized + # functions (e.g. in RefPtrHashMap.h). + 4344, + # Don't complain about using "this" in an initializer list + # (e.g. in StringImpl.h). + 4355, + ], }, 'export_dependent_settings': [ 'wtf_config', @@ -137,7 +147,9 @@ 'sources/': [ ['exclude', 'ThreadIdentifierDataPthreads\\.(h|cpp)$'], ['exclude', 'ThreadingPthreads\\.cpp$'], - ['include', 'Thread(ing|Specific)Win\\.cpp$'] + ['include', 'Thread(ing|Specific)Win\\.cpp$'], + ['exclude', 'OSAllocatorPosix\\.cpp$'], + ['include', 'OSAllocatorWin\\.cpp$'] ], 'include_dirs!': [ '<(SHARED_INTERMEDIATE_DIR)/webkit', |