windows: merge msvc-helper into ninja.exe itself

Now "ninja -t msvc ..." passes the "..." to the msvc helper main.
This drastically simplifies bootstrap and makes ninja a single
binary again.

1 files changed, 5 insertions, 5 deletions

diff --git a/src/msvc_helper_main-win32.cc b/src/msvc_helper_main-win32.cc
index f265010..0c8db37 100644
--- a/src/msvc_helper_main-win32.cc
+++ b/src/msvc_helper_main-win32.cc
@@ -24,9 +24,7 @@ namespace {
 
 void Usage() {
   printf(
-"ninja-msvc-helper: adjust msvc command-line tools for use by ninja.\n"
-"\n"
-"usage: ninja-mvsc-helper [options] -- command args\n"
+"usage: ninja -t msvc [options] -- cl.exe /showIncludes /otherArgs\n"
 "options:\n"
 "  -e ENVFILE load environment block from ENVFILE as environment\n"
 "  -r BASE    normalize paths and make relative to BASE before output\n"
@@ -48,7 +46,7 @@ void PushPathIntoEnvironment(const string& env_block) {
 
 }  // anonymous namespace
 
-int main(int argc, char** argv) {
+int MSVCHelperMain(int argc, char** argv) {
   const char* output_filename = NULL;
   const char* relative_to = NULL;
   const char* envfile = NULL;
@@ -76,8 +74,10 @@ int main(int argc, char** argv) {
     }
   }
 
-  if (!output_filename)
+  if (!output_filename) {
+    Usage();
     Fatal("-o required");
+  }
 
   string env;
   if (envfile) {