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

all: canonicalize import paths with mach- prefix

Browse source 
Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
Stephen Gutekanst 2023-09-21 14:36:21 -07:00
parent 26a9392188
commit 52c4eb5d74
6 changed files with 14 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
build.zig
View file

@ -33,10 +33,10 @@ pub fn module(b: *std.Build, optimize: std.builtin.OptimizeMode, target: std.zig
_module = b.createModule(.{ _module = b.createModule(.{
.source_file = .{ .path = sdkPath("/src/main.zig") }, .source_file = .{ .path = sdkPath("/src/main.zig") },
.dependencies = &.{ .dependencies = &.{
.{ .name = "core", .module = core.module(mach_core.builder, optimize, target) }, .{ .name = "mach-core", .module = core.module(mach_core.builder, optimize, target) },
.{ .name = "ecs", .module = mach_ecs.module("mach-ecs") }, .{ .name = "mach-ecs", .module = mach_ecs.module("mach-ecs") },
.{ .name = "sysaudio", .module = sysaudio.module(mach_sysaudio.builder, optimize, target) }, .{ .name = "mach-sysaudio", .module = sysaudio.module(mach_sysaudio.builder, optimize, target) },
.{ .name = "basisu", .module = mach_basisu.module("mach-basisu") }, .{ .name = "mach-basisu", .module = mach_basisu.module("mach-basisu") },
.{ .name = "mach-freetype", .module = mach_freetype.module("mach-freetype") }, .{ .name = "mach-freetype", .module = mach_freetype.module("mach-freetype") },
.{ .name = "mach-harfbuzz", .module = mach_freetype.module("mach-harfbuzz") }, .{ .name = "mach-harfbuzz", .module = mach_freetype.module("mach-harfbuzz") },
}, },

6
src/engine.zig
View file

@ -1,7 +1,7 @@
const core = @import("core"); const core = @import("mach-core");
const gpu = @import("core").gpu; const gpu = @import("mach-core").gpu;
const std = @import("std"); const std = @import("std");
const ecs = @import("ecs"); const ecs = @import("mach-ecs");
var gpa = std.heap.GeneralPurposeAllocator(.{}){}; var gpa = std.heap.GeneralPurposeAllocator(.{}){};
const allocator = gpa.allocator(); const allocator = gpa.allocator();

4
src/gfx2d/Sprite2D.zig
View file

@ -1,7 +1,7 @@
const std = @import("std"); const std = @import("std");
const core = @import("core"); const core = @import("mach-core");
const gpu = core.gpu; const gpu = core.gpu;
const ecs = @import("ecs"); const ecs = @import("mach-ecs");
const Engine = @import("../engine.zig").Engine; const Engine = @import("../engine.zig").Engine;
const mach = @import("../main.zig"); const mach = @import("../main.zig");

5
src/gfx2d/Text2D.zig
View file

@ -1,8 +1,7 @@
const std = @import("std"); const std = @import("std");
const core = @import("core"); const core = @import("mach-core");
const gpu = core.gpu; const gpu = core.gpu;
const ecs = @import("ecs"); const ecs = @import("mach-ecs");
const ft = @import("freetype");
const Engine = @import("../engine.zig").Engine; const Engine = @import("../engine.zig").Engine;
const FontRenderer = @import("font.zig").FontRenderer; const FontRenderer = @import("font.zig").FontRenderer;
const mach = @import("../main.zig"); const mach = @import("../main.zig");

1
src/gfx2d/font.zig
View file

@ -1,5 +1,4 @@
const math = @import("../main.zig").math; const math = @import("../main.zig").math;
const harfbuzz = @import("mach-harfbuzz");
const std = @import("std"); const std = @import("std");
/// An interface that can render Unicode codepoints into glyphs. /// An interface that can render Unicode codepoints into glyphs.

6
src/main.zig
View file

@ -1,4 +1,4 @@
pub const core = @import("core"); pub const core = @import("mach-core");
pub const GPUInterface = core.GPUInterface; pub const GPUInterface = core.GPUInterface;
pub const scope_levels = core.scope_levels; pub const scope_levels = core.scope_levels;
pub const log_level = core.log_level; pub const log_level = core.log_level;
@ -6,8 +6,8 @@ pub const Timer = core.Timer;
pub const gpu = core.gpu; pub const gpu = core.gpu;
pub const sysjs = @import("sysjs"); pub const sysjs = @import("sysjs");
pub const ecs = @import("ecs"); pub const ecs = @import("mach-ecs");
pub const sysaudio = @import("sysaudio"); pub const sysaudio = @import("mach-sysaudio");
pub const gfx = @import("gfx/util.zig"); pub const gfx = @import("gfx/util.zig");
pub const gfx2d = struct { pub const gfx2d = struct {
pub const Sprite2D = @import("gfx2d/Sprite2D.zig"); pub const Sprite2D = @import("gfx2d/Sprite2D.zig");