Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(86)

Side by Side Diff: gypfiles/toolchain.gypi

Issue 2736873005: Merged: [build] Fix gyp files for building inspector (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | src/inspector/inspector.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2013 the V8 project authors. All rights reserved. 1 # Copyright 2013 the V8 project authors. All rights reserved.
2 # Redistribution and use in source and binary forms, with or without 2 # Redistribution and use in source and binary forms, with or without
3 # modification, are permitted provided that the following conditions are 3 # modification, are permitted provided that the following conditions are
4 # met: 4 # met:
5 # 5 #
6 # * Redistributions of source code must retain the above copyright 6 # * Redistributions of source code must retain the above copyright
7 # notice, this list of conditions and the following disclaimer. 7 # notice, this list of conditions and the following disclaimer.
8 # * Redistributions in binary form must reproduce the above 8 # * Redistributions in binary form must reproduce the above
9 # copyright notice, this list of conditions and the following 9 # copyright notice, this list of conditions and the following
10 # disclaimer in the documentation and/or other materials provided 10 # disclaimer in the documentation and/or other materials provided
(...skipping 971 matching lines...) Expand 10 before | Expand all | Expand 10 after
982 ], 982 ],
983 }], 983 }],
984 ['OS=="win"', { 984 ['OS=="win"', {
985 'defines': [ 985 'defines': [
986 'WIN32', 986 'WIN32',
987 ], 987 ],
988 # 4351: VS 2005 and later are warning us that they've fixed a bug 988 # 4351: VS 2005 and later are warning us that they've fixed a bug
989 # present in VS 2003 and earlier. 989 # present in VS 2003 and earlier.
990 'msvs_disabled_warnings': [4351], 990 'msvs_disabled_warnings': [4351],
991 'msvs_configuration_attributes': { 991 'msvs_configuration_attributes': {
992 'OutputDirectory': '<(DEPTH)\\build\\$(ConfigurationName)',
993 'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)',
994 'CharacterSet': '1', 992 'CharacterSet': '1',
995 }, 993 },
996 }], 994 }],
997 ['OS=="win" and v8_target_arch=="ia32"', { 995 ['OS=="win" and v8_target_arch=="ia32"', {
998 'msvs_settings': { 996 'msvs_settings': {
999 'VCCLCompilerTool': { 997 'VCCLCompilerTool': {
1000 # Ensure no surprising artifacts from 80bit double math with x86. 998 # Ensure no surprising artifacts from 80bit double math with x86.
1001 'AdditionalOptions': ['/arch:SSE2'], 999 'AdditionalOptions': ['/arch:SSE2'],
1002 }, 1000 },
1003 }, 1001 },
(...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after
1411 ], 1409 ],
1412 }, 1410 },
1413 'Release_x64': { 1411 'Release_x64': {
1414 'inherit_from': ['ReleaseBase'], 1412 'inherit_from': ['ReleaseBase'],
1415 }, 1413 },
1416 }], 1414 }],
1417 ], 1415 ],
1418 }, # configurations 1416 }, # configurations
1419 }, # target_defaults 1417 }, # target_defaults
1420 } 1418 }
OLDNEW
« no previous file with comments | « no previous file | src/inspector/inspector.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698