| OLD | NEW |
| 1 { | 1 { |
| 2 'variables': { | 2 'variables': { |
| 3 'chromium_code': 1, | 3 'chromium_code': 1, |
| 4 # Switch to with chrome.sln landing. | 4 # Switch to with chrome.sln landing. |
| 5 #'chrome_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', | 5 #'chrome_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', |
| 6 'chrome_grit_out_dir': '$(OutDir)/grit_derived_sources', | 6 'chrome_grit_out_dir': '$(OutDir)/grit_derived_sources', |
| 7 'app_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/app', | 7 'app_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/app', |
| 8 'webkit_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit', | 8 'webkit_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit', |
| 9 }, | 9 }, |
| 10 'includes': [ | 10 'includes': [ |
| 11 '../../../build/common.gypi', | 11 '../../../build/common.gypi', |
| 12 ], | 12 ], |
| 13 'target_defaults': { | 13 'target_defaults': { |
| 14 'type': 'shared_library', | 14 'type': 'shared_library', |
| 15 'dependencies': [ | 15 'dependencies': [ |
| 16 '../../chrome.gyp:chrome_strings', | 16 '../../chrome.gyp:chrome_strings', |
| 17 '../../../webkit/webkit.gyp:webkit_strings', |
| 18 '../../../app/app.gyp:app_strings', |
| 17 ], | 19 ], |
| 18 'msvs_settings': { | 20 'msvs_settings': { |
| 19 'VCLinkerTool': { | 21 'VCLinkerTool': { |
| 20 'BaseAddress': '0x3CF00000', | 22 'BaseAddress': '0x3CF00000', |
| 21 'OutputFile': '$(OutDir)\\locales\\$(ProjectName).dll', | 23 'OutputFile': '$(OutDir)\\locales\\$(ProjectName).dll', |
| 22 'IgnoreImportLibrary': 'true', | 24 'IgnoreImportLibrary': 'true', |
| 23 'LinkIncremental': '1', # 1 == No | 25 'LinkIncremental': '1', # 1 == No |
| 24 'LinkTimeCodeGeneration': '0', | 26 'LinkTimeCodeGeneration': '0', |
| 25 'ResourceOnlyDLL': 'true', | 27 'ResourceOnlyDLL': 'true', |
| 26 }, | 28 }, |
| (...skipping 607 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 634 '<(webkit_grit_out_dir)/webkit_strings_zh-TW.rc', | 636 '<(webkit_grit_out_dir)/webkit_strings_zh-TW.rc', |
| 635 '<(app_grit_out_dir)/app_strings_zh-TW.rc', | 637 '<(app_grit_out_dir)/app_strings_zh-TW.rc', |
| 636 '<(app_grit_out_dir)/app_locale_settings_zh-TW.rc', | 638 '<(app_grit_out_dir)/app_locale_settings_zh-TW.rc', |
| 637 ], | 639 ], |
| 638 }, | 640 }, |
| 639 ], | 641 ], |
| 640 }], | 642 }], |
| 641 ], | 643 ], |
| 642 } | 644 } |
| 643 | 645 |
| OLD | NEW |