From 1a414c7b6be312e59a419aa2346a602fa962c94a Mon Sep 17 00:00:00 2001
From: Andrew Kelley <superjoe30@gmail.com>
Date: Fri, 27 Oct 2017 01:29:58 -0400
Subject: [PATCH] delete -municode command line argument

The solution to this is to always have it on and only
use the 'W' versions of respective windows APIs.

See the issue for this.
---
 src/all_types.hpp | 1 -
 src/codegen.cpp   | 4 ----
 src/codegen.hpp   | 1 -
 src/main.cpp      | 5 -----
 4 files changed, 11 deletions(-)

diff --git a/src/all_types.hpp b/src/all_types.hpp
index 9f59ae2aac..318e6b2c11 100644
--- a/src/all_types.hpp
+++ b/src/all_types.hpp
@@ -1491,7 +1491,6 @@ struct CodeGen {
     Buf *root_out_name;
     bool windows_subsystem_windows;
     bool windows_subsystem_console;
-    bool windows_linker_unicode;
     Buf *mmacosx_version_min;
     Buf *mios_version_min;
     bool linker_rdynamic;
diff --git a/src/codegen.cpp b/src/codegen.cpp
index 0a78ef0740..1dc8205c8e 100644
--- a/src/codegen.cpp
+++ b/src/codegen.cpp
@@ -261,10 +261,6 @@ void codegen_set_windows_subsystem(CodeGen *g, bool mwindows, bool mconsole) {
     g->windows_subsystem_console = mconsole;
 }
 
-void codegen_set_windows_unicode(CodeGen *g, bool municode) {
-    g->windows_linker_unicode = municode;
-}
-
 void codegen_set_mmacosx_version_min(CodeGen *g, Buf *mmacosx_version_min) {
     g->mmacosx_version_min = mmacosx_version_min;
 }
diff --git a/src/codegen.hpp b/src/codegen.hpp
index cc7721e9f8..5c54e9bce8 100644
--- a/src/codegen.hpp
+++ b/src/codegen.hpp
@@ -34,7 +34,6 @@ void codegen_set_msvc_lib_dir(CodeGen *codegen, Buf *msvc_lib_dir);
 void codegen_set_kernel32_lib_dir(CodeGen *codegen, Buf *kernel32_lib_dir);
 void codegen_set_dynamic_linker(CodeGen *g, Buf *dynamic_linker);
 void codegen_set_windows_subsystem(CodeGen *g, bool mwindows, bool mconsole);
-void codegen_set_windows_unicode(CodeGen *g, bool municode);
 void codegen_add_lib_dir(CodeGen *codegen, const char *dir);
 LinkLib *codegen_add_link_lib(CodeGen *codegen, Buf *lib);
 void codegen_add_framework(CodeGen *codegen, const char *name);
diff --git a/src/main.cpp b/src/main.cpp
index bee021c6a5..358f1cf255 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -73,7 +73,6 @@ static int usage(const char *arg0) {
         "  -rpath $path                 add directory to the runtime library search path\n"
         "  -mconsole                    (windows) --subsystem console to the linker\n"
         "  -mwindows                    (windows) --subsystem windows to the linker\n"
-        "  -municode                    (windows) link with unicode\n"
         "  -framework $name             (darwin) link against framework\n"
         "  -mios-version-min $ver       (darwin) set iOS deployment target\n"
         "  -mmacosx-version-min $ver    (darwin) set Mac OS X deployment target\n"
@@ -302,7 +301,6 @@ int main(int argc, char **argv) {
     const char *target_environ = nullptr;
     bool mwindows = false;
     bool mconsole = false;
-    bool municode = false;
     bool rdynamic = false;
     const char *mmacosx_version_min = nullptr;
     const char *mios_version_min = nullptr;
@@ -487,8 +485,6 @@ int main(int argc, char **argv) {
                 mwindows = true;
             } else if (strcmp(arg, "-mconsole") == 0) {
                 mconsole = true;
-            } else if (strcmp(arg, "-municode") == 0) {
-                municode = true;
             } else if (strcmp(arg, "-rdynamic") == 0) {
                 rdynamic = true;
             } else if (strcmp(arg, "--each-lib-rpath") == 0) {
@@ -790,7 +786,6 @@ int main(int argc, char **argv) {
             }
 
             codegen_set_windows_subsystem(g, mwindows, mconsole);
-            codegen_set_windows_unicode(g, municode);
             codegen_set_rdynamic(g, rdynamic);
             if (mmacosx_version_min && mios_version_min) {
                 fprintf(stderr, "-mmacosx-version-min and -mios-version-min options not allowed together\n");