OLD | NEW |
1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 import("config.gni") | 5 import("config.gni") |
6 if (is_clang) { | 6 if (is_clang) { |
7 import("//build/config/clang/clang.gni") | 7 import("//build/config/clang/clang.gni") |
8 } | 8 } |
9 | 9 |
10 # features --------------------------------------------------------------------- | 10 # features --------------------------------------------------------------------- |
(...skipping 17 matching lines...) Expand all Loading... |
28 include_dirs = [ ".", ".." ] | 28 include_dirs = [ ".", ".." ] |
29 | 29 |
30 cflags = [] | 30 cflags = [] |
31 defines = [] | 31 defines = [] |
32 | 32 |
33 if (is_win) { | 33 if (is_win) { |
34 cflags += [ | 34 cflags += [ |
35 "/wd4305", # Truncation from 'type1' to 'type2'. | 35 "/wd4305", # Truncation from 'type1' to 'type2'. |
36 "/wd4324", # Struct padded due to declspec(align). | 36 "/wd4324", # Struct padded due to declspec(align). |
37 "/wd4714", # Function marked forceinline not inlined. | 37 "/wd4714", # Function marked forceinline not inlined. |
| 38 "/wd4800", # Value forced to bool. |
38 "/wd4996", # Deprecated function call. | 39 "/wd4996", # Deprecated function call. |
39 ] | 40 ] |
40 } | 41 } |
41 | 42 |
42 if (is_win) { | 43 if (is_win) { |
43 if (component_mode == "shared_library") { | 44 if (component_mode == "shared_library") { |
44 defines += [ "USING_V8_SHARED" ] | 45 defines += [ "USING_V8_SHARED" ] |
45 } | 46 } |
46 } else { # ! Windows | 47 } else { # ! Windows |
47 # TODO(GYP) this should be based on gcc_version >= 46 but GN doesn't have a | 48 # TODO(GYP) this should be based on gcc_version >= 46 but GN doesn't have a |
(...skipping 19 matching lines...) Expand all Loading... |
67 } | 68 } |
68 } | 69 } |
69 | 70 |
70 # stubs ------------------------------------------------------------------------ | 71 # stubs ------------------------------------------------------------------------ |
71 | 72 |
72 # These set up include paths for targets that haven't been converted yet. They | 73 # These set up include paths for targets that haven't been converted yet. They |
73 # can be removed when the corresponding targets have been converted to GN. | 74 # can be removed when the corresponding targets have been converted to GN. |
74 config("npapi_stub") { | 75 config("npapi_stub") { |
75 include_dirs = [ "//third_party/npapi", "//third_party/npapi/bindings" ] | 76 include_dirs = [ "//third_party/npapi", "//third_party/npapi/bindings" ] |
76 } | 77 } |
OLD | NEW |