Make gyp work with MingW32

Review URL: https://codereview.chromium.org/13468015
Patch from Haitao Feng <haitao.feng@intel.com>.

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@14257 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/test/cctest/test-platform-win32.cc b/test/cctest/test-platform-win32.cc
index 1f96ce6..a5089d3 100644 (file)
--- a/test/cctest/test-platform-win32.cc
+++ b/test/cctest/test-platform-win32.cc
@@ -33,6 +33,7 @@
 
 #include "platform.h"
 #include "cctest.h"
+#include "win32-headers.h"
 
 using namespace ::v8::internal;
 

diff --git a/tools/gyp/v8.gyp b/tools/gyp/v8.gyp
index 5e7086b..4522187 100644 (file)
--- a/tools/gyp/v8.gyp
+++ b/tools/gyp/v8.gyp
@@ -747,15 +747,26 @@
               ]},
             ],
             ['OS=="win"', {
+              'variables': {
+                'gyp_generators': '<!(echo $GYP_GENERATORS)',
+              },
               'sources': [
                 '../../src/platform-win32.cc',
                 '../../src/win32-math.cc',
                 '../../src/win32-math.h',
               ],
-              'msvs_disabled_warnings': [4351, 4355, 4800],
-              'link_settings':  {
-                'libraries': [ '-lwinmm.lib', '-lws2_32.lib' ],
-              },
+              'conditions': [
+                ['gyp_generators=="make"', {
+                  'link_settings':  {
+                    'libraries': [ '-lwinmm', '-lws2_32' ],
+                  },
+                }, {
+                  'msvs_disabled_warnings': [4351, 4355, 4800],
+                  'link_settings':  {
+                    'libraries': [ '-lwinmm.lib', '-lws2_32.lib' ],
+                  },
+                }],
+              ],
             }],
             ['component=="shared_library"', {
               'defines': [