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

mach: ecs now builds with self-hosted compiler

Browse source 
Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
Stephen Gutekanst 2022-10-15 07:54:29 -07:00
parent 373179f664
commit 1e87b2b78a
1 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
build.zig
View file

@ -58,8 +58,7 @@ pub fn build(b: *Builder) !void {
const all_tests_step = b.step("test", "Run library tests"); const all_tests_step = b.step("test", "Run library tests");
const glfw_test_step = b.step("test-glfw", "Run GLFW library tests"); const glfw_test_step = b.step("test-glfw", "Run GLFW library tests");
const gpu_test_step = b.step("test-gpu", "Run GPU library tests"); const gpu_test_step = b.step("test-gpu", "Run GPU library tests");
// TODO(self-hosted) uncomment this const ecs_test_step = b.step("test-ecs", "Run ECS library tests");
// const ecs_test_step = b.step("test-ecs", "Run ECS library tests");
const freetype_test_step = b.step("test-freetype", "Run Freetype library tests"); const freetype_test_step = b.step("test-freetype", "Run Freetype library tests");
const basisu_test_step = b.step("test-basisu", "Run Basis-Universal library tests"); const basisu_test_step = b.step("test-basisu", "Run Basis-Universal library tests");
const sysaudio_test_step = b.step("test-sysaudio", "Run sysaudio library tests"); const sysaudio_test_step = b.step("test-sysaudio", "Run sysaudio library tests");
@ -68,16 +67,14 @@ pub fn build(b: *Builder) !void {
glfw_test_step.dependOn(&(try glfw.testStep(b, mode, target)).step); glfw_test_step.dependOn(&(try glfw.testStep(b, mode, target)).step);
gpu_test_step.dependOn(&(try gpu.testStep(b, mode, target, options.gpuOptions())).step); gpu_test_step.dependOn(&(try gpu.testStep(b, mode, target, options.gpuOptions())).step);
freetype_test_step.dependOn(&freetype.testStep(b, mode, target).step); freetype_test_step.dependOn(&freetype.testStep(b, mode, target).step);
// TODO(self-hosted) uncomment this ecs_test_step.dependOn(&ecs.testStep(b, mode, target).step);
// ecs_test_step.dependOn(&ecs.testStep(b, mode, target).step);
basisu_test_step.dependOn(&basisu.testStep(b, mode, target).step); basisu_test_step.dependOn(&basisu.testStep(b, mode, target).step);
sysaudio_test_step.dependOn(&sysaudio.testStep(b, mode, target).step); sysaudio_test_step.dependOn(&sysaudio.testStep(b, mode, target).step);
mach_test_step.dependOn(&testStep(b, mode, target).step); mach_test_step.dependOn(&testStep(b, mode, target).step);
all_tests_step.dependOn(glfw_test_step); all_tests_step.dependOn(glfw_test_step);
all_tests_step.dependOn(gpu_test_step); all_tests_step.dependOn(gpu_test_step);
// TODO(self-hosted) uncomment this all_tests_step.dependOn(ecs_test_step);
// all_tests_step.dependOn(ecs_test_step);
all_tests_step.dependOn(basisu_test_step); all_tests_step.dependOn(basisu_test_step);
all_tests_step.dependOn(freetype_test_step); all_tests_step.dependOn(freetype_test_step);
all_tests_step.dependOn(sysaudio_test_step); all_tests_step.dependOn(sysaudio_test_step);
@ -130,8 +127,7 @@ pub fn build(b: *Builder) !void {
.{ .name = "advanced-gen-texture-light", .deps = &.{Packages.zmath} }, .{ .name = "advanced-gen-texture-light", .deps = &.{Packages.zmath} },
.{ .name = "fractal-cube", .deps = &.{Packages.zmath} }, .{ .name = "fractal-cube", .deps = &.{Packages.zmath} },
.{ .name = "textured-cube", .deps = &.{ Packages.zmath, Packages.zigimg }, .has_assets = true }, .{ .name = "textured-cube", .deps = &.{ Packages.zmath, Packages.zigimg }, .has_assets = true },
// TODO(self-hosted) uncomment this .{ .name = "ecs-app", .deps = &.{} },
// .{ .name = "ecs-app", .deps = &.{} },
.{ .name = "image-blur", .deps = &.{Packages.zigimg}, .has_assets = true }, .{ .name = "image-blur", .deps = &.{Packages.zigimg}, .has_assets = true },
.{ .name = "cubemap", .deps = &.{ Packages.zmath, Packages.zigimg }, .has_assets = true }, .{ .name = "cubemap", .deps = &.{ Packages.zmath, Packages.zigimg }, .has_assets = true },
.{ .name = "map-async", .deps = &.{} }, .{ .name = "map-async", .deps = &.{} },