@@ -311,7 +311,7 @@ lnk_make_linker_manifest(Arena *arena,
311
311
}
312
312
313
313
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 )
315
315
{
316
316
ProfBeginFunction ();
317
317
@@ -328,7 +328,7 @@ lnk_merge_manifest_files(Arena *arena, String8 mt_path, String8 manifest_name, S
328
328
str8_list_pushf (arena , & invoke_cmd_line , "-manifest" );
329
329
str8_list_push (arena , & invoke_cmd_line , full_path );
330
330
}
331
- str8_list_pushf (arena , & invoke_cmd_line , "-out:%S" , output_name );
331
+ str8_list_pushf (arena , & invoke_cmd_line , "-out:%S" , manifest_name );
332
332
str8_list_pushf (arena , & invoke_cmd_line , "-nologo" );
333
333
334
334
OS_ProcessLaunchParams launch_opts = {0 };
@@ -3824,7 +3824,7 @@ l.count += 1; \
3824
3824
str8_list_push (tp_arena -> v [0 ], & input_manifest_path_list , linker_manifest_path );
3825
3825
3826
3826
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 );
3828
3828
3829
3829
if (config -> manifest_opt == LNK_ManifestOpt_Embed ) {
3830
3830
// TODO: currently we convert manifest to res and parse res again, this unnecessary instead push manifest
0 commit comments