Revision: 10423 Author: [email protected] Date: Tue Jan 17 06:35:38 2012 Log: Move WIN32 define from standalone.gypi to common.gypi
BUG=v8:1760 Review URL: https://chromiumcodereview.appspot.com/9231018 http://code.google.com/p/v8/source/detail?r=10423 Modified: /branches/bleeding_edge/build/common.gypi /branches/bleeding_edge/build/standalone.gypi ======================================= --- /branches/bleeding_edge/build/common.gypi Mon Jan 16 05:29:12 2012 +++ /branches/bleeding_edge/build/common.gypi Tue Jan 17 06:35:38 2012 @@ -207,6 +207,11 @@ 'defines': [ 'COMPRESS_STARTUP_DATA_BZ2', ], + }], + ['OS=="win"', { + 'defines': [ + 'WIN32', + ], }], ['OS=="win" and v8_enable_prof==1', { 'msvs_settings': { @@ -227,7 +232,7 @@ ['OS=="solaris"', { 'defines': [ '__C99FEATURES__=1' ], # isinf() etc. }], - ], + ], # conditions 'configurations': { 'Debug': { 'defines': [ @@ -268,7 +273,7 @@ '-Wnon-virtual-dtor' ], }], ], - }, + }, # Debug 'Release': { 'conditions': [ ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd" \ @@ -308,7 +313,7 @@ # is specified explicitly. 'GCC_STRICT_ALIASING': 'YES', }, - }], + }], # OS=="mac" ['OS=="win"', { 'msvs_configuration_attributes': { 'OutputDirectory': '<(DEPTH)\\build\\$(ConfigurationName)', @@ -343,9 +348,9 @@ # 'StackReserveSize': '297152', }, }, - }], - ], - }, - }, - }, -} + }], # OS=="win" + ], # conditions + }, # Release + }, # configurations + }, # target_defaults +} ======================================= --- /branches/bleeding_edge/build/standalone.gypi Thu Jan 5 04:17:08 2012 +++ /branches/bleeding_edge/build/standalone.gypi Tue Jan 17 06:35:38 2012 @@ -106,7 +106,6 @@ ['OS=="win"', { 'target_defaults': { 'defines': [ - 'WIN32', '_CRT_SECURE_NO_DEPRECATE', '_CRT_NONSTDC_NO_DEPRECATE', ], -- v8-dev mailing list [email protected] http://groups.google.com/group/v8-dev
