Skip to content

Commit f792da5

Browse files
manifest...
1 parent 1344270 commit f792da5

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/linker/lnk.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ lnk_make_linker_manifest(Arena *arena,
311311
}
312312

313313
internal void
314-
lnk_merge_manifest_files(Arena *arena, String8 mt_path, String8 manifest_name, String8 output_name, String8List manifest_path_list)
314+
lnk_merge_manifest_files(Arena *arena, String8 mt_path, String8 manifest_name, String8List manifest_path_list)
315315
{
316316
ProfBeginFunction();
317317

@@ -328,7 +328,7 @@ lnk_merge_manifest_files(Arena *arena, String8 mt_path, String8 manifest_name, S
328328
str8_list_pushf(arena, &invoke_cmd_line, "-manifest");
329329
str8_list_push(arena, &invoke_cmd_line, full_path);
330330
}
331-
str8_list_pushf(arena, &invoke_cmd_line, "-out:%S", output_name);
331+
str8_list_pushf(arena, &invoke_cmd_line, "-out:%S", manifest_name);
332332
str8_list_pushf(arena, &invoke_cmd_line, "-nologo");
333333

334334
OS_ProcessLaunchParams launch_opts = {0};
@@ -3824,7 +3824,7 @@ l.count += 1; \
38243824
str8_list_push(tp_arena->v[0], &input_manifest_path_list, linker_manifest_path);
38253825

38263826
String8 merged_manifest_path = push_str8f(scratch.arena, "%S.manifest.merged", config->manifest_name);
3827-
lnk_merge_manifest_files(tp_arena->v[0], config->mt_path, config->manifest_name, merged_manifest_path, input_manifest_path_list);
3827+
lnk_merge_manifest_files(tp_arena->v[0], config->mt_path, merged_manifest_path, input_manifest_path_list);
38283828

38293829
if (config->manifest_opt == LNK_ManifestOpt_Embed) {
38303830
// TODO: currently we convert manifest to res and parse res again, this unnecessary instead push manifest

src/linker/lnk.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ internal void lnk_push_loaded_lib(Arena *arena, HashTable *default_lib_ht, Ha
253253
// Manifest
254254

255255
internal String8List lnk_make_linker_manifest(Arena *arena, B32 manifest_uac, String8 manifest_level, String8 manifest_ui_access, String8List manifest_dependency_list);
256-
internal void lnk_merge_manifest_files(Arena *arena, String8 mt_path, String8 manifest_name, String8 output_name, String8List manifest_path_list);
256+
internal void lnk_merge_manifest_files(Arena *arena, String8 mt_path, String8 manifest_name, String8List manifest_path_list);
257257
internal String8 lnk_res_from_data(Arena *arena, String8 data);
258258

259259
////////////////////////////////

0 commit comments

Comments
 (0)