Commit da77d306b637f9ecd4ad4657978b22063c9ecf1d | zig

author	Ryan Liptak <squeek502@hotmail.com> 2025-11-07 19:16:52-08:00
committer	Ryan Liptak <squeek502@hotmail.com> 2025-11-07 19:16:52-08:00
log	da77d306b637f9ecd4ad4657978b22063c9ecf1d
tree	7d40eefbea9795a44df07e280fa3b1c7452bab42
parent	f587209e04f93ac36fdd2e4b4f831e87b240f9ae

4 files changed, 17 insertions(+), 18 deletions(-)

lib/std/Build/Step/Compile.zig+1-2

 @@ -66,13 +66,12 @@ installed_headers: std.array_list.Managed(HeaderInstallation),
 /// created otherwise.
 installed_headers_include_tree: ?*Step.WriteFile = null,
-// keep in sync with src/Compilation.zig:RcIncludes
 /// Behavior of automatic detection of include directories when compiling .rc files.
 ///  any: Use MSVC if available, fall back to MinGW.
 ///  msvc: Use MSVC include paths (must be present on the system).
 ///  gnu: Use MinGW include paths (distributed with Zig).
 ///  none: Do not use any autodetected include paths.
-rc_includes: enum { any, msvc, gnu, none } = .any,
+rc_includes: std.zig.RcIncludes = .any,
 /// (Windows) .manifest file to embed in the compilation
 /// Set via options; intended to be read-only after that.

lib/std/zig.zig+11

...	@@ -379,6 +379,17 @@ pub const Subsystem = enum {	...	@@ -379,6 +379,17 @@ pub const Subsystem = enum {
379		379
380	pub const CompressDebugSections = enum { none, zlib, zstd };	380	pub const CompressDebugSections = enum { none, zlib, zstd };
381		381
		382	pub const RcIncludes = enum {
		383	/// Use MSVC if available, fall back to MinGW.
		384	any,
		385	/// Use MSVC include paths (MSVC install + Windows SDK, must be present on the system).
		386	msvc,
		387	/// Use MinGW include paths (distributed with Zig).
		388	gnu,
		389	/// Do not use any autodetected include paths.
		390	none,
		391	};
		392
382	/// Renders a `std.Target.Cpu` value into a textual representation that can be parsed	393	/// Renders a `std.Target.Cpu` value into a textual representation that can be parsed
383	/// via the `-mcpu` flag passed to the Zig compiler.	394	/// via the `-mcpu` flag passed to the Zig compiler.
384	/// Appends the result to `buffer`.	395	/// Appends the result to `buffer`.

src/Compilation.zig+2-13

 @@ -195,7 +195,7 @@ self_exe_path: ?[]const u8,
 dirs: Directories,
 libc_include_dir_list: []const []const u8,
 libc_framework_dir_list: []const []const u8,
-rc_includes: RcIncludes,
+rc_includes: std.zig.RcIncludes,
 mingw_unicode_entry_point: bool,
 thread_pool: *ThreadPool,
 @@ -954,17 +954,6 @@ pub const RcSourceFile = struct {
     extra_flags: []const []const u8 = &.{},
 };
-pub const RcIncludes = enum {
-    /// Use MSVC if available, fall back to MinGW.
-    any,
-    /// Use MSVC include paths (MSVC install + Windows SDK, must be present on the system).
-    msvc,
-    /// Use MinGW include paths (distributed with Zig).
-    gnu,
-    /// Do not use any autodetected include paths.
-    none,
-};
 const Job = union(enum) {
     /// Given the generated AIR for a function, put it onto the code generation queue.
     /// This `Job` exists (instead of the `link.ZcuTask` being directly queued) to ensure that
 @@ -1680,7 +1669,7 @@ pub const CreateOptions = struct {
     c_source_files: []const CSourceFile = &.{},
     rc_source_files: []const RcSourceFile = &.{},
     manifest_file: ?[]const u8 = null,
-    rc_includes: RcIncludes = .any,
+    rc_includes: std.zig.RcIncludes = .any,
     link_inputs: []const link.Input = &.{},
     framework_dirs: []const []const u8 = &[0][]const u8{},
     frameworks: []const Framework = &.{},

src/main.zig+3-3

...	@@ -918,7 +918,7 @@ fn buildOutputType(	...	@@ -918,7 +918,7 @@ fn buildOutputType(
918	var extra_cflags: std.ArrayListUnmanaged([]const u8) = .empty;	918	var extra_cflags: std.ArrayListUnmanaged([]const u8) = .empty;
919	var extra_rcflags: std.ArrayListUnmanaged([]const u8) = .empty;	919	var extra_rcflags: std.ArrayListUnmanaged([]const u8) = .empty;
920	var symbol_wrap_set: std.StringArrayHashMapUnmanaged(void) = .empty;	920	var symbol_wrap_set: std.StringArrayHashMapUnmanaged(void) = .empty;
921	var rc_includes: Compilation.RcIncludes = .any;	921	var rc_includes: std.zig.RcIncludes = .any;
922	var manifest_file: ?[]const u8 = null;	922	var manifest_file: ?[]const u8 = null;
923	var linker_export_symbol_names: std.ArrayListUnmanaged([]const u8) = .empty;	923	var linker_export_symbol_names: std.ArrayListUnmanaged([]const u8) = .empty;
924		924
...	@@ -6787,8 +6787,8 @@ fn accessFrameworkPath(	...	@@ -6787,8 +6787,8 @@ fn accessFrameworkPath(
6787	return false;	6787	return false;
6788	}	6788	}
6789		6789
6790	fn parseRcIncludes(arg: []const u8) Compilation.RcIncludes {	6790	fn parseRcIncludes(arg: []const u8) std.zig.RcIncludes {
6791	return std.meta.stringToEnum(Compilation.RcIncludes, arg) orelse	6791	return std.meta.stringToEnum(std.zig.RcIncludes, arg) orelse
6792	fatal("unsupported rc includes type: '{s}'", .{arg});	6792	fatal("unsupported rc includes type: '{s}'", .{arg});
6793	}	6793	}
6794		6794