From 21c49ff9be2167a6f491535ac1a9c40daf456e3c Mon Sep 17 00:00:00 2001
From: iddev5 <ayushbardhan5@gmail.com>
Date: Mon, 30 May 2022 13:31:22 +0530
Subject: [PATCH] mach: Move all platform specific files to platform/ directory

---
 build.zig                     | 7 ++++---
 src/platform.zig              | 2 +-
 src/{ => platform}/c.zig      | 0
 src/{ => platform}/mach.js    | 0
 src/{ => platform}/native.zig | 6 +++---
 src/{ => platform}/util.zig   | 0
 src/{ => platform}/wasm.zig   | 6 +++---
 7 files changed, 11 insertions(+), 10 deletions(-)
 rename src/{ => platform}/c.zig (100%)
 rename src/{ => platform}/mach.js (100%)
 rename src/{ => platform}/native.zig (99%)
 rename src/{ => platform}/util.zig (100%)
 rename src/{ => platform}/wasm.zig (97%)

diff --git a/build.zig b/build.zig
index c813980b..30f337d5 100644
--- a/build.zig
+++ b/build.zig
@@ -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",
             );
diff --git a/src/platform.zig b/src/platform.zig
index 18fecde5..860e1587 100644
--- a/src/platform.zig
+++ b/src/platform.zig
@@ -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;
diff --git a/src/c.zig b/src/platform/c.zig
similarity index 100%
rename from src/c.zig
rename to src/platform/c.zig
diff --git a/src/mach.js b/src/platform/mach.js
similarity index 100%
rename from src/mach.js
rename to src/platform/mach.js
diff --git a/src/native.zig b/src/platform/native.zig
similarity index 99%
rename from src/native.zig
rename to src/platform/native.zig
index 8807cb6b..d058ed59 100644
--- a/src/native.zig
+++ b/src/platform/native.zig
@@ -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;
 
diff --git a/src/util.zig b/src/platform/util.zig
similarity index 100%
rename from src/util.zig
rename to src/platform/util.zig
diff --git a/src/wasm.zig b/src/platform/wasm.zig
similarity index 97%
rename from src/wasm.zig
rename to src/platform/wasm.zig
index df1760b5..cff0bb87 100644
--- a/src/wasm.zig
+++ b/src/platform/wasm.zig
@@ -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;