From ff2f21c5bd953fab65d28dea1ef88174df6cac47 Mon Sep 17 00:00:00 2001 From: Rocket Programmer Date: Wed, 20 Jan 2021 12:37:44 -0800 Subject: [PATCH 1/2] common: Fix suffix --- scripts/common.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/common.py b/scripts/common.py index 5a9c403..8b20bc7 100644 --- a/scripts/common.py +++ b/scripts/common.py @@ -340,8 +340,8 @@ def get_win_thirdparty_dir(): """ Returns the path of the thirdparty directory, windows only """ msvc_suffix = get_panda_msvc_version().suffix - # The thirdparty directory is named "vc14" for example instead of "vc140" - if msvc_suffix.endswith("0"): + # The thirdparty directory is named "vc14" for example instead of "vc142" + if msvc_suffix.endswith("2"): msvc_suffix = msvc_suffix[:-1] bit_suffix = "-x64" if is_64_bit() else "" From a1c9eb28b103264cc05f404bd90a493d3dad91d1 Mon Sep 17 00:00:00 2001 From: Rocket Programmer Date: Thu, 21 Jan 2021 11:08:43 -0800 Subject: [PATCH 2/2] common: Take character regardless of suffix end --- scripts/common.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/common.py b/scripts/common.py index 8b20bc7..fd1d8ea 100644 --- a/scripts/common.py +++ b/scripts/common.py @@ -341,8 +341,7 @@ def get_win_thirdparty_dir(): msvc_suffix = get_panda_msvc_version().suffix # The thirdparty directory is named "vc14" for example instead of "vc142" - if msvc_suffix.endswith("2"): - msvc_suffix = msvc_suffix[:-1] + msvc_suffix = msvc_suffix[:-1] bit_suffix = "-x64" if is_64_bit() else "" full_suffix = "-" + msvc_suffix + bit_suffix