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

Side by Side Diff: tools/gyp/v8.gyp

Issue 6062002: Merge 6006:6095 from bleeding_edge to experimental/gc branch. (Closed) Base URL: http://v8.googlecode.com/svn/branches/experimental/gc/
Patch Set: Created 10 years 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 | Annotate | Revision Log
« no previous file with comments | « test/mozilla/mozilla.status ('k') | tools/test.py » ('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 2009 the V8 project authors. All rights reserved. 1 # Copyright 2009 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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 }], 63 }],
64 ], 64 ],
65 }], 65 }],
66 ], 66 ],
67 'configurations': { 67 'configurations': {
68 'Debug': { 68 'Debug': {
69 'defines': [ 69 'defines': [
70 'DEBUG', 70 'DEBUG',
71 '_DEBUG', 71 '_DEBUG',
72 'ENABLE_DISASSEMBLER', 72 'ENABLE_DISASSEMBLER',
73 'V8_ENABLE_CHECKS' 73 'V8_ENABLE_CHECKS',
74 'OBJECT_PRINT',
74 ], 75 ],
75 'msvs_settings': { 76 'msvs_settings': {
76 'VCCLCompilerTool': { 77 'VCCLCompilerTool': {
77 'Optimizations': '0', 78 'Optimization': '0',
78 79
79 'conditions': [ 80 'conditions': [
80 ['OS=="win" and component=="shared_library"', { 81 ['OS=="win" and component=="shared_library"', {
81 'RuntimeLibrary': '3', # /MDd 82 'RuntimeLibrary': '3', # /MDd
82 }, { 83 }, {
83 'RuntimeLibrary': '1', # /MTd 84 'RuntimeLibrary': '1', # /MTd
84 }], 85 }],
85 ], 86 ],
86 }, 87 },
87 'VCLinkerTool': { 88 'VCLinkerTool': {
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 }, 128 },
128 }], 129 }],
129 ['OS=="win"', { 130 ['OS=="win"', {
130 'msvs_configuration_attributes': { 131 'msvs_configuration_attributes': {
131 'OutputDirectory': '$(SolutionDir)$(ConfigurationName)', 132 'OutputDirectory': '$(SolutionDir)$(ConfigurationName)',
132 'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)', 133 'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)',
133 'CharacterSet': '1', 134 'CharacterSet': '1',
134 }, 135 },
135 'msvs_settings': { 136 'msvs_settings': {
136 'VCCLCompilerTool': { 137 'VCCLCompilerTool': {
137 'Optimizations': '2', 138 'Optimization': '2',
138 'InlineFunctionExpansion': '2', 139 'InlineFunctionExpansion': '2',
139 'EnableIntrinsicFunctions': 'true', 140 'EnableIntrinsicFunctions': 'true',
140 'FavorSizeOrSpeed': '0', 141 'FavorSizeOrSpeed': '0',
141 'OmitFramePointers': 'true', 142 'OmitFramePointers': 'true',
142 'StringPooling': 'true', 143 'StringPooling': 'true',
143 144
144 'conditions': [ 145 'conditions': [
145 ['OS=="win" and component=="shared_library"', { 146 ['OS=="win" and component=="shared_library"', {
146 'RuntimeLibrary': '2', #/MD 147 'RuntimeLibrary': '2', #/MD
147 }, { 148 }, {
(...skipping 660 matching lines...) Expand 10 before | Expand all | Expand 10 after
808 ], 809 ],
809 'conditions': [ 810 'conditions': [
810 ['OS=="win"', { 811 ['OS=="win"', {
811 # This could be gotten by not setting chromium_code, if that's OK. 812 # This could be gotten by not setting chromium_code, if that's OK.
812 'defines': ['_CRT_SECURE_NO_WARNINGS'], 813 'defines': ['_CRT_SECURE_NO_WARNINGS'],
813 }], 814 }],
814 ], 815 ],
815 }, 816 },
816 ], 817 ],
817 } 818 }
OLDNEW
« no previous file with comments | « test/mozilla/mozilla.status ('k') | tools/test.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698