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/build_settings.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/build_settings.cpp')
| -rw-r--r-- | src/build_settings.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/build_settings.cpp b/src/build_settings.cpp index 65da09df0..d49f1cecf 100644 --- a/src/build_settings.cpp +++ b/src/build_settings.cpp @@ -204,7 +204,7 @@ enum BuildPath : u8 { BuildPath_Main_Package, // Input Path to the package directory (or file) we're building. BuildPath_RC, // Input Path for .rc file, can be set with `-resource:`. BuildPath_RES, // Output Path for .res file, generated from previous. - BuildPath_Win_SDK_Root, // windows_sdk_root + BuildPath_Win_SDK_Bin_Path, // windows_sdk_bin_path BuildPath_Win_SDK_UM_Lib, // windows_sdk_um_library_path BuildPath_Win_SDK_UCRT_Lib, // windows_sdk_ucrt_library_path BuildPath_VS_EXE, // vs_exe_path @@ -1336,7 +1336,7 @@ bool init_build_paths(String init_filename) { if ((bc->command_kind & Command__does_build) && (!bc->ignore_microsoft_magic)) { // NOTE(ic): It would be nice to extend this so that we could specify the Visual Studio version that we want instead of defaulting to the latest. - Find_Result_Utf8 find_result = find_visual_studio_and_windows_sdk_utf8(); + Find_Result find_result = find_visual_studio_and_windows_sdk(); defer (mc_free_all()); if (find_result.windows_sdk_version == 0) { @@ -1357,8 +1357,8 @@ bool init_build_paths(String init_filename) { if (find_result.windows_sdk_um_library_path.len > 0) { GB_ASSERT(find_result.windows_sdk_ucrt_library_path.len > 0); - if (find_result.windows_sdk_root.len > 0) { - bc->build_paths[BuildPath_Win_SDK_Root] = path_from_string(ha, find_result.windows_sdk_root); + if (find_result.windows_sdk_bin_path.len > 0) { + bc->build_paths[BuildPath_Win_SDK_Bin_Path] = path_from_string(ha, find_result.windows_sdk_bin_path); } if (find_result.windows_sdk_um_library_path.len > 0) { |