| OLD | NEW |
| 1 # | 1 # |
| 2 # Copyright (C) 2011 Google Inc. All rights reserved. | 2 # Copyright (C) 2011 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 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 105 ], | 105 ], |
| 106 'include_dirs': [ | 106 'include_dirs': [ |
| 107 '../../../public/web/gtk', | 107 '../../../public/web/gtk', |
| 108 ], | 108 ], |
| 109 }], | 109 }], |
| 110 ['OS!="win"', { | 110 ['OS!="win"', { |
| 111 'sources/': [ | 111 'sources/': [ |
| 112 ['exclude', 'Win\\.cpp$'], | 112 ['exclude', 'Win\\.cpp$'], |
| 113 ], | 113 ], |
| 114 }], | 114 }], |
| 115 ['OS=="mac"', { |
| 116 'link_settings': { |
| 117 'libraries': [ |
| 118 '$(SDKROOT)/System/Library/Frameworks/AppKit.framework', |
| 119 '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.
framework', |
| 120 '$(SDKROOT)/System/Library/Frameworks/Carbon.framework', |
| 121 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework
', |
| 122 ], |
| 123 }, |
| 124 }], |
| 115 ], | 125 ], |
| 116 # Disable c4267 warnings until we fix size_t to int truncations. | 126 # Disable c4267 warnings until we fix size_t to int truncations. |
| 117 'msvs_disabled_warnings': [ 4267, ], | 127 'msvs_disabled_warnings': [ 4267, ], |
| 118 }, | 128 }, |
| 119 { | 129 { |
| 120 # FIXME: This is only used by webkit_unit_tests now, move it to WebK
itUnitTests.gyp. | 130 # FIXME: This is only used by webkit_unit_tests now, move it to WebK
itUnitTests.gyp. |
| 121 'target_name': 'DumpRenderTree_resources', | 131 'target_name': 'DumpRenderTree_resources', |
| 122 'type': 'none', | 132 'type': 'none', |
| 123 'dependencies': [ | 133 'dependencies': [ |
| 124 '<(DEPTH)/net/net.gyp:net_resources', | 134 '<(DEPTH)/net/net.gyp:net_resources', |
| (...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 334 'target_defaults': { | 344 'target_defaults': { |
| 335 # FIXME: Add -Wglobal-constructors after fixing existing bugs. | 345 # FIXME: Add -Wglobal-constructors after fixing existing bugs. |
| 336 'cflags': ['-Wunused-parameter'], | 346 'cflags': ['-Wunused-parameter'], |
| 337 'xcode_settings': { | 347 'xcode_settings': { |
| 338 'WARNING_CFLAGS': ['-Wunused-parameter'], | 348 'WARNING_CFLAGS': ['-Wunused-parameter'], |
| 339 }, | 349 }, |
| 340 }, | 350 }, |
| 341 }], | 351 }], |
| 342 ], # conditions | 352 ], # conditions |
| 343 } | 353 } |
| OLD | NEW |