mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-06 14:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

WinMainCRTStartup implies defaulting to console subsystem

Browse Source
This commit is contained in:
Andrew Kelley 2019-12-03 12:52:28 -05:00
parent 6a046c1bcd
commit a91f552393
No known key found for this signature in database
GPG Key ID: 7C5F548F728501A9
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/std/builtin.zig
View File

@ -26,7 +26,8 @@ pub const subsystem: ?SubSystem = blk: {
if (is_test) { if (is_test) {
break :blk SubSystem.Console; break :blk SubSystem.Console;
} }
if (@hasDecl(root, "WinMain") or if (@hasDecl(root, "main") or
@hasDecl(root, "WinMain") or
@hasDecl(root, "wWinMain") or @hasDecl(root, "wWinMain") or
@hasDecl(root, "WinMainCRTStartup") or @hasDecl(root, "WinMainCRTStartup") or
@hasDecl(root, "wWinMainCRTStartup")) @hasDecl(root, "wWinMainCRTStartup"))

4
src/codegen.cpp
View File

@ -8229,9 +8229,9 @@ TargetSubsystem detect_subsystem(CodeGen *g) {
if (g->zig_target->os == OsWindows) { if (g->zig_target->os == OsWindows) {
if (g->have_dllmain_crt_startup || (g->out_type == OutTypeLib && g->is_dynamic)) if (g->have_dllmain_crt_startup || (g->out_type == OutTypeLib && g->is_dynamic))
return TargetSubsystemAuto; return TargetSubsystemAuto;
if (g->have_c_main || g->is_test_build) if (g->have_c_main || g->is_test_build || g->have_winmain_crt_startup)
return TargetSubsystemConsole; return TargetSubsystemConsole;
if (g->have_winmain || g->have_winmain_crt_startup) if (g->have_winmain)
return TargetSubsystemWindows; return TargetSubsystemWindows;
} else if (g->zig_target->os == OsUefi) { } else if (g->zig_target->os == OsUefi) {
return TargetSubsystemEfiApplication; return TargetSubsystemEfiApplication;