diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2020-02-10 00:26:33 -0500 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2020-02-10 00:26:33 -0500 |
| commit | cdc5070f216a924d24588b8d0fe06400e036e6bf (patch) | |
| tree | c1943e1831725e41810ea4db4eb1785a130e18e1 /src/link.cpp | |
| parent | 9e5b2489913f72764ded2089bccd7e612a3cc347 (diff) | |
| parent | 014f66e6de4aaf81f32c796b12f981326a479397 (diff) | |
| download | zig-cdc5070f216a924d24588b8d0fe06400e036e6bf.tar.gz zig-cdc5070f216a924d24588b8d0fe06400e036e6bf.zip | |
Merge remote-tracking branch 'origin/master' into llvm10
Diffstat (limited to 'src/link.cpp')
| -rw-r--r-- | src/link.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/link.cpp b/src/link.cpp index aa94707534..aa5cda9bab 100644 --- a/src/link.cpp +++ b/src/link.cpp @@ -2210,6 +2210,10 @@ static void add_win_link_args(LinkJob *lj, bool is_library, bool *have_windows_d if (!is_library) { if (lj->codegen->have_winmain) { lj->args.append("-ENTRY:WinMain"); + } else if (lj->codegen->have_wwinmain) { + lj->args.append("-ENTRY:wWinMain"); + } else if (lj->codegen->have_wwinmain_crt_startup) { + lj->args.append("-ENTRY:wWinMainCRTStartup"); } else { lj->args.append("-ENTRY:WinMainCRTStartup"); } |