authorgravatar for ypsvlq@gmail.comElaine Gibson <ypsvlq@gmail.com> 2024-03-18 12:47:15+00:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2024-03-20 15:02:04-07:00
log19b69959395b0ebb209815c5dbf29a5b21447df9
tree12e9ab1cc8973743115678a373762e16b1c92516
parente4ed63f1384902f5662b66203ebb3415e0cbfdb2

mingw: define _WIN32_WINNT when building CRT

2 files changed, 10 insertions(+), 10 deletions(-)

src/Compilation.zig+9-10
...@@ -5205,22 +5205,21 @@ pub fn addCCArgs(...@@ -5205,22 +5205,21 @@ pub fn addCCArgs(
5205 } else if (target.isMinGW()) {5205 } else if (target.isMinGW()) {
5206 try argv.append("-D__MSVCRT_VERSION__=0xE00"); // use ucrt5206 try argv.append("-D__MSVCRT_VERSION__=0xE00"); // use ucrt
52075207
5208 switch (ext) {
5209 .c, .cpp, .m, .mm, .h, .hpp, .hm, .hmm, .cu, .rc, .assembly, .assembly_with_cpp => {
5210 const minver: u16 = @truncate(@intFromEnum(target.os.getVersionRange().windows.min) >> 16);
5211 try argv.append(
5212 try std.fmt.allocPrint(arena, "-D_WIN32_WINNT=0x{x:0>4}", .{minver}),
5213 );
5214 },
5215 else => {},
5216 }
5208 }5217 }
5209 }5218 }
52105219
5211 const llvm_triple = try @import("codegen/llvm.zig").targetTriple(arena, target);5220 const llvm_triple = try @import("codegen/llvm.zig").targetTriple(arena, target);
5212 try argv.appendSlice(&[_][]const u8{ "-target", llvm_triple });5221 try argv.appendSlice(&[_][]const u8{ "-target", llvm_triple });
52135222
5214 if (target.os.tag == .windows) switch (ext) {
5215 .c, .cpp, .m, .mm, .h, .hpp, .hm, .hmm, .cu, .rc, .assembly, .assembly_with_cpp => {
5216 const minver: u16 = @truncate(@intFromEnum(target.os.getVersionRange().windows.min) >> 16);
5217 try argv.append(
5218 try std.fmt.allocPrint(arena, "-D_WIN32_WINNT=0x{x:0>4}", .{minver}),
5219 );
5220 },
5221 else => {},
5222 };
5223
5224 switch (ext) {5223 switch (ext) {
5225 .c, .cpp, .m, .mm, .h, .hpp, .hm, .hmm, .cu, .rc => {5224 .c, .cpp, .m, .mm, .h, .hpp, .hm, .hmm, .cu, .rc => {
5226 try argv.appendSlice(&[_][]const u8{5225 try argv.appendSlice(&[_][]const u8{
src/mingw.zig+1
...@@ -152,6 +152,7 @@ fn add_cc_args(...@@ -152,6 +152,7 @@ fn add_cc_args(
152 "-D_CRTBLD",152 "-D_CRTBLD",
153 "-D_SYSCRT=1",153 "-D_SYSCRT=1",
154 "-DCRTDLL=1",154 "-DCRTDLL=1",
155 "-D_WIN32_WINNT=0x0f00",
155 // According to Martin Storsjö,156 // According to Martin Storsjö,
156 // > the files under mingw-w64-crt are designed to always157 // > the files under mingw-w64-crt are designed to always
157 // be built with __MSVCRT_VERSION__=0x700158 // be built with __MSVCRT_VERSION__=0x700