remove win32 dependency

ross96D · Dec 23, 2024 · a9da607 · a9da607
1 parent 85192a0
commit a9da607
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 124 deletions.
diff --git a/build.zig b/build.zig
@@ -160,17 +160,12 @@ inline fn dependencies(
         .target = target,
         .optimize = optimize,
     });
-    const win32: ?*std.Build.Dependency = if (target.result.os.tag == .windows)
-        b.dependency("win32", .{})
-    else
-        null;
     const zli = b.dependency("zli", .{ .target = target, .optimize = optimize });
 
     return &[_]?Dep{
         Dep.init(jdz_allocator, "jdz_allocator"),
         Dep.init(zart, "zart"),
         Dep.init(zli, "zli"),
-        if (target.result.os.tag == .windows) Dep.init(win32.?, "win32") else null,
     };
 }
 

diff --git a/external/zigwin32/.gitignore b/external/zigwin32/.gitignore
diff --git a/external/zigwin32/LICENSE b/external/zigwin32/LICENSE
diff --git a/external/zigwin32/build.zig b/external/zigwin32/build.zig
diff --git a/external/zigwin32/build.zig.zon b/external/zigwin32/build.zig.zon
diff --git a/external/zigwin32/win32.zig b/external/zigwin32/win32.zig
diff --git a/external/zigwin32/win32/storage.zig b/external/zigwin32/win32/storage.zig
diff --git a/external/zigwin32/win32/storage/file_system.zig b/external/zigwin32/win32/storage/file_system.zig
diff --git a/external/zigwin32/win32/zig.zig b/external/zigwin32/win32/zig.zig
diff --git a/src/utils.zig b/src/utils.zig
@@ -48,10 +48,16 @@ test Owned {
 pub inline fn tempDir() !std.fs.Dir {
     const path: []const u8 = switch (builtin.os.tag) {
         .windows => r: {
-            var path: [256:0]u8 = undefined;
-            const n = @import("win32").storage.file_system.GetTempPath2(256, &path);
-            std.debug.assert(n > 0);
-            break :r path[0..n];
+            var path: [512]u8 = undefined;
+            var fba = std.heap.FixedBufferAllocator.init(&path);
+            break :r if (std.process.getEnvVarOwned(fba.allocator(), "TMP")) |dir|
+                dir
+            else |_| if (std.process.getEnvVarOwned(fba.allocator(), "TEMP")) |dir|
+                dir
+            else |_| if (std.process.getEnvVarOwned(fba.allocator(), "USERPROFILE")) |dir|
+                dir
+            else
+                "C:\\Windows";
         },
         else => if (std.posix.getenv("TMPDIR")) |path| path else "/tmp",
     };