zig/libvaxis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build!: make zigimg a required dependency

Browse source 
Require zigimg as a dependency. Remove build_options module, since we
have no more build options.
This commit is contained in:
Tim Culverhouse 2024-10-30 10:44:06 -05:00
parent aaf1bb4784
commit f1cad6da59
2 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
build.zig
View file

@ -1,13 +1,6 @@
const std = @import("std");
pub fn build(b: *std.Build) void {
const include_images = b.option(bool, "images", "Enable support for images (default: true)") orelse true;
const options = b.addOptions();
options.addOption(bool, "images", include_images);
const options_mod = options.createModule();
const target = b.standardTargetOptions(.{});
const optimize = b.standardOptimizeOption(.{});
const root_source_file = b.path("src/main.zig");
@ -17,10 +10,10 @@ pub fn build(b: *std.Build) void {
.optimize = optimize,
.target = target,
});
const zigimg_dep = if (include_images) b.lazyDependency("zigimg", .{
const zigimg_dep = b.dependency("zigimg", .{
.optimize = optimize,
.target = target,
}) else null;
});
// Module
const vaxis_mod = b.addModule("vaxis", .{
@ -31,8 +24,7 @@ pub fn build(b: *std.Build) void {
vaxis_mod.addImport("code_point", zg_dep.module("code_point"));
vaxis_mod.addImport("grapheme", zg_dep.module("grapheme"));
vaxis_mod.addImport("DisplayWidth", zg_dep.module("DisplayWidth"));
if (zigimg_dep) |dep| vaxis_mod.addImport("zigimg", dep.module("zigimg"));
vaxis_mod.addImport("build_options", options_mod);
vaxis_mod.addImport("zigimg", zigimg_dep.module("zigimg"));
// Examples
const Example = enum {
@ -75,8 +67,7 @@ pub fn build(b: *std.Build) void {
tests.root_module.addImport("code_point", zg_dep.module("code_point"));
tests.root_module.addImport("grapheme", zg_dep.module("grapheme"));
tests.root_module.addImport("DisplayWidth", zg_dep.module("DisplayWidth"));
if (zigimg_dep) |dep| tests.root_module.addImport("zigimg", dep.module("zigimg"));
tests.root_module.addImport("build_options", options_mod);
tests.root_module.addImport("zigimg", zigimg_dep.module("zigimg"));
const tests_run = b.addRunArtifact(tests);
b.installArtifact(tests);

1
build.zig.zon
View file

@ -6,7 +6,6 @@
.zigimg = .{
.url = "git+https://github.com/zigimg/zigimg#3a667bdb3d7f0955a5a51c8468eac83210c1439e",
.hash = "1220dd654ef941fc76fd96f9ec6adadf83f69b9887a0d3f4ee5ac0a1a3e11be35cf5",
.lazy = true,
},
.zg = .{
.url = "git+https://codeberg.org/dude_the_builder/zg#7ddce488e074c3f052949ba513a340446cea86e9",