Merge pull request #4871 from lumenkeyes/add-zig-android-target

small build.zig fix
This commit is contained in:
Ray 2025-04-01 20:00:16 +02:00 committed by GitHub
commit b529f52dab
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -238,17 +238,15 @@ fn compileRaylib(b: *std.Build, target: std.Build.ResolvedTarget, optimize: std.
raylib.addSystemIncludePath( .{ .cwd_relative = androidAsmPath}); raylib.addSystemIncludePath( .{ .cwd_relative = androidAsmPath});
raylib.addSystemIncludePath(.{ .cwd_relative = androidGluePath}); raylib.addSystemIncludePath(.{ .cwd_relative = androidGluePath});
const libcFile = try std.fs.cwd().createFile("android-libc.txt", .{}); var libcData = std.ArrayList(u8).init(b.allocator);
const writer = libcFile.writer(); const writer = libcData.writer();
const libc = std.zig.LibCInstallation{ try (std.zig.LibCInstallation{
.include_dir = androidIncludePath, .include_dir = androidIncludePath,
.sys_include_dir = androidIncludePath, .sys_include_dir = androidIncludePath,
.crt_dir = androidApiSpecificPath, .crt_dir = androidApiSpecificPath,
}; }).render(writer);
try libc.render(writer); const libcFile = b.addWriteFiles().add("android-libc.txt", try libcData.toOwnedSlice());
libcFile.close(); raylib.setLibCFile(libcFile);
raylib.setLibCFile(b.path("android-libc.txt"));
if (options.opengl_version == .auto) { if (options.opengl_version == .auto) {
raylib.root_module.linkSystemLibrary("GLESv2", .{}); raylib.root_module.linkSystemLibrary("GLESv2", .{});