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

Side by Side 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, 3 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 unified diff | Download patch
« no previous file with comments | « gyp/giflib.gyp ('k') | src/codec/SkCodec_libgif.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'includes': [ 6 'includes': [
7 'common_variables.gypi', 7 'common_variables.gypi',
8 ], 8 ],
9 'variables': { 9 'variables': {
10 'component%': 'static_library', 10 'component%': 'static_library',
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 ], 56 ],
57 'copies': [ 57 'copies': [
58 { 58 {
59 'destination': '<(PRODUCT_DIR)', 59 'destination': '<(PRODUCT_DIR)',
60 'files': [ '<(icu_directory)/windows/icudt.dll', ], 60 'files': [ '<(icu_directory)/windows/icudt.dll', ],
61 }, 61 },
62 ], 62 ],
63 'msvs_disabled_warnings': [4005, 4068, 4244, 4355, 4996, 4267], 63 'msvs_disabled_warnings': [4005, 4068, 4244, 4355, 4996, 4267],
64 'msvs_settings': { 64 'msvs_settings': {
65 'VCCLCompilerTool': { 65 'VCCLCompilerTool': {
66 'RuntimeTypeInfo': 'true', 66 'AdditionalOptions': [ '/EHsc', ],
67 'AdditionalOptions!': [ '/GR-' ], 67 },
68 'AdditionalOptions': [ '/EHsc', '/GR', '/w', ], 68 },
69 'configurations': {
70 'Debug': {
71 'msvs_settings': {
72 'VCCLCompilerTool': {
73 'RuntimeTypeInfo': 'true', # /GR
74 },
75 },
76 },
77 'Release': {
78 'msvs_settings': {
79 'VCCLCompilerTool': {
80 'RuntimeTypeInfo': 'true', # /GR
81 },
82 },
69 }, 83 },
70 }, 84 },
71 'all_dependent_settings': { 85 'all_dependent_settings': {
72 'msvs_settings': { 86 'msvs_settings': {
73 'VCLinkerTool': { 87 'VCLinkerTool': {
74 'AdditionalDependencies': [ 88 'AdditionalDependencies': [
75 'advapi32.lib', 89 'advapi32.lib',
76 ], 90 ],
77 }, 91 },
78 }, 92 },
(...skipping 29 matching lines...) Expand all
108 'xcode_settings': { 122 'xcode_settings': {
109 'GCC_ENABLE_CPP_RTTI': 'YES', # -frtti 123 'GCC_ENABLE_CPP_RTTI': 'YES', # -frtti
110 'WARNING_CFLAGS': [ '-w' ], 124 'WARNING_CFLAGS': [ '-w' ],
111 }, 125 },
112 } 126 }
113 ], 127 ],
114 ], # conditions 128 ], # conditions
115 }, 129 },
116 ], # targets 130 ], # targets
117 } 131 }
OLDNEW
« 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