| OLD | NEW | 
|---|
| 1 # Copyright (C) 2012 Google Inc. All rights reserved. | 1 # Copyright (C) 2012 Google Inc. All rights reserved. | 
| 2 # | 2 # | 
| 3 # Redistribution and use in source and binary forms, with or without | 3 # Redistribution and use in source and binary forms, with or without | 
| 4 # modification, are permitted provided that the following conditions are | 4 # modification, are permitted provided that the following conditions are | 
| 5 # met: | 5 # met: | 
| 6 # | 6 # | 
| 7 #     * Redistributions of source code must retain the above copyright | 7 #     * Redistributions of source code must retain the above copyright | 
| 8 # notice, this list of conditions and the following disclaimer. | 8 # notice, this list of conditions and the following disclaimer. | 
| 9 #     * Redistributions in binary form must reproduce the above | 9 #     * Redistributions in binary form must reproduce the above | 
| 10 # copyright notice, this list of conditions and the following disclaimer | 10 # copyright notice, this list of conditions and the following disclaimer | 
| 11 # in the documentation and/or other materials provided with the | 11 # in the documentation and/or other materials provided with the | 
| 12 # distribution. | 12 # distribution. | 
| 13 #     * Neither the name of Google Inc. nor the names of its | 13 #     * Neither the name of Google Inc. nor the names of its | 
| 14 # contributors may be used to endorse or promote products derived from | 14 # contributors may be used to endorse or promote products derived from | 
| 15 # this software without specific prior written permission. | 15 # this software without specific prior written permission. | 
| 16 # | 16 # | 
| 17 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | 17 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | 
| 18 # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | 18 # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | 
| 19 # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | 19 # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | 
| 20 # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | 20 # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | 
| 21 # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 21 # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 
| 22 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 22 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 
| 23 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 23 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 
| 24 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 24 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 
| 25 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 25 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 
| 26 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 26 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 
| 27 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 27 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 
| 28 { | 28 { | 
| 29   'includes': [ | 29   'includes': [ | 
| 30     '../../WebKit/chromium/WinPrecompile.gypi', | 30     '../WebKit/chromium/WinPrecompile.gypi', | 
| 31     '../../WebKit/chromium/features.gypi', | 31     '../WebKit/chromium/features.gypi', | 
| 32     '../wtf/wtf.gypi', | 32     'wtf.gypi', | 
| 33   ], | 33   ], | 
| 34   'conditions': [ | 34   'conditions': [ | 
| 35     ['os_posix == 1 and OS != "mac" and gcc_version>=46', { | 35     ['os_posix == 1 and OS != "mac" and gcc_version>=46', { | 
| 36       'target_defaults': { | 36       'target_defaults': { | 
| 37         # Disable warnings about c++0x compatibility, as some names (such as nul
     lptr) conflict | 37         # Disable warnings about c++0x compatibility, as some names (such as nul
     lptr) conflict | 
| 38         # with upcoming c++0x types. | 38         # with upcoming c++0x types. | 
| 39         'cflags_cc': ['-Wno-c++0x-compat'], | 39         'cflags_cc': ['-Wno-c++0x-compat'], | 
| 40       }, | 40       }, | 
| 41     }], | 41     }], | 
| 42   ], | 42   ], | 
| (...skipping 13 matching lines...) Expand all  Loading... | 
| 56         ], | 56         ], | 
| 57         'conditions': [ | 57         'conditions': [ | 
| 58           ['OS=="win"', { | 58           ['OS=="win"', { | 
| 59             'defines': [ | 59             'defines': [ | 
| 60               '__STD_C', | 60               '__STD_C', | 
| 61               '_CRT_SECURE_NO_DEPRECATE', | 61               '_CRT_SECURE_NO_DEPRECATE', | 
| 62               '_SCL_SECURE_NO_DEPRECATE', | 62               '_SCL_SECURE_NO_DEPRECATE', | 
| 63               'CRASH=__debugbreak', | 63               'CRASH=__debugbreak', | 
| 64             ], | 64             ], | 
| 65             'include_dirs': [ | 65             'include_dirs': [ | 
| 66               '../wtf/os-win32', | 66               'os-win32', | 
| 67             ], | 67             ], | 
| 68           }], | 68           }], | 
| 69           # FIXME: This should go in a header, not in the GYP file. | 69           # FIXME: This should go in a header, not in the GYP file. | 
| 70           ['OS=="mac"', { | 70           ['OS=="mac"', { | 
| 71             'defines': [ | 71             'defines': [ | 
| 72               'WTF_USE_NEW_THEME=1', | 72               'WTF_USE_NEW_THEME=1', | 
| 73             ], | 73             ], | 
| 74           }], | 74           }], | 
| 75         ], | 75         ], | 
| 76       }, | 76       }, | 
| 77     }, | 77     }, | 
| 78     { | 78     { | 
| 79       'target_name': 'wtf', | 79       'target_name': 'wtf', | 
| 80       'type': 'static_library', | 80       'type': 'static_library', | 
| 81       'include_dirs': [ | 81       'include_dirs': [ | 
|  | 82         '.', | 
| 82         '..', | 83         '..', | 
| 83         '../wtf', | 84         '../unicode', | 
| 84         '../wtf/unicode', |  | 
| 85       ], | 85       ], | 
| 86       'dependencies': [ | 86       'dependencies': [ | 
| 87           'wtf_config', | 87           'wtf_config', | 
| 88           '<(DEPTH)/third_party/icu/icu.gyp:icui18n', | 88           '<(DEPTH)/third_party/icu/icu.gyp:icui18n', | 
| 89           '<(DEPTH)/third_party/icu/icu.gyp:icuuc', | 89           '<(DEPTH)/third_party/icu/icu.gyp:icuuc', | 
| 90       ], | 90       ], | 
| 91       'sources': [ | 91       'sources': [ | 
| 92         '<@(wtf_files)', | 92         '<@(wtf_files)', | 
| 93       ], | 93       ], | 
| 94       'direct_dependent_settings': { | 94       'direct_dependent_settings': { | 
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 139           ], | 139           ], | 
| 140         }, { # OS!="win" | 140         }, { # OS!="win" | 
| 141           'sources/': [ | 141           'sources/': [ | 
| 142             ['exclude', 'Win\\.cpp$'], | 142             ['exclude', 'Win\\.cpp$'], | 
| 143           ], | 143           ], | 
| 144         }], | 144         }], | 
| 145         ['OS!="mac"', { | 145         ['OS!="mac"', { | 
| 146           'sources/': [ | 146           'sources/': [ | 
| 147             ['exclude', 'Mac\\.mm$'], | 147             ['exclude', 'Mac\\.mm$'], | 
| 148             # mac is the only OS that uses WebKit's copy of TCMalloc. | 148             # mac is the only OS that uses WebKit's copy of TCMalloc. | 
| 149             ['exclude', 'wtf/TC.*\\.(cpp|h)$'], | 149             ['exclude', 'TC.*\\.(cpp|h)$'], | 
| 150           ], | 150           ], | 
| 151         }], | 151         }], | 
| 152       ], | 152       ], | 
| 153     }, | 153     }, | 
| 154   ] | 154   ] | 
| 155 } | 155 } | 
| OLD | NEW | 
|---|