From 1356dfeec28a143b53dc23d8f8440ac419832816 Mon Sep 17 00:00:00 2001 From: Ginger Bill Date: Thu, 5 Jan 2017 21:58:24 +0000 Subject: [PATCH] Fix SUBSYSTEM for link.exe --- src/ir.c | 2 +- src/ir_print.c | 1 + src/main.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/ir.c b/src/ir.c index 88c0f6b71f2..5574dc38aa1 100644 --- a/src/ir.c +++ b/src/ir.c @@ -5343,7 +5343,7 @@ void ir_gen_tree(irGen *s) { ir_end_procedure_body(proc); } #endif -#if defined(GB_SYSTEM_WINDOWS) +#if 0 && defined(GB_SYSTEM_WINDOWS) if (!m->build_context->is_dll && !has_win_main) { // WinMain :: proc(inst, prev: rawptr, cmd_line: ^byte, cmd_show: i32) -> i32 String name = str_lit("WinMain"); diff --git a/src/ir_print.c b/src/ir_print.c index 4ceb7fe18ff..a4f3dfae33e 100644 --- a/src/ir_print.c +++ b/src/ir_print.c @@ -565,6 +565,7 @@ bool ir_print_is_proc_global(irModule *m, irProcedure *proc) { if (proc->entity != NULL && proc->entity->kind == Entity_Procedure) { if (m->entry_point_entity == proc->entity) { + // gb_printf("%.*s\n", LIT(proc->entity->token.string)); // TODO(bill): This may not be needed during windows return true; } diff --git a/src/main.c b/src/main.c index b340f4bc66e..92bdb06bf96 100644 --- a/src/main.c +++ b/src/main.c @@ -254,7 +254,7 @@ int main(int argc, char **argv) { exit_code = win32_exec_command_line_app("msvc-link", true, "link %.*s.obj -OUT:%.*s.%s %s " "/defaultlib:libcmt " - "/nologo /incremental:no /opt:ref /subsystem:WINDOWS " + "/nologo /incremental:no /opt:ref /subsystem:CONSOLE " " %.*s " " %s " "",