Make addDeps cleaner

This commit is contained in:
Krzysztof Wolicki
2024-01-15 21:49:22 +01:00
parent 9157df114c
commit c8c2f4b0ff

View File

@ -821,94 +821,78 @@ fn addDeps(
.search_strategy = .mode_first, .search_strategy = .mode_first,
}; };
const target_triple: []const u8 = try step.rootModuleTarget().zigTriple(b.allocator); const target = step.root_module.resolved_target.?;
const cpu_opts: []const u8 = try step.root_module.resolved_target.?.query.serializeCpuAlloc(b.allocator); const optimize = step.root_module.optimize.?;
// Dependencies // Dependencies
const cimgui_dep = b.dependency("cimgui", .{ const cimgui_dep = b.dependency("cimgui", .{
.target = target_triple, .target = target,
.cpu = cpu_opts, .optimize = optimize,
.optimize = step.root_module.optimize.?,
}); });
const js_dep = b.dependency("zig_js", .{ const js_dep = b.dependency("zig_js", .{
.target = target_triple, .target = target,
.cpu = cpu_opts, .optimize = optimize,
.optimize = step.root_module.optimize.?,
}); });
const libxev_dep = b.dependency("libxev", .{ const libxev_dep = b.dependency("libxev", .{
.target = target_triple, .target = target,
.cpu = cpu_opts, .optimize = optimize,
.optimize = step.root_module.optimize.?,
}); });
const objc_dep = b.dependency("zig_objc", .{ const objc_dep = b.dependency("zig_objc", .{
.target = target_triple, .target = target,
.cpu = cpu_opts, .optimize = optimize,
.optimize = step.root_module.optimize.?,
}); });
const fontconfig_dep = b.dependency("fontconfig", .{ const fontconfig_dep = b.dependency("fontconfig", .{
.target = target_triple, .target = target,
.cpu = cpu_opts, .optimize = optimize,
.optimize = step.root_module.optimize.?,
}); });
const freetype_dep = b.dependency("freetype", .{ const freetype_dep = b.dependency("freetype", .{
.target = target_triple, .target = target,
.cpu = cpu_opts, .optimize = optimize,
.optimize = step.root_module.optimize.?,
.@"enable-libpng" = true, .@"enable-libpng" = true,
}); });
const glslang_dep = b.dependency("glslang", .{ const glslang_dep = b.dependency("glslang", .{
.target = target_triple, .target = target,
.cpu = cpu_opts, .optimize = optimize,
.optimize = step.root_module.optimize.?,
}); });
const spirv_cross_dep = b.dependency("spirv_cross", .{ const spirv_cross_dep = b.dependency("spirv_cross", .{
.target = target_triple, .target = target,
.cpu = cpu_opts, .optimize = optimize,
.optimize = step.root_module.optimize.?,
}); });
const mach_glfw_dep = b.dependency("mach_glfw", .{ const mach_glfw_dep = b.dependency("mach_glfw", .{
.target = target_triple, .target = target,
.cpu = cpu_opts, .optimize = optimize,
.optimize = step.root_module.optimize.?,
}); });
const libpng_dep = b.dependency("libpng", .{ const libpng_dep = b.dependency("libpng", .{
.target = target_triple, .target = target,
.cpu = cpu_opts, .optimize = optimize,
.optimize = step.root_module.optimize.?,
}); });
const macos_dep = b.dependency("macos", .{ const macos_dep = b.dependency("macos", .{
.target = target_triple, .target = target,
.cpu = cpu_opts, .optimize = optimize,
.optimize = step.root_module.optimize.?,
}); });
const oniguruma_dep = b.dependency("oniguruma", .{ const oniguruma_dep = b.dependency("oniguruma", .{
.target = target_triple, .target = target,
.cpu = cpu_opts, .optimize = optimize,
.optimize = step.root_module.optimize.?,
}); });
const opengl_dep = b.dependency("opengl", .{}); const opengl_dep = b.dependency("opengl", .{});
const pixman_dep = b.dependency("pixman", .{ const pixman_dep = b.dependency("pixman", .{
.target = target_triple, .target = target,
.cpu = cpu_opts, .optimize = optimize,
.optimize = step.root_module.optimize.?,
}); });
const zlib_dep = b.dependency("zlib", .{ const zlib_dep = b.dependency("zlib", .{
.target = target_triple, .target = target,
.cpu = cpu_opts, .optimize = optimize,
.optimize = step.root_module.optimize.?,
}); });
const harfbuzz_dep = b.dependency("harfbuzz", .{ const harfbuzz_dep = b.dependency("harfbuzz", .{
.target = target_triple, .target = target,
.cpu = cpu_opts, .optimize = optimize,
.optimize = step.root_module.optimize.?,
.@"enable-freetype" = true, .@"enable-freetype" = true,
.@"enable-coretext" = config.font_backend.hasCoretext(), .@"enable-coretext" = config.font_backend.hasCoretext(),
}); });
const ziglyph_dep = b.dependency("ziglyph", .{ const ziglyph_dep = b.dependency("ziglyph", .{
.target = target_triple, .target = target,
.cpu = cpu_opts, .optimize = optimize,
.optimize = step.root_module.optimize.?,
}); });
// Wasm we do manually since it is such a different build. // Wasm we do manually since it is such a different build.