From 52c4eb5d74ba31c1bc0e870cb26ffde921a83bc0 Mon Sep 17 00:00:00 2001
From: Stephen Gutekanst <stephen@hexops.com>
Date: Thu, 21 Sep 2023 14:36:21 -0700
Subject: [PATCH] all: canonicalize import paths with `mach-` prefix

Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
---
 build.zig              | 8 ++++----
 src/engine.zig         | 6 +++---
 src/gfx2d/Sprite2D.zig | 4 ++--
 src/gfx2d/Text2D.zig   | 5 ++---
 src/gfx2d/font.zig     | 1 -
 src/main.zig           | 6 +++---
 6 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/build.zig b/build.zig
index ba40fc04..754cf5fc 100644
--- a/build.zig
+++ b/build.zig
@@ -33,10 +33,10 @@ pub fn module(b: *std.Build, optimize: std.builtin.OptimizeMode, target: std.zig
     _module = b.createModule(.{
         .source_file = .{ .path = sdkPath("/src/main.zig") },
         .dependencies = &.{
-            .{ .name = "core", .module = core.module(mach_core.builder, optimize, target) },
-            .{ .name = "ecs", .module = mach_ecs.module("mach-ecs") },
-            .{ .name = "sysaudio", .module = sysaudio.module(mach_sysaudio.builder, optimize, target) },
-            .{ .name = "basisu", .module = mach_basisu.module("mach-basisu") },
+            .{ .name = "mach-core", .module = core.module(mach_core.builder, optimize, target) },
+            .{ .name = "mach-ecs", .module = mach_ecs.module("mach-ecs") },
+            .{ .name = "mach-sysaudio", .module = sysaudio.module(mach_sysaudio.builder, optimize, target) },
+            .{ .name = "mach-basisu", .module = mach_basisu.module("mach-basisu") },
             .{ .name = "mach-freetype", .module = mach_freetype.module("mach-freetype") },
             .{ .name = "mach-harfbuzz", .module = mach_freetype.module("mach-harfbuzz") },
         },
diff --git a/src/engine.zig b/src/engine.zig
index f1af4661..c523f4c3 100644
--- a/src/engine.zig
+++ b/src/engine.zig
@@ -1,7 +1,7 @@
-const core = @import("core");
-const gpu = @import("core").gpu;
+const core = @import("mach-core");
+const gpu = @import("mach-core").gpu;
 const std = @import("std");
-const ecs = @import("ecs");
+const ecs = @import("mach-ecs");
 
 var gpa = std.heap.GeneralPurposeAllocator(.{}){};
 const allocator = gpa.allocator();
diff --git a/src/gfx2d/Sprite2D.zig b/src/gfx2d/Sprite2D.zig
index 8ae16dde..7119dca1 100644
--- a/src/gfx2d/Sprite2D.zig
+++ b/src/gfx2d/Sprite2D.zig
@@ -1,7 +1,7 @@
 const std = @import("std");
-const core = @import("core");
+const core = @import("mach-core");
 const gpu = core.gpu;
-const ecs = @import("ecs");
+const ecs = @import("mach-ecs");
 const Engine = @import("../engine.zig").Engine;
 const mach = @import("../main.zig");
 
diff --git a/src/gfx2d/Text2D.zig b/src/gfx2d/Text2D.zig
index 5e969b36..8fcf4f69 100644
--- a/src/gfx2d/Text2D.zig
+++ b/src/gfx2d/Text2D.zig
@@ -1,8 +1,7 @@
 const std = @import("std");
-const core = @import("core");
+const core = @import("mach-core");
 const gpu = core.gpu;
-const ecs = @import("ecs");
-const ft = @import("freetype");
+const ecs = @import("mach-ecs");
 const Engine = @import("../engine.zig").Engine;
 const FontRenderer = @import("font.zig").FontRenderer;
 const mach = @import("../main.zig");
diff --git a/src/gfx2d/font.zig b/src/gfx2d/font.zig
index df641cbb..e3190b4a 100644
--- a/src/gfx2d/font.zig
+++ b/src/gfx2d/font.zig
@@ -1,5 +1,4 @@
 const math = @import("../main.zig").math;
-const harfbuzz = @import("mach-harfbuzz");
 const std = @import("std");
 
 /// An interface that can render Unicode codepoints into glyphs.
diff --git a/src/main.zig b/src/main.zig
index 3e5fc857..47951ddb 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -1,4 +1,4 @@
-pub const core = @import("core");
+pub const core = @import("mach-core");
 pub const GPUInterface = core.GPUInterface;
 pub const scope_levels = core.scope_levels;
 pub const log_level = core.log_level;
@@ -6,8 +6,8 @@ pub const Timer = core.Timer;
 pub const gpu = core.gpu;
 
 pub const sysjs = @import("sysjs");
-pub const ecs = @import("ecs");
-pub const sysaudio = @import("sysaudio");
+pub const ecs = @import("mach-ecs");
+pub const sysaudio = @import("mach-sysaudio");
 pub const gfx = @import("gfx/util.zig");
 pub const gfx2d = struct {
     pub const Sprite2D = @import("gfx2d/Sprite2D.zig");