diff options
| author | gingerBill <gingerBill@users.noreply.github.com> | 2022-08-11 16:14:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-11 16:14:27 +0100 |
| commit | 57b20e634bf7bd9c606ceb3aec425beb4a1d0db8 (patch) | |
| tree | 8633580c3cc47b360de210dd5faf35b4e9d6a011 /src/build_settings.cpp | |
| parent | 425dec8bb8cc4fe2cf25a008de199d3084ecb510 (diff) | |
| parent | e285796fc11148c2f461a1d3753d28babd83769e (diff) | |
Merge branch 'master' into pretty-json-2
Diffstat (limited to 'src/build_settings.cpp')
| -rw-r--r-- | src/build_settings.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/build_settings.cpp b/src/build_settings.cpp index a82cc80c9..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 @@ -1322,6 +1322,7 @@ bool init_build_paths(String init_filename) { } #if defined(GB_SYSTEM_WINDOWS) + if (bc->metrics.os == TargetOs_windows) { if (bc->resource_filepath.len > 0) { bc->build_paths[BuildPath_RC] = path_from_string(ha, bc->resource_filepath); bc->build_paths[BuildPath_RES] = path_from_string(ha, bc->resource_filepath); @@ -1335,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) { @@ -1356,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) { @@ -1377,6 +1378,7 @@ bool init_build_paths(String init_filename) { } } } + } #endif // All the build targets and OSes. |