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

Don't crash if SDK not found during ENV fallback.

Browse Source
This commit is contained in:
Jeroen van Rijn
2022-05-28 13:52:56 +02:00
parent f28e3276e7
commit cf8a4b9812
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/microsoft_craziness.h
+8 -8
View File
@@ -93,11 +93,11 @@ String mc_get_env(String key) {
} }
void mc_free(String str) { void mc_free(String str) {
gb_free(mc_allocator, str.text); if (str.len) gb_free(mc_allocator, str.text);
} }
void mc_free(String16 str) { void mc_free(String16 str) {
gb_free(mc_allocator, str.text); if (str.len) gb_free(mc_allocator, str.text);
} }
void mc_free_all() { void mc_free_all() {
@@ -603,11 +603,10 @@ bool find_msvc_install_from_env_vars(Find_Result_Utf8 *result) {
// If we haven't found it yet, we can loop through LIB for specific folders // If we haven't found it yet, we can loop through LIB for specific folders
//? This may not be robust enough using `um\x64` and `ucrt\x64` //? This may not be robust enough using `um\x64` and `ucrt\x64`
if (!sdk_found) { if (!sdk_found) {
char const *lib_env = gb_get_env("LIB", mc_allocator); String lib = mc_get_env(str_lit("LIB"));
defer (gb_free(mc_allocator, (void*)lib_env)); defer (mc_free(lib));
if (lib_env) {
String lib = make_string_c(lib_env);
if (lib.len) {
// NOTE(WalterPlinge): I don't know if there's a chance for the LIB variable // NOTE(WalterPlinge): I don't know if there's a chance for the LIB variable
// to be set without a trailing '\' (apart from manually), so we can just // to be set without a trailing '\' (apart from manually), so we can just
// check paths without it (see use of `String end` in the loop below) // check paths without it (see use of `String end` in the loop below)
@@ -669,6 +668,7 @@ bool find_msvc_install_from_env_vars(Find_Result_Utf8 *result) {
} }
bool vs_found = false; bool vs_found = false;
if (result->vs_exe_path.len > 0 && result->vs_library_path.len > 0) { if (result->vs_exe_path.len > 0 && result->vs_library_path.len > 0) {
vs_found = true; vs_found = true;
} }
@@ -765,8 +765,8 @@ Find_Result_Utf8 find_visual_studio_and_windows_sdk_utf8() {
r.vs_exe_path.len > 0 && r.vs_exe_path.len > 0 &&
r.vs_library_path.len > 0; r.vs_library_path.len > 0;
if (!all_found && !find_msvc_install_from_env_vars(&r)) { if (!all_found) {
return {}; find_msvc_install_from_env_vars(&r);
} }
#if 0 #if 0