mach: Move all platform specific files to platform/ directory
This commit is contained in:
parent
68190e863a
commit
21c49ff9be
7 changed files with 11 additions and 10 deletions
|
|
@ -153,12 +153,12 @@ pub const App = struct {
|
|||
|
||||
const step = blk: {
|
||||
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);
|
||||
|
||||
break :blk lib;
|
||||
} 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(glfw.pkg);
|
||||
|
||||
|
|
@ -166,6 +166,7 @@ pub const App = struct {
|
|||
}
|
||||
};
|
||||
|
||||
step.main_pkg_path = thisDir() ++ "/src";
|
||||
step.addPackage(app_pkg);
|
||||
step.setTarget(options.target);
|
||||
|
||||
|
|
@ -186,7 +187,7 @@ pub const App = struct {
|
|||
app.getInstallStep().?.dest_dir = web_install_dir;
|
||||
|
||||
const install_mach_js = app.b.addInstallFileWithDir(
|
||||
.{ .path = thisDir() ++ "/src/mach.js" },
|
||||
.{ .path = thisDir() ++ "/src/platform/mach.js" },
|
||||
web_install_dir,
|
||||
"mach.js",
|
||||
);
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
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
|
||||
pub const CoreType = Platform.Core;
|
||||
|
|
|
|||
|
|
@ -2,9 +2,9 @@ const std = @import("std");
|
|||
const glfw = @import("glfw");
|
||||
const gpu = @import("gpu");
|
||||
const App = @import("app");
|
||||
const Engine = @import("Engine.zig");
|
||||
const structs = @import("structs.zig");
|
||||
const enums = @import("enums.zig");
|
||||
const Engine = @import("../Engine.zig");
|
||||
const structs = @import("../structs.zig");
|
||||
const enums = @import("../enums.zig");
|
||||
const util = @import("util.zig");
|
||||
const c = @import("c.zig").c;
|
||||
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
const std = @import("std");
|
||||
const App = @import("app");
|
||||
const Engine = @import("Engine.zig");
|
||||
const structs = @import("structs.zig");
|
||||
const enums = @import("enums.zig");
|
||||
const Engine = @import("../Engine.zig");
|
||||
const structs = @import("../structs.zig");
|
||||
const enums = @import("../enums.zig");
|
||||
|
||||
const js = struct {
|
||||
extern fn machCanvasInit(width: u32, height: u32, selector_id: *u8) CanvasId;
|
||||
Loading…
Add table
Add a link
Reference in a new issue