From: jkummerow@chromium.org <jkummerow@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00>
Date: Tue, 17 Jan 2012 14:35:38 +0000 (+0000)
Subject: Move WIN32 define from standalone.gypi to common.gypi
X-Git-Tag: upstream/4.7.83~17595
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=188d7a9efbf8e25e4dab5ca474c992b7ad4db778;p=platform%2Fupstream%2Fv8.git

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
---

diff --git a/build/common.gypi b/build/common.gypi
index cd8d98e..e372af6 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -208,6 +208,11 @@
           'COMPRESS_STARTUP_DATA_BZ2',
         ],
       }],
+      ['OS=="win"', {
+        'defines': [
+          'WIN32',
+        ],
+      }],
       ['OS=="win" and v8_enable_prof==1', {
         'msvs_settings': {
           'VCLinkerTool': {
@@ -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
 }
diff --git a/build/standalone.gypi b/build/standalone.gypi
index 86f6d46..e9b0565 100644
--- a/build/standalone.gypi
+++ b/build/standalone.gypi
@@ -106,7 +106,6 @@
     ['OS=="win"', {
       'target_defaults': {
         'defines': [
-          'WIN32',
           '_CRT_SECURE_NO_DEPRECATE',
           '_CRT_NONSTDC_NO_DEPRECATE',
         ],