aboutsummaryrefslogtreecommitdiff
path: root/src/link.zig
diff options
context:
space:
mode:
authorRyan Liptak <squeek502@hotmail.com>2023-06-30 15:02:32 -0700
committerRyan Liptak <squeek502@hotmail.com>2023-09-17 03:09:45 -0700
commit2a56fe11756fc402a15f159d1c951000487ff3ad (patch)
tree3bb901ba9031c525846183a9335a5805aa3321a0 /src/link.zig
parent8e35be0640998e1070cf892eaadc35fc71d64ead (diff)
downloadzig-2a56fe11756fc402a15f159d1c951000487ff3ad.tar.gz
zig-2a56fe11756fc402a15f159d1c951000487ff3ad.zip
Add a .rc -> .res compiler to the Zig compiler
Diffstat (limited to 'src/link.zig')
-rw-r--r--src/link.zig8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/link.zig b/src/link.zig
index 4db946658a..a1c816550c 100644
--- a/src/link.zig
+++ b/src/link.zig
@@ -1027,6 +1027,9 @@ pub const File = struct {
for (comp.c_object_table.keys()) |key| {
_ = try man.addFile(key.status.success.object_path, null);
}
+ for (comp.win32_resource_table.keys()) |key| {
+ _ = try man.addFile(key.status.success.res_path, null);
+ }
try man.addOptionalFile(module_obj_path);
try man.addOptionalFile(compiler_rt_path);
@@ -1056,7 +1059,7 @@ pub const File = struct {
};
}
- const num_object_files = base.options.objects.len + comp.c_object_table.count() + 2;
+ const num_object_files = base.options.objects.len + comp.c_object_table.count() + comp.win32_resource_table.count() + 2;
var object_files = try std.ArrayList([*:0]const u8).initCapacity(base.allocator, num_object_files);
defer object_files.deinit();
@@ -1066,6 +1069,9 @@ pub const File = struct {
for (comp.c_object_table.keys()) |key| {
object_files.appendAssumeCapacity(try arena.dupeZ(u8, key.status.success.object_path));
}
+ for (comp.win32_resource_table.keys()) |key| {
+ object_files.appendAssumeCapacity(try arena.dupeZ(u8, key.status.success.res_path));
+ }
if (module_obj_path) |p| {
object_files.appendAssumeCapacity(try arena.dupeZ(u8, p));
}