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

examples: fix old example assets directory paths

Browse source 
This commit fixes a bug where the build script would look for
an assets directory that has been moved.
This commit is contained in:
LordMZTE 2022-08-23 01:30:33 +02:00 • committed by Stephen Gutekanst
parent d9f10d25d0
commit a001d53576
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
build.zig
View file

@ -66,12 +66,12 @@ pub fn build(b: *std.build.Builder) void {
.{ .name = "instanced-cube", .packages = &[_]Pkg{Packages.zmath} }, .{ .name = "instanced-cube", .packages = &[_]Pkg{Packages.zmath} },
.{ .name = "advanced-gen-texture-light", .packages = &[_]Pkg{Packages.zmath} }, .{ .name = "advanced-gen-texture-light", .packages = &[_]Pkg{Packages.zmath} },
.{ .name = "fractal-cube", .packages = &[_]Pkg{Packages.zmath} }, .{ .name = "fractal-cube", .packages = &[_]Pkg{Packages.zmath} },
.{ .name = "textured-cube", .packages = &[_]Pkg{ Packages.zmath, Packages.zigimg } }, .{ .name = "textured-cube", .packages = &[_]Pkg{ Packages.zmath, Packages.zigimg }, .has_assets = true },
.{ .name = "ecs-app", .packages = &[_]Pkg{} }, .{ .name = "ecs-app", .packages = &[_]Pkg{} },
.{ .name = "image-blur", .packages = &[_]Pkg{Packages.zigimg} }, .{ .name = "image-blur", .packages = &[_]Pkg{Packages.zigimg}, .has_assets = true },
.{ .name = "map-async", .packages = &[_]Pkg{} }, .{ .name = "map-async", .packages = &[_]Pkg{} },
// NOTE: examples with std_platform_only should be placed at last // NOTE: examples with std_platform_only should be placed at last
.{ .name = "gkurve", .packages = &[_]Pkg{ Packages.zmath, Packages.zigimg, freetype.pkg }, .std_platform_only = true }, .{ .name = "gkurve", .packages = &[_]Pkg{ Packages.zmath, Packages.zigimg, freetype.pkg }, .std_platform_only = true, .has_assets = true },
}) |example| { }) |example| {
// FIXME: this is workaround for a problem that some examples (having the std_platform_only=true field) as // FIXME: this is workaround for a problem that some examples (having the std_platform_only=true field) as
// well as zigimg uses IO which is not supported in freestanding environments. So break out of this loop // well as zigimg uses IO which is not supported in freestanding environments. So break out of this loop
@ -88,7 +88,7 @@ pub fn build(b: *std.build.Builder) void {
.src = "examples/" ++ example.name ++ "/main.zig", .src = "examples/" ++ example.name ++ "/main.zig",
.target = target, .target = target,
.deps = example.packages, .deps = example.packages,
.res_dirs = &.{(comptime thisDir()) ++ "/examples/assets"}, .res_dirs = if (example.has_assets) &.{"examples/" ++ example.name ++ "/assets"} else null,
}, },
); );
example_app.setBuildMode(mode); example_app.setBuildMode(mode);
@ -171,6 +171,7 @@ const ExampleDefinition = struct {
name: []const u8, name: []const u8,
packages: []const Pkg = &[_]Pkg{}, packages: []const Pkg = &[_]Pkg{},
std_platform_only: bool = false, std_platform_only: bool = false,
has_assets: bool = false,
}; };
const Packages = struct { const Packages = struct {