From 404132de17d005938ea9bb474d60e2d391f2860d Mon Sep 17 00:00:00 2001 From: gingerBill Date: Sat, 18 Jan 2020 12:36:18 +0000 Subject: Fix microsoft_craziness.h to work correctly --- src/main.cpp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index d3c0c9d5c..95340f1fb 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1355,13 +1355,20 @@ int main(int arg_count, char const **arg_ptr) { } // Add library search paths. - if (false && find_result.vs_library_path.len > 0) { + if (find_result.vs_library_path.len > 0) { GB_ASSERT(find_result.windows_sdk_um_library_path.len > 0); GB_ASSERT(find_result.windows_sdk_ucrt_library_path.len > 0); - link_settings = gb_string_append_fmt(link_settings, " /LIBPATH:\"%.*s\"", LIT(find_result.vs_library_path)); - link_settings = gb_string_append_fmt(link_settings, " /LIBPATH:\"%.*s\"", LIT(find_result.windows_sdk_um_library_path)); - link_settings = gb_string_append_fmt(link_settings, " /LIBPATH:\"%.*s\"", LIT(find_result.windows_sdk_ucrt_library_path)); + String path = {}; + auto add_path = [&](String path) { + if (path[path.len-1] == '\\') { + path.len -= 1; + } + link_settings = gb_string_append_fmt(link_settings, " /LIBPATH:\"%.*s\"", LIT(path)); + }; + add_path(find_result.windows_sdk_um_library_path); + add_path(find_result.windows_sdk_ucrt_library_path); + add_path(find_result.vs_library_path); } if (!build_context.use_lld) { // msvc -- cgit v1.2.3