Move WIN32 define from standalone.gypi to common.gypi

BUG=v8:1760

Review URL: https://chromiumcodereview.appspot.com/9231018

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@10423 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 6d0d6a56
...@@ -208,6 +208,11 @@ ...@@ -208,6 +208,11 @@
'COMPRESS_STARTUP_DATA_BZ2', 'COMPRESS_STARTUP_DATA_BZ2',
], ],
}], }],
['OS=="win"', {
'defines': [
'WIN32',
],
}],
['OS=="win" and v8_enable_prof==1', { ['OS=="win" and v8_enable_prof==1', {
'msvs_settings': { 'msvs_settings': {
'VCLinkerTool': { 'VCLinkerTool': {
...@@ -227,7 +232,7 @@ ...@@ -227,7 +232,7 @@
['OS=="solaris"', { ['OS=="solaris"', {
'defines': [ '__C99FEATURES__=1' ], # isinf() etc. 'defines': [ '__C99FEATURES__=1' ], # isinf() etc.
}], }],
], ], # conditions
'configurations': { 'configurations': {
'Debug': { 'Debug': {
'defines': [ 'defines': [
...@@ -268,7 +273,7 @@ ...@@ -268,7 +273,7 @@
'-Wnon-virtual-dtor' ], '-Wnon-virtual-dtor' ],
}], }],
], ],
}, }, # Debug
'Release': { 'Release': {
'conditions': [ 'conditions': [
['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd" \ ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd" \
...@@ -308,7 +313,7 @@ ...@@ -308,7 +313,7 @@
# is specified explicitly. # is specified explicitly.
'GCC_STRICT_ALIASING': 'YES', 'GCC_STRICT_ALIASING': 'YES',
}, },
}], }], # OS=="mac"
['OS=="win"', { ['OS=="win"', {
'msvs_configuration_attributes': { 'msvs_configuration_attributes': {
'OutputDirectory': '<(DEPTH)\\build\\$(ConfigurationName)', 'OutputDirectory': '<(DEPTH)\\build\\$(ConfigurationName)',
...@@ -343,9 +348,9 @@ ...@@ -343,9 +348,9 @@
# 'StackReserveSize': '297152', # 'StackReserveSize': '297152',
}, },
}, },
}], }], # OS=="win"
], ], # conditions
}, }, # Release
}, }, # configurations
}, }, # target_defaults
} }
...@@ -106,7 +106,6 @@ ...@@ -106,7 +106,6 @@
['OS=="win"', { ['OS=="win"', {
'target_defaults': { 'target_defaults': {
'defines': [ 'defines': [
'WIN32',
'_CRT_SECURE_NO_DEPRECATE', '_CRT_SECURE_NO_DEPRECATE',
'_CRT_NONSTDC_NO_DEPRECATE', '_CRT_NONSTDC_NO_DEPRECATE',
], ],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment