Skip to content

Fix Windows build when targeting the MSVC ABI #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −4
Open

Fix Windows build when targeting the MSVC ABI #26

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions build.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ pub fn build(b: *std.Build) void {
) orelse false;

var windows = false;
var windows_gnu = false;
var linux = false;
var linux_deps_values: ?LinuxDepsValues = null;
var macos = false;
Expand All @@ -88,6 +89,7 @@ pub fn build(b: *std.Build) void {
switch (target.result.os.tag) {
.windows => {
windows = true;
windows_gnu = target.result.abi.isGnu();
},
.linux => {
linux = true;
Expand Down Expand Up @@ -148,7 +150,7 @@ pub fn build(b: *std.Build) void {
.HAVE_SIGNAL_H = windows or linux or macos or emscripten,
.HAVE_STDIO_H = windows or linux or macos or emscripten,
.HAVE_STDLIB_H = windows or linux or macos or emscripten,
.HAVE_STRINGS_H = windows or linux or macos or emscripten,
.HAVE_STRINGS_H = (windows and windows_gnu) or linux or macos or emscripten,
.HAVE_STRING_H = windows or linux or macos or emscripten,
.HAVE_SYS_TYPES_H = windows or linux or macos or emscripten,
.HAVE_WCHAR_H = windows or linux or macos or emscripten,
Expand Down Expand Up @@ -187,8 +189,8 @@ pub fn build(b: *std.Build) void {
.HAVE_STRRCHR = windows or linux or macos or emscripten,
.HAVE_STRSTR = windows or linux or macos or emscripten,
.HAVE_STRNSTR = macos,
.HAVE_STRTOK_R = windows or linux or macos or emscripten,
.HAVE_ITOA = windows,
.HAVE_STRTOK_R = (windows and windows_gnu) or linux or macos or emscripten,
.HAVE_ITOA = (windows and windows_gnu),
.HAVE__LTOA = windows,
.HAVE__UITOA = false,
.HAVE__ULTOA = windows,
Expand Down Expand Up @@ -304,7 +306,7 @@ pub fn build(b: *std.Build) void {
.HAVE_DXGI1_6_H = windows,
.HAVE_MMDEVICEAPI_H = windows,
.HAVE_TPCSHRD_H = windows,
.HAVE_ROAPI_H = windows,
.HAVE_ROAPI_H = (windows and windows_gnu),
.HAVE_SHELLSCALINGAPI_H = windows,
.USE_POSIX_SPAWN = false,
.SDL_DEFAULT_ASSERT_LEVEL_CONFIGURED = false,
Expand Down