| OLD | NEW |
| 1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 # IMPORTANT: | 5 # IMPORTANT: |
| 6 # Please don't directly include this file if you are building via gyp_chromium, | 6 # Please don't directly include this file if you are building via gyp_chromium, |
| 7 # since gyp_chromium is automatically forcing its inclusion. | 7 # since gyp_chromium is automatically forcing its inclusion. |
| 8 { | 8 { |
| 9 'variables': { | 9 'variables': { |
| 10 # .gyp files should set chromium_code to 1 if they build Chromium-specific | 10 # .gyp files should set chromium_code to 1 if they build Chromium-specific |
| (...skipping 369 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 380 }], | 380 }], |
| 381 # Finally, for Windows, we simply turn on profiling. | 381 # Finally, for Windows, we simply turn on profiling. |
| 382 ['OS=="win"', { | 382 ['OS=="win"', { |
| 383 'msvs_settings': { | 383 'msvs_settings': { |
| 384 'VCLinkerTool': { | 384 'VCLinkerTool': { |
| 385 'Profile': 'true', | 385 'Profile': 'true', |
| 386 }, | 386 }, |
| 387 'VCCLCompilerTool': { | 387 'VCCLCompilerTool': { |
| 388 # /Z7, not /Zi, so coverage is happyb | 388 # /Z7, not /Zi, so coverage is happyb |
| 389 'DebugInformationFormat': '1', | 389 'DebugInformationFormat': '1', |
| 390 'AdditionalOptions': '/Yd', | 390 'AdditionalOptions': ['/Yd'], |
| 391 } | 391 } |
| 392 } | 392 } |
| 393 }], # OS==win | 393 }], # OS==win |
| 394 ], # conditions for coverage | 394 ], # conditions for coverage |
| 395 }], # coverage!=0 | 395 }], # coverage!=0 |
| 396 ], # conditions for 'target_defaults' | 396 ], # conditions for 'target_defaults' |
| 397 'default_configuration': 'Debug', | 397 'default_configuration': 'Debug', |
| 398 'configurations': { | 398 'configurations': { |
| 399 # VCLinkerTool LinkIncremental values below: | 399 # VCLinkerTool LinkIncremental values below: |
| 400 # 0 == default | 400 # 0 == default |
| (...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 540 # | 540 # |
| 541 # Concrete configurations | 541 # Concrete configurations |
| 542 # | 542 # |
| 543 'Debug': { | 543 'Debug': { |
| 544 'inherit_from': ['Common_Base', 'x86_Base', 'Debug_Base'], | 544 'inherit_from': ['Common_Base', 'x86_Base', 'Debug_Base'], |
| 545 }, | 545 }, |
| 546 'Release': { | 546 'Release': { |
| 547 'inherit_from': ['Common_Base', 'x86_Base', 'Release_Base'], | 547 'inherit_from': ['Common_Base', 'x86_Base', 'Release_Base'], |
| 548 'conditions': [ | 548 'conditions': [ |
| 549 ['msvs_use_common_release', { | 549 ['msvs_use_common_release', { |
| 550 'msvs_props': ['release.vsprops'], | 550 'includes': ['release.gypi'], |
| 551 }], | 551 }], |
| 552 ] | 552 ] |
| 553 }, | 553 }, |
| 554 'conditions': [ | 554 'conditions': [ |
| 555 [ 'OS=="win"', { | 555 [ 'OS=="win"', { |
| 556 # TODO(bradnelson): add a gyp mechanism to make this more graceful. | 556 # TODO(bradnelson): add a gyp mechanism to make this more graceful. |
| 557 'Purify': { | 557 'Purify': { |
| 558 'inherit_from': ['Common_Base', 'x86_Base', 'Release_Base', 'Purify'
], | 558 'inherit_from': ['Common_Base', 'x86_Base', 'Release_Base', 'Purify'
], |
| 559 }, | 559 }, |
| 560 'Debug_x64': { | 560 'Debug_x64': { |
| 561 'inherit_from': ['Common_Base', 'x64_Base', 'Debug_Base'], | 561 'inherit_from': ['Common_Base', 'x64_Base', 'Debug_Base'], |
| 562 }, | 562 }, |
| 563 'Release_x64': { | 563 'Release_x64': { |
| 564 'inherit_from': ['Common_Base', 'x64_Base', 'Release_Base'], | 564 'inherit_from': ['Common_Base', 'x64_Base', 'Release_Base'], |
| 565 }, | 565 }, |
| 566 'Purify_x64': { | 566 'Purify_x64': { |
| 567 'inherit_from': ['Common_Base', 'x64_Base', 'Release_Base', 'Purify'
], | 567 'inherit_from': ['Common_Base', 'x64_Base', 'Release_Base', 'Purify_
Base'], |
| 568 }, | 568 }, |
| 569 }], | 569 }], |
| 570 ], | 570 ], |
| 571 }, | 571 }, |
| 572 }, | 572 }, |
| 573 'conditions': [ | 573 'conditions': [ |
| 574 ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { | 574 ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { |
| 575 'target_defaults': { | 575 'target_defaults': { |
| 576 # Enable -Werror by default, but put it in a variable so it can | 576 # Enable -Werror by default, but put it in a variable so it can |
| 577 # be disabled in ~/.gyp/include.gypi on the valgrind builders. | 577 # be disabled in ~/.gyp/include.gypi on the valgrind builders. |
| (...skipping 392 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 970 'MinimalRebuild': 'false', | 970 'MinimalRebuild': 'false', |
| 971 'ExceptionHandling': '0', | 971 'ExceptionHandling': '0', |
| 972 'BufferSecurityCheck': 'true', | 972 'BufferSecurityCheck': 'true', |
| 973 'EnableFunctionLevelLinking': 'true', | 973 'EnableFunctionLevelLinking': 'true', |
| 974 'RuntimeTypeInfo': 'false', | 974 'RuntimeTypeInfo': 'false', |
| 975 'WarningLevel': '3', | 975 'WarningLevel': '3', |
| 976 'WarnAsError': 'true', | 976 'WarnAsError': 'true', |
| 977 'DebugInformationFormat': '3', | 977 'DebugInformationFormat': '3', |
| 978 'conditions': [ | 978 'conditions': [ |
| 979 [ 'msvs_multi_core_compile', { | 979 [ 'msvs_multi_core_compile', { |
| 980 'AdditionalOptions': '/MP', | 980 'AdditionalOptions': ['/MP'], |
| 981 }], | 981 }], |
| 982 ], | 982 ], |
| 983 }, | 983 }, |
| 984 'VCLibrarianTool': { | 984 'VCLibrarianTool': { |
| 985 'AdditionalOptions': '/ignore:4221', | 985 'AdditionalOptions': ['/ignore:4221'], |
| 986 'AdditionalLibraryDirectories': | 986 'AdditionalLibraryDirectories': |
| 987 ['<(DEPTH)/third_party/platformsdk_win7/files/Lib'], | 987 ['<(DEPTH)/third_party/platformsdk_win7/files/Lib'], |
| 988 }, | 988 }, |
| 989 'VCLinkerTool': { | 989 'VCLinkerTool': { |
| 990 'AdditionalDependencies': [ | 990 'AdditionalDependencies': [ |
| 991 'wininet.lib', | 991 'wininet.lib', |
| 992 'version.lib', | 992 'version.lib', |
| 993 'msimg32.lib', | 993 'msimg32.lib', |
| 994 'ws2_32.lib', | 994 'ws2_32.lib', |
| 995 'usp10.lib', | 995 'usp10.lib', |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1090 'dbghelp.dll', | 1090 'dbghelp.dll', |
| 1091 'dwmapi.dll', | 1091 'dwmapi.dll', |
| 1092 'uxtheme.dll', | 1092 'uxtheme.dll', |
| 1093 ], | 1093 ], |
| 1094 }, | 1094 }, |
| 1095 }, | 1095 }, |
| 1096 'configurations': { | 1096 'configurations': { |
| 1097 'x86_Base': { | 1097 'x86_Base': { |
| 1098 'msvs_settings': { | 1098 'msvs_settings': { |
| 1099 'VCLinkerTool': { | 1099 'VCLinkerTool': { |
| 1100 'AdditionalOptions': | 1100 'AdditionalOptions': [ |
| 1101 '/safeseh /dynamicbase /ignore:4199 /ignore:4221 /nxcompat', | 1101 '/safeseh', |
| 1102 '/dynamicbase', |
| 1103 '/ignore:4199', |
| 1104 '/ignore:4221', |
| 1105 '/nxcompat', |
| 1106 ], |
| 1102 }, | 1107 }, |
| 1103 }, | 1108 }, |
| 1104 }, | 1109 }, |
| 1105 'x64_Base': { | 1110 'x64_Base': { |
| 1106 'msvs_settings': { | 1111 'msvs_settings': { |
| 1107 'VCLinkerTool': { | 1112 'VCLinkerTool': { |
| 1108 'AdditionalOptions': | 1113 'AdditionalOptions': [ |
| 1109 # safeseh is not compatible with x64 | 1114 # safeseh is not compatible with x64 |
| 1110 '/dynamicbase /ignore:4199 /ignore:4221 /nxcompat', | 1115 '/dynamicbase', |
| 1116 '/ignore:4199', |
| 1117 '/ignore:4221', |
| 1118 '/nxcompat', |
| 1119 ], |
| 1111 }, | 1120 }, |
| 1112 }, | 1121 }, |
| 1113 }, | 1122 }, |
| 1114 }, | 1123 }, |
| 1115 }, | 1124 }, |
| 1116 }], | 1125 }], |
| 1117 ], | 1126 ], |
| 1118 'scons_settings': { | 1127 'scons_settings': { |
| 1119 'sconsbuild_dir': '<(DEPTH)/sconsbuild', | 1128 'sconsbuild_dir': '<(DEPTH)/sconsbuild', |
| 1120 'tools': ['ar', 'as', 'gcc', 'g++', 'gnulink', 'chromium_builders'], | 1129 'tools': ['ar', 'as', 'gcc', 'g++', 'gnulink', 'chromium_builders'], |
| (...skipping 23 matching lines...) Expand all Loading... |
| 1144 # and therefore SYMROOT, needs to be set at the project level. | 1153 # and therefore SYMROOT, needs to be set at the project level. |
| 1145 'SYMROOT': '<(DEPTH)/xcodebuild', | 1154 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 1146 }, | 1155 }, |
| 1147 } | 1156 } |
| 1148 | 1157 |
| 1149 # Local Variables: | 1158 # Local Variables: |
| 1150 # tab-width:2 | 1159 # tab-width:2 |
| 1151 # indent-tabs-mode:nil | 1160 # indent-tabs-mode:nil |
| 1152 # End: | 1161 # End: |
| 1153 # vim: set expandtab tabstop=2 shiftwidth=2: | 1162 # vim: set expandtab tabstop=2 shiftwidth=2: |
| OLD | NEW |