| 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 |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 ['OS=="mac"', { | 67 ['OS=="mac"', { |
| 68 'defines': [ | 68 'defines': [ |
| 69 'WTF_USE_NEW_THEME=1', | 69 'WTF_USE_NEW_THEME=1', |
| 70 ], | 70 ], |
| 71 }], | 71 }], |
| 72 ], | 72 ], |
| 73 }, | 73 }, |
| 74 }, | 74 }, |
| 75 { | 75 { |
| 76 'target_name': 'wtf', | 76 'target_name': 'wtf', |
| 77 'type': 'static_library', | 77 'type': '<(component)', |
| 78 'include_dirs': [ | 78 'include_dirs': [ |
| 79 '..', | 79 '..', |
| 80 '../Platform/chromium' | |
| 81 ], | 80 ], |
| 82 'dependencies': [ | 81 'dependencies': [ |
| 83 'wtf_config', | 82 'wtf_config', |
| 84 '<(DEPTH)/third_party/icu/icu.gyp:icui18n', | 83 '<(DEPTH)/third_party/icu/icu.gyp:icui18n', |
| 85 '<(DEPTH)/third_party/icu/icu.gyp:icuuc', | 84 '<(DEPTH)/third_party/icu/icu.gyp:icuuc', |
| 86 ], | 85 ], |
| 87 'defines': [ | |
| 88 'WEBKIT_IMPLEMENTATION=1', | |
| 89 ], | |
| 90 'sources': [ | 86 'sources': [ |
| 91 '<@(wtf_files)', | 87 '<@(wtf_files)', |
| 92 ], | 88 ], |
| 89 'defines': [ |
| 90 'WTF_IMPLEMENTATION=1', |
| 91 ], |
| 93 'direct_dependent_settings': { | 92 'direct_dependent_settings': { |
| 94 'include_dirs': [ | 93 'include_dirs': [ |
| 95 '..', | 94 '..', |
| 96 ], | 95 ], |
| 97 # Some warnings occur in WTF headers, so they must also be disabled | 96 # Some warnings occur in WTF headers, so they must also be disabled |
| 98 # in targets that use WTF. | 97 # in targets that use WTF. |
| 99 'msvs_disabled_warnings': [ | 98 'msvs_disabled_warnings': [ |
| 100 # Don't complain about calling specific versions of templatized | 99 # Don't complain about calling specific versions of templatized |
| 101 # functions (e.g. in RefPtrHashMap.h). | 100 # functions (e.g. in RefPtrHashMap.h). |
| 102 4344, | 101 4344, |
| (...skipping 30 matching lines...) Expand all Loading... |
| 133 'direct_dependent_settings': { | 132 'direct_dependent_settings': { |
| 134 'msvs_disabled_warnings': [4291], | 133 'msvs_disabled_warnings': [4291], |
| 135 }, | 134 }, |
| 136 }], | 135 }], |
| 137 ], | 136 ], |
| 138 }, { # OS!="win" | 137 }, { # OS!="win" |
| 139 'sources/': [ | 138 'sources/': [ |
| 140 ['exclude', 'Win\\.cpp$'], | 139 ['exclude', 'Win\\.cpp$'], |
| 141 ], | 140 ], |
| 142 }], | 141 }], |
| 143 ['OS!="mac"', { | 142 ['OS=="mac"', { |
| 143 'link_settings': { |
| 144 'libraries': [ |
| 145 '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework', |
| 146 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', |
| 147 ] |
| 148 } |
| 149 }, { # OS!="mac" |
| 144 'sources/': [ | 150 'sources/': [ |
| 145 ['exclude', 'Mac\\.mm$'], | 151 ['exclude', 'Mac\\.mm$'], |
| 146 # mac is the only OS that uses WebKit's copy of TCMalloc. | 152 # mac is the only OS that uses WebKit's copy of TCMalloc. |
| 147 ['exclude', 'TC.*\\.(cpp|h)$'], | 153 ['exclude', 'TC.*\\.(cpp|h)$'], |
| 148 ], | 154 ], |
| 149 }], | 155 }], |
| 150 ], | 156 ], |
| 151 }, | 157 }, |
| 152 ] | 158 ] |
| 153 } | 159 } |
| OLD | NEW |