From e3a04e2a4a6fc26a8c70dd18859688d91458b402 Mon Sep 17 00:00:00 2001 From: Meghan Denny Date: Sat, 24 Jul 2021 02:39:58 -0700 Subject: [PATCH] run build_all, fix zigwin32 usage --- deps.zig | 13 ++++++++----- src/main.zig | 4 ++-- zig.mod | 2 ++ 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/deps.zig b/deps.zig index 26507a38c62775d0cba8a2b158896dddc5becd78..78167133094a1ee3c118bbaca65dc62ffabe1ded 100644 --- a/deps.zig +++ b/deps.zig @@ -114,16 +114,16 @@ pub const package_data = struct { .pkg = Pkg{ .name = "range", .path = .{ .path = dirs._tnj3qf44tpeq ++ "/src/lib.zig" }, .dependencies = null }, }; + pub const _89ujp8gq842x = Package{ + .directory = dirs._89ujp8gq842x, + .pkg = Pkg{ .name = "zigmod", .path = .{ .path = dirs._89ujp8gq842x ++ "/src/lib.zig" }, .dependencies = &.{ _s84v9o48ucb0.pkg.?, _2ta738wrqbaq.pkg.?, _0npcrzfdlrvk.pkg.?, _ejw82j2ipa0e.pkg.?, _ocmr9rtohgcc.pkg.?, _tnj3qf44tpeq.pkg.? } }, + }; + pub const _o6ogpor87xc2 = Package{ .directory = dirs._o6ogpor87xc2, .pkg = Pkg{ .name = "win32", .path = .{ .path = dirs._o6ogpor87xc2 ++ "/win32.zig" }, .dependencies = null }, }; - pub const _89ujp8gq842x = Package{ - .directory = dirs._89ujp8gq842x, - .pkg = Pkg{ .name = "zigmod", .path = .{ .path = dirs._89ujp8gq842x ++ "/src/lib.zig" }, .dependencies = &.{ _s84v9o48ucb0.pkg.?, _2ta738wrqbaq.pkg.?, _0npcrzfdlrvk.pkg.?, _ejw82j2ipa0e.pkg.?, _ocmr9rtohgcc.pkg.?, _tnj3qf44tpeq.pkg.?, _o6ogpor87xc2.pkg.? } }, - }; - pub const _root = Package{ .directory = dirs._root, }; @@ -132,13 +132,16 @@ pub const package_data = struct { pub const packages = &[_]Package{ package_data._89ujp8gq842x, + package_data._o6ogpor87xc2, }; pub const pkgs = struct { pub const zigmod = package_data._89ujp8gq842x; + pub const win32 = package_data._o6ogpor87xc2; }; pub const imports = struct { pub const zigmod = @import(".zigmod/deps/../../src/lib.zig"); + pub const win32 = @import(".zigmod/deps/git/github.com/marlersoft/zigwin32/win32.zig"); }; diff --git a/src/main.zig b/src/main.zig index cc620217fc347aeff5796d8cd8170c61a2cc6f49..d23ddb80bec19391b3fa52111f3d64c87336fdbb 100644 --- a/src/main.zig +++ b/src/main.zig @@ -34,9 +34,9 @@ pub fn main() !void { return; } - if (builtin.os.tag == .windows) { + if (!build_options.bootstrap and builtin.os.tag == .windows) { const console = win32.system.console; - console.SetConsoleMode(std.io.getStdOut().handle, console.ENABLE_VIRTUAL_TERMINAL_PROCESSING); + _ = console.SetConsoleMode(std.io.getStdOut().handle, console.ENABLE_VIRTUAL_TERMINAL_PROCESSING); } inline for (std.meta.declarations(available)) |decl| { diff --git a/zig.mod b/zig.mod index 066027f6a4fe31e9378d1e4137eca4a6c0217cc3..e9e52d41d9763aab9262100e66cabfd52d3aa071 100644 --- a/zig.mod +++ b/zig.mod @@ -35,4 +35,6 @@ dependencies: - src: git https://github.com/truemedian/zfetch - src: git https://github.com/nektro/zig-json - src: git https://github.com/nektro/zig-range + +dev_dependencies: - src: git https://github.com/marlersoft/zigwin32 -- 2.54.0