From 6cbf0508b11071a0fbcb1acfd2fe435ff4759ae3 Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Fri, 4 Mar 2022 15:38:53 -0700 Subject: [PATCH] glfw: system_sdk: add Windows system SDK with updated DirectX headers This effectively provides all you need to develop & cross compile DirectX 11/12 applications with `mach/glfw` (or just Zig in general, by copying `system_sdk.zig` into your own project.) Helps hexops/mach#86 Helps hexops/mach#59 Signed-off-by: Stephen Gutekanst --- glfw/system_sdk.zig | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/glfw/system_sdk.zig b/glfw/system_sdk.zig index 9d876c5a9d..e506584d0f 100644 --- a/glfw/system_sdk.zig +++ b/glfw/system_sdk.zig @@ -48,6 +48,10 @@ pub const Options = struct { linux_x86_64: []const u8 = "sdk-linux-x86_64", linux_x86_64_revision: []const u8 = "ab7fa8f3a05b06e0b06f4277b484e27004bfb20f", + /// The Windows x86-64 SDK repository name. + windows_x86_64: []const u8 = "sdk-windows-x86_64", + windows_x86_64_revision: []const u8 = "5acba990efd112ea0ced364f0428e6ef6e7a5541", + /// If true, the Builder.sysroot will set to the SDK path. This has the drawback of preventing /// you from including headers, libraries, etc. from outside the SDK generally. However, it can /// be useful in order to identify which libraries, headers, frameworks, etc. may be missing in @@ -58,7 +62,7 @@ pub const Options = struct { pub fn include(b: *Builder, step: *std.build.LibExeObjStep, options: Options) void { const target = (std.zig.system.NativeTargetInfo.detect(b.allocator, step.target) catch unreachable).target; switch (target.os.tag) { - .windows => {}, + .windows => includeSdkWindowsX8664(b, step, options), .macos => includeSdkMacOS(b, step, options), else => includeSdkLinuxX8664(b, step, options), // Assume Linux-like for now } @@ -113,6 +117,27 @@ fn includeSdkLinuxX8664(b: *Builder, step: *std.build.LibExeObjStep, options: Op step.addLibPath(sdk_root_libs); } +fn includeSdkWindowsX8664(b: *Builder, step: *std.build.LibExeObjStep, options: Options) void { + const sdk_root_dir = getSdkRoot(b.allocator, options.github_org, options.windows_x86_64, options.windows_x86_64_revision) catch unreachable; + + if (options.set_sysroot) { + // We have no sysroot for Windows, but we still set one to prevent inclusion of other system + // libs (if set_sysroot is set, don't want to accidentally depend on system libs.) + var sdk_sysroot = std.fs.path.join(b.allocator, &.{sdk_root_dir}) catch unreachable; + b.sysroot = sdk_sysroot; + } + + var sdk_includes = std.fs.path.join(b.allocator, &.{ sdk_root_dir, "include" }) catch unreachable; + var sdk_libs = std.fs.path.join(b.allocator, &.{ sdk_root_dir, "lib" }) catch unreachable; + defer { + b.allocator.free(sdk_includes); + b.allocator.free(sdk_libs); + } + + step.addIncludeDir(sdk_includes); + step.addLibPath(sdk_libs); +} + var cached_sdk_root: ?[]const u8 = null; /// returns the SDK root path, determining it iff necessary. In a real application, this may be