authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2017-10-27 01:29:58-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2017-10-27 01:29:58-04:00
log1a414c7b6be312e59a419aa2346a602fa962c94a
treeea23991bb6bfbb6986c8086cad3973fbb2a89941
parent4c306af4eb79071c966b99e877970f0a4582d891

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.

4 files changed, 0 insertions(+), 11 deletions(-)

src/all_types.hpp-1
......@@ -1491,7 +1491,6 @@ struct CodeGen {
14911491 Buf *root_out_name;
14921492 bool windows_subsystem_windows;
14931493 bool windows_subsystem_console;
1494 bool windows_linker_unicode;
14951494 Buf *mmacosx_version_min;
14961495 Buf *mios_version_min;
14971496 bool linker_rdynamic;
src/codegen.cpp-4
......@@ -261,10 +261,6 @@ void codegen_set_windows_subsystem(CodeGen *g, bool mwindows, bool mconsole) {
261261 g->windows_subsystem_console = mconsole;
262262}
263263
264void codegen_set_windows_unicode(CodeGen *g, bool municode) {
265 g->windows_linker_unicode = municode;
266}
267
268264void codegen_set_mmacosx_version_min(CodeGen *g, Buf *mmacosx_version_min) {
269265 g->mmacosx_version_min = mmacosx_version_min;
270266}
src/codegen.hpp-1
......@@ -34,7 +34,6 @@ void codegen_set_msvc_lib_dir(CodeGen *codegen, Buf *msvc_lib_dir);
3434void codegen_set_kernel32_lib_dir(CodeGen *codegen, Buf *kernel32_lib_dir);
3535void codegen_set_dynamic_linker(CodeGen *g, Buf *dynamic_linker);
3636void codegen_set_windows_subsystem(CodeGen *g, bool mwindows, bool mconsole);
37void codegen_set_windows_unicode(CodeGen *g, bool municode);
3837void codegen_add_lib_dir(CodeGen *codegen, const char *dir);
3938LinkLib *codegen_add_link_lib(CodeGen *codegen, Buf *lib);
4039void codegen_add_framework(CodeGen *codegen, const char *name);
src/main.cpp-5
......@@ -73,7 +73,6 @@ static int usage(const char *arg0) {
7373 " -rpath $path add directory to the runtime library search path\n"
7474 " -mconsole (windows) --subsystem console to the linker\n"
7575 " -mwindows (windows) --subsystem windows to the linker\n"
76 " -municode (windows) link with unicode\n"
7776 " -framework $name (darwin) link against framework\n"
7877 " -mios-version-min $ver (darwin) set iOS deployment target\n"
7978 " -mmacosx-version-min $ver (darwin) set Mac OS X deployment target\n"
......@@ -302,7 +301,6 @@ int main(int argc, char **argv) {
302301 const char *target_environ = nullptr;
303302 bool mwindows = false;
304303 bool mconsole = false;
305 bool municode = false;
306304 bool rdynamic = false;
307305 const char *mmacosx_version_min = nullptr;
308306 const char *mios_version_min = nullptr;
......@@ -487,8 +485,6 @@ int main(int argc, char **argv) {
487485 mwindows = true;
488486 } else if (strcmp(arg, "-mconsole") == 0) {
489487 mconsole = true;
490 } else if (strcmp(arg, "-municode") == 0) {
491 municode = true;
492488 } else if (strcmp(arg, "-rdynamic") == 0) {
493489 rdynamic = true;
494490 } else if (strcmp(arg, "--each-lib-rpath") == 0) {
......@@ -790,7 +786,6 @@ int main(int argc, char **argv) {
790786 }
791787
792788 codegen_set_windows_subsystem(g, mwindows, mconsole);
793 codegen_set_windows_unicode(g, municode);
794789 codegen_set_rdynamic(g, rdynamic);
795790 if (mmacosx_version_min && mios_version_min) {
796791 fprintf(stderr, "-mmacosx-version-min and -mios-version-min options not allowed together\n");