Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # | 1 # |
| 2 # Copyright (C) 2013 Google Inc. All rights reserved. | 2 # Copyright (C) 2013 Google Inc. All rights reserved. |
| 3 # | 3 # |
| 4 # Redistribution and use in source and binary forms, with or without | 4 # Redistribution and use in source and binary forms, with or without |
| 5 # modification, are permitted provided that the following conditions are | 5 # modification, are permitted provided that the following conditions are |
| 6 # met: | 6 # met: |
| 7 # | 7 # |
| 8 # * Redistributions of source code must retain the above copyright | 8 # * Redistributions of source code must retain the above copyright |
| 9 # notice, this list of conditions and the following disclaimer. | 9 # notice, this list of conditions and the following disclaimer. |
| 10 # * Redistributions in binary form must reproduce the above | 10 # * Redistributions in binary form must reproduce the above |
| (...skipping 25 matching lines...) Expand all Loading... | |
| 36 'targets': [ | 36 'targets': [ |
| 37 { | 37 { |
| 38 'target_name': 'config', | 38 'target_name': 'config', |
| 39 'type': 'none', | 39 'type': 'none', |
| 40 'direct_dependent_settings': { | 40 'direct_dependent_settings': { |
| 41 'include_dirs': [ | 41 'include_dirs': [ |
| 42 '.', | 42 '.', |
| 43 '..', | 43 '..', |
| 44 ], | 44 ], |
| 45 'msvs_disabled_warnings': [ | 45 'msvs_disabled_warnings': [ |
| 46 4138, 4244, 4291, 4305, 4344, 4355, 4521, 4099, | 46 4138, 4244, 4291, 4305, 4344, 4355, 4521, 4099, 4800, 4996, |
|
scottmg
2013/11/06 04:40:48
4800 is "forcing value to bool 'true' or 'false' (
Peter Kasting
2013/11/06 07:20:02
I don't think they're huge deals, but what would w
| |
| 47 ], | 47 ], |
| 48 'variables': { | |
| 49 'chromium_code': 1, | |
|
Peter Kasting
2013/11/06 07:20:02
This doesn't go into the variables section at the
| |
| 50 }, | |
| 48 'conditions': [ | 51 'conditions': [ |
| 49 ['OS=="win" and component=="shared_library"', { | 52 ['OS=="win" and component=="shared_library"', { |
| 50 'defines': [ | 53 'defines': [ |
| 51 'USING_V8_SHARED', | 54 'USING_V8_SHARED', |
| 52 ], | 55 ], |
| 53 }], | 56 }], |
| 54 ['OS=="win"', { | 57 ['OS=="win"', { |
| 55 'sources/': [ | 58 'sources/': [ |
| 56 ['exclude', 'Posix\\.cpp$'], | 59 ['exclude', 'Posix\\.cpp$'], |
| 57 ], | 60 ], |
| (...skipping 24 matching lines...) Expand all Loading... | |
| 82 ['gcc_version>=46', { | 85 ['gcc_version>=46', { |
| 83 # Disable warnings about c++0x compatibility, as some names (such as | 86 # Disable warnings about c++0x compatibility, as some names (such as |
| 84 # nullptr) conflict with upcoming c++0x types. | 87 # nullptr) conflict with upcoming c++0x types. |
| 85 'cflags_cc': ['-Wno-c++0x-compat'], | 88 'cflags_cc': ['-Wno-c++0x-compat'], |
| 86 }], | 89 }], |
| 87 ['OS=="linux" and target_arch=="arm"', { | 90 ['OS=="linux" and target_arch=="arm"', { |
| 88 # Due to a bug in gcc arm, we get warnings about uninitialized | 91 # Due to a bug in gcc arm, we get warnings about uninitialized |
| 89 # timesNewRoman.unstatic.3258 and colorTransparent.unstatic.4879. | 92 # timesNewRoman.unstatic.3258 and colorTransparent.unstatic.4879. |
| 90 'cflags': ['-Wno-uninitialized'], | 93 'cflags': ['-Wno-uninitialized'], |
| 91 }], | 94 }], |
| 92 ['OS!="win"', { | |
| 93 # TODO: Turn this on on all platforms, http://crbug.com/312287 | |
| 94 'variables': { | |
| 95 'chromium_code': 1, | |
| 96 }, | |
| 97 }], | |
| 98 ['clang==1', { | 95 ['clang==1', { |
| 99 'cflags': ['-Wglobal-constructors'], | 96 'cflags': ['-Wglobal-constructors'], |
| 100 'xcode_settings': { | 97 'xcode_settings': { |
| 101 'WARNING_CFLAGS': ['-Wglobal-constructors'], | 98 'WARNING_CFLAGS': ['-Wglobal-constructors'], |
| 102 }, | 99 }, |
| 103 }], | 100 }], |
| 104 ], | 101 ], |
| 105 }, | 102 }, |
| 106 }, | 103 }, |
| 107 { | 104 { |
| (...skipping 11 matching lines...) Expand all Loading... | |
| 119 ], | 116 ], |
| 120 'direct_dependent_settings': { | 117 'direct_dependent_settings': { |
| 121 'cflags!': ['-Wglobal-constructors'], | 118 'cflags!': ['-Wglobal-constructors'], |
| 122 'xcode_settings': { | 119 'xcode_settings': { |
| 123 'WARNING_CFLAGS!': ['-Wglobal-constructors'], | 120 'WARNING_CFLAGS!': ['-Wglobal-constructors'], |
| 124 }, | 121 }, |
| 125 }, | 122 }, |
| 126 } | 123 } |
| 127 ], | 124 ], |
| 128 } | 125 } |
| OLD | NEW |