Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(143)

Unified Diff: gyp/icu.gyp

Issue 1314633002: Update giflib to 5.1.1 (AOSP hash) (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Icu fix Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gyp/giflib.gyp ('k') | src/codec/SkCodec_libgif.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/icu.gyp
diff --git a/gyp/icu.gyp b/gyp/icu.gyp
index d955b19af535346ec40e9171f3588f9155e88509..5142b77ed678f57395235b6e529c999e09174a1f 100644
--- a/gyp/icu.gyp
+++ b/gyp/icu.gyp
@@ -63,9 +63,23 @@
'msvs_disabled_warnings': [4005, 4068, 4244, 4355, 4996, 4267],
'msvs_settings': {
'VCCLCompilerTool': {
- 'RuntimeTypeInfo': 'true',
- 'AdditionalOptions!': [ '/GR-' ],
- 'AdditionalOptions': [ '/EHsc', '/GR', '/w', ],
+ 'AdditionalOptions': [ '/EHsc', ],
+ },
+ },
+ 'configurations': {
+ 'Debug': {
+ 'msvs_settings': {
+ 'VCCLCompilerTool': {
+ 'RuntimeTypeInfo': 'true', # /GR
+ },
+ },
+ },
+ 'Release': {
+ 'msvs_settings': {
+ 'VCCLCompilerTool': {
+ 'RuntimeTypeInfo': 'true', # /GR
+ },
+ },
},
},
'all_dependent_settings': {
« no previous file with comments | « gyp/giflib.gyp ('k') | src/codec/SkCodec_libgif.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698