ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-07-30 11:20:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

a little cleanup

Browse Source
This commit is contained in:
WalterPlinge
2022-05-25 02:10:34 +01:00
parent 831a86599e
commit 8fcf2f5dca
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/build_settings.cpp
+3 -12
View File
@@ -1190,7 +1190,7 @@ void init_build_context(TargetMetrics *cross_target) {
// NOTE(WalterPlinge): Environment variables can help to find Visual C++ and WinSDK paths for both // NOTE(WalterPlinge): Environment variables can help to find Visual C++ and WinSDK paths for both
// official and portable installations (like mmozeiko's portable msvc script). This will only use // official and portable installations (like mmozeiko's portable msvc script). This will only use
// the first paths it finds, and won't overwrite any values that `result` already has. // the first paths it finds, and won't overwrite any values that `result` already has.
bool find_portable_msvc_installation(gbAllocator allocator, Find_Result_Utf8 *result) { bool find_msvc_install_from_env_vars(gbAllocator allocator, Find_Result_Utf8 *result) {
if (build_context.metrics.arch != TargetArch_amd64 && build_context.metrics.arch != TargetArch_i386) { if (build_context.metrics.arch != TargetArch_amd64 && build_context.metrics.arch != TargetArch_i386) {
return false; return false;
} }
@@ -1380,7 +1380,7 @@ bool find_portable_msvc_installation(gbAllocator allocator, Find_Result_Utf8 *re
return sdk_found && vs_found; return sdk_found && vs_found;
} }
#endif defined(GB_SYSTEM_WINDOWS) #endif
// NOTE(Jeroen): Set/create the output and other paths and report an error as appropriate. // NOTE(Jeroen): Set/create the output and other paths and report an error as appropriate.
// We've previously called `parse_build_flags`, so `out_filepath` should be set. // We've previously called `parse_build_flags`, so `out_filepath` should be set.
@@ -1429,20 +1429,11 @@ bool init_build_paths(String init_filename) {
find_result.vs_library_path.len > 0; find_result.vs_library_path.len > 0;
if (find_result.windows_sdk_version == 0 || !all_found) { if (find_result.windows_sdk_version == 0 || !all_found) {
if (!find_portable_msvc_installation(ha, &find_result)) { if (!find_msvc_install_from_env_vars(ha, &find_result)) {
gb_printf_err("Windows SDK not found.\n"); gb_printf_err("Windows SDK not found.\n");
return false; return false;
} }
} }
#if 0
printf("windows_sdk_root: %.*s\n", LIT(find_result.windows_sdk_root));
printf("windows_sdk_um_library_path: %.*s\n", LIT(find_result.windows_sdk_um_library_path));
printf("windows_sdk_ucrt_library_path: %.*s\n", LIT(find_result.windows_sdk_ucrt_library_path));
printf("vs_exe_path: %.*s\n", LIT(find_result.vs_exe_path));
printf("vs_library_path: %.*s\n", LIT(find_result.vs_library_path));
gb_exit(1);
#endif
if (find_result.windows_sdk_um_library_path.len > 0) { if (find_result.windows_sdk_um_library_path.len > 0) {
GB_ASSERT(find_result.windows_sdk_ucrt_library_path.len > 0); GB_ASSERT(find_result.windows_sdk_ucrt_library_path.len > 0);