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

mach: Move all platform specific files to platform/ directory

Browse source
This commit is contained in:
iddev5 2022-05-30 13:31:22 +05:30 • committed by Stephen Gutekanst
parent 68190e863a
commit 21c49ff9be
7 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
build.zig
View file

@ -153,12 +153,12 @@ pub const App = struct {
const step = blk: { const step = blk: {
if (options.target.toTarget().cpu.arch == .wasm32) { if (options.target.toTarget().cpu.arch == .wasm32) {
const lib = b.addSharedLibrary(options.name, thisDir() ++ "/src/wasm.zig", .unversioned); const lib = b.addSharedLibrary(options.name, thisDir() ++ "/src/platform/wasm.zig", .unversioned);
lib.addPackage(gpu.pkg); lib.addPackage(gpu.pkg);
break :blk lib; break :blk lib;
} else { } else {
const exe = b.addExecutable(options.name, thisDir() ++ "/src/native.zig"); const exe = b.addExecutable(options.name, thisDir() ++ "/src/platform/native.zig");
exe.addPackage(gpu.pkg); exe.addPackage(gpu.pkg);
exe.addPackage(glfw.pkg); exe.addPackage(glfw.pkg);
@ -166,6 +166,7 @@ pub const App = struct {
} }
}; };
step.main_pkg_path = thisDir() ++ "/src";
step.addPackage(app_pkg); step.addPackage(app_pkg);
step.setTarget(options.target); step.setTarget(options.target);
@ -186,7 +187,7 @@ pub const App = struct {
app.getInstallStep().?.dest_dir = web_install_dir; app.getInstallStep().?.dest_dir = web_install_dir;
const install_mach_js = app.b.addInstallFileWithDir( const install_mach_js = app.b.addInstallFileWithDir(
.{ .path = thisDir() ++ "/src/mach.js" }, .{ .path = thisDir() ++ "/src/platform/mach.js" },
web_install_dir, web_install_dir,
"mach.js", "mach.js",
); );

2
src/platform.zig
View file

@ -1,6 +1,6 @@
const builtin = @import("builtin"); const builtin = @import("builtin");
const Platform = if (builtin.cpu.arch == .wasm32) @import("wasm.zig") else @import("native.zig"); const Platform = if (builtin.cpu.arch == .wasm32) @import("platform/wasm.zig") else @import("platform/native.zig");
// TODO: verify declarations and its signatures // TODO: verify declarations and its signatures
pub const CoreType = Platform.Core; pub const CoreType = Platform.Core;

0
src/c.zig → src/platform/c.zig
View file

0
src/mach.js → src/platform/mach.js
View file

6
src/native.zig → src/platform/native.zig
View file

@ -2,9 +2,9 @@ const std = @import("std");
const glfw = @import("glfw"); const glfw = @import("glfw");
const gpu = @import("gpu"); const gpu = @import("gpu");
const App = @import("app"); const App = @import("app");
const Engine = @import("Engine.zig"); const Engine = @import("../Engine.zig");
const structs = @import("structs.zig"); const structs = @import("../structs.zig");
const enums = @import("enums.zig"); const enums = @import("../enums.zig");
const util = @import("util.zig"); const util = @import("util.zig");
const c = @import("c.zig").c; const c = @import("c.zig").c;

0
src/util.zig → src/platform/util.zig
View file

6
src/wasm.zig → src/platform/wasm.zig
View file

@ -1,8 +1,8 @@
const std = @import("std"); const std = @import("std");
const App = @import("app"); const App = @import("app");
const Engine = @import("Engine.zig"); const Engine = @import("../Engine.zig");
const structs = @import("structs.zig"); const structs = @import("../structs.zig");
const enums = @import("enums.zig"); const enums = @import("../enums.zig");
const js = struct { const js = struct {
extern fn machCanvasInit(width: u32, height: u32, selector_id: *u8) CanvasId; extern fn machCanvasInit(width: u32, height: u32, selector_id: *u8) CanvasId;