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 23 matching lines...) Expand all Loading... | |
| 34 ], | 34 ], |
| 35 'targets': [{ | 35 'targets': [{ |
| 36 'target_name': 'modules', | 36 'target_name': 'modules', |
| 37 'type': 'static_library', | 37 'type': 'static_library', |
| 38 'dependencies': [ | 38 'dependencies': [ |
| 39 '<(DEPTH)/third_party/zlib/zlib.gyp:zlib', | 39 '<(DEPTH)/third_party/zlib/zlib.gyp:zlib', |
| 40 '../config.gyp:config', | 40 '../config.gyp:config', |
| 41 '../core/core.gyp:webcore', | 41 '../core/core.gyp:webcore', |
| 42 ], | 42 ], |
| 43 'defines': [ | 43 'defines': [ |
| 44 'WEBKIT_IMPLEMENTATION=1', | 44 'WEBKIT_IMPLEMENTATION=1', |
|
abarth-chromium
2013/06/17 20:30:04
I thought WEBKIT_IMPLEMENTATION controlled whether
| |
| 45 'INSIDE_WEBKIT', | 45 'INSIDE_WEBKIT', |
| 46 ], | 46 ], |
| 47 'sources': [ | 47 'sources': [ |
| 48 '<@(modules_files)', | 48 '<@(modules_files)', |
| 49 ], | 49 ], |
| 50 'conditions': [ | |
| 51 ['component=="shared_library"', { | |
| 52 'defines': [ | |
| 53 'WEBKIT_DLL', | |
|
abarth-chromium
2013/06/17 17:33:02
This sort of thing should be in config.gyp.
| |
| 54 ], | |
| 55 }], | |
| 56 ], | |
| 50 # Disable c4267 warnings until we fix size_t to int truncations. | 57 # Disable c4267 warnings until we fix size_t to int truncations. |
| 51 'msvs_disabled_warnings': [ 4267, 4334, ] | 58 'msvs_disabled_warnings': [ 4267, 4334, ] |
| 52 }], | 59 }], |
| 53 } | 60 } |
| OLD | NEW |