diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2020-10-15 19:39:44 -0700 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2020-10-15 19:39:44 -0700 |
| commit | 996a2284dde16b030a63cb9ba42f586c7a1b66cd (patch) | |
| tree | e081338028a98565fc44bd77c45bf90a3e1d862e /src | |
| parent | 51a3d0603c116d99c0a93dd451a69c79dd0cbca2 (diff) | |
| parent | d87bd3d8afc883853958389fcf4c65826426769b (diff) | |
| download | zig-996a2284dde16b030a63cb9ba42f586c7a1b66cd.tar.gz zig-996a2284dde16b030a63cb9ba42f586c7a1b66cd.zip | |
Merge branch 'AnthonyYoManz-5002-fix-entrypoint-with-winmain'
closes #5002
closes #5613
Diffstat (limited to 'src')
| -rw-r--r-- | src/link/Coff.zig | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/link/Coff.zig b/src/link/Coff.zig index 492dbfc8eb..334492e164 100644 --- a/src/link/Coff.zig +++ b/src/link/Coff.zig @@ -1097,17 +1097,13 @@ fn linkWithLLD(self: *Coff, comp: *Compilation) !void { try argv.append("-NODEFAULTLIB"); if (!is_lib) { if (self.base.options.module) |module| { - if (module.stage1_flags.have_winmain) { - try argv.append("-ENTRY:WinMain"); - } else if (module.stage1_flags.have_wwinmain) { - try argv.append("-ENTRY:wWinMain"); - } else if (module.stage1_flags.have_wwinmain_crt_startup) { - try argv.append("-ENTRY:wWinMainCRTStartup"); - } else { + if (module.stage1_flags.have_winmain_crt_startup) { try argv.append("-ENTRY:WinMainCRTStartup"); + } else { + try argv.append("-ENTRY:wWinMainCRTStartup"); } } else { - try argv.append("-ENTRY:WinMainCRTStartup"); + try argv.append("-ENTRY:wWinMainCRTStartup"); } } } |