fix window cross-compilation

pull/7620/head
Qwerasd 2025-06-18 16:54:50 -06:00
parent ea1e507af7
commit 541bb0d4d9
2 changed files with 12 additions and 2 deletions

View File

@ -70,6 +70,16 @@ pub fn glfwWindowHints(config: *const configpkg.Config) glfw.Window.Hints {
};
}
/// 32-bit windows cross-compilation breaks with `.c` for some reason, so...
const gl_debug_proc_callconv =
@typeInfo(
@typeInfo(
@typeInfo(
gl.c.GLDEBUGPROC,
).optional.child,
).pointer.child,
).@"fn".calling_convention;
fn glDebugMessageCallback(
src: gl.c.GLenum,
typ: gl.c.GLenum,
@ -78,7 +88,7 @@ fn glDebugMessageCallback(
len: gl.c.GLsizei,
msg: [*c]const gl.c.GLchar,
user_param: ?*const anyopaque,
) callconv(.c) void {
) callconv(gl_debug_proc_callconv) void {
_ = user_param;
const src_str: []const u8 = switch (src) {

View File

@ -295,7 +295,7 @@ fn processIncludes(contents: [:0]const u8, basedir: []const u8) [:0]const u8 {
"{s}{s}{s}",
.{
contents[0..i],
@embedFile(basedir ++ .{std.fs.path.sep} ++ contents[start..end]),
@embedFile(basedir ++ "/" ++ contents[start..end]),
processIncludes(contents[end + 1 ..], basedir),
},
);