diff options
| author | Jeroen van Rijn <Kelimion@users.noreply.github.com> | 2022-08-09 16:03:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-09 16:03:17 +0200 |
| commit | bcccc8338fbf0f6ac55fce893e6452951f31e44b (patch) | |
| tree | 33c8d34d57530b9a2957234a5de99902a02041b0 /src/main.cpp | |
| parent | 838554460bbf0d591bc325359ad6d62011654a71 (diff) | |
| parent | c1c8ceafc243389d8eb94feca99de1239da32408 (diff) | |
Merge pull request #1937 from IanLilleyT/rc_fix
Find rc.exe in Windows SDK
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp index beefec702..7fa04cc37 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -283,6 +283,9 @@ i32 linker_stage(lbGenerator *gen) { String vs_exe_path = path_to_string(heap_allocator(), build_context.build_paths[BuildPath_VS_EXE]); defer (gb_free(heap_allocator(), vs_exe_path.text)); + String windows_sdk_bin_path = path_to_string(heap_allocator(), build_context.build_paths[BuildPath_Win_SDK_Bin_Path]); + defer (gb_free(heap_allocator(), windows_sdk_bin_path.text)); + char const *subsystem_str = build_context.use_subsystem_windows ? "WINDOWS" : "CONSOLE"; if (!build_context.use_lld) { // msvc if (build_context.has_resource) { @@ -292,7 +295,8 @@ i32 linker_stage(lbGenerator *gen) { defer (gb_free(heap_allocator(), res_path.text)); result = system_exec_command_line_app("msvc-link", - "\"rc.exe\" /nologo /fo \"%.*s\" \"%.*s\"", + "\"%.*src.exe\" /nologo /fo \"%.*s\" \"%.*s\"", + LIT(windows_sdk_bin_path), LIT(res_path), LIT(rc_path) ); |