diff options
| author | Evan Martin <martine@danga.com> | 2013-05-25 15:30:57 (GMT) |
|---|---|---|
| committer | Evan Martin <martine@danga.com> | 2013-05-25 15:30:57 (GMT) |
| commit | c460635bd2f796b8473b1c7372d7b1e2281ac750 (patch) | |
| tree | 7ed083f06ff29fff5045882eb0a28d93c6a3f427 | |
| parent | cc47bfb1ce599f4b3f20679d96e258bb595c2dc3 (diff) | |
| parent | fe2dd5b33fd13b1e8ef0cfdca78bab95cb50346c (diff) | |
| download | Ninja-c460635bd2f796b8473b1c7372d7b1e2281ac750.zip Ninja-c460635bd2f796b8473b1c7372d7b1e2281ac750.tar.gz Ninja-c460635bd2f796b8473b1c7372d7b1e2281ac750.tar.bz2 | |
Merge pull request #588 from jonforums/mingw-fix
Fix mingw based builds. Fixes #587
| -rw-r--r-- | src/ninja.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ninja.cc b/src/ninja.cc index cd34b1a..3b381b7 100644 --- a/src/ninja.cc +++ b/src/ninja.cc @@ -361,7 +361,7 @@ int NinjaMain::ToolBrowse(int argc, char* argv[]) { } #endif // _WIN32 -#if defined(_WIN32) +#if defined(_MSC_VER) int NinjaMain::ToolMSVC(int argc, char* argv[]) { // Reset getopt: push one argument onto the front of argv, reset optind. argc++; @@ -636,7 +636,7 @@ const Tool* ChooseTool(const string& tool_name) { { "browse", "browse dependency graph in a web browser", Tool::RUN_AFTER_LOAD, &NinjaMain::ToolBrowse }, #endif -#if defined(_WIN32) +#if defined(_MSC_VER) { "msvc", "build helper for MSVC cl.exe (EXPERIMENTAL)", Tool::RUN_AFTER_FLAGS, &NinjaMain::ToolMSVC }, #endif |