From e23fe00a378fa9c4487ccb9a1085ae5992ccc14b Mon Sep 17 00:00:00 2001 From: 2dust <31833384+2dust@users.noreply.github.com> Date: Fri, 30 Sep 2022 20:22:48 +0800 Subject: [PATCH] Revert "Merge pull request #2654 from FrzMtrsprt/ArchV3" This reverts commit ccda957e8f2476d27509357172f5b08c16005f82, reversing changes made to 4dfb0fa2131450b1b06042a501aada95c5685e8a. --- v2rayN/v2rayN/Handler/LazyConfig.cs | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/v2rayN/v2rayN/Handler/LazyConfig.cs b/v2rayN/v2rayN/Handler/LazyConfig.cs index 81591688..eb5ae6b9 100644 --- a/v2rayN/v2rayN/Handler/LazyConfig.cs +++ b/v2rayN/v2rayN/Handler/LazyConfig.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Runtime.Intrinsics.X86; using v2rayN.Mode; using System.Linq; @@ -69,10 +68,6 @@ namespace v2rayN.Handler { coreInfos = new List(); - // Detects microarch level v3 - // See https://github.com/golang/go/wiki/MinimumRequirements#amd64 - bool bArchV3 = Avx2.X64.IsSupported; - coreInfos.Add(new CoreInfo { coreType = ECoreType.v2rayN, @@ -142,7 +137,7 @@ namespace v2rayN.Handler coreUrl = Global.clashCoreUrl, coreReleaseApiUrl = Global.clashCoreUrl.Replace(@"https://github.com", @"https://api.github.com/repos"), coreDownloadUrl32 = Global.clashCoreUrl + "/download/{0}/clash-windows-386-{0}.zip", - coreDownloadUrl64 = Global.clashCoreUrl + "/download/{0}/clash-windows-amd64" + (bArchV3 ? "-v3" : "") + "-{0}.zip", + coreDownloadUrl64 = Global.clashCoreUrl + "/download/{0}/clash-windows-amd64-{0}.zip", match = "v", versionArg = "-v" }); @@ -155,7 +150,7 @@ namespace v2rayN.Handler coreUrl = Global.clashMetaCoreUrl, coreReleaseApiUrl = Global.clashMetaCoreUrl.Replace(@"https://github.com", @"https://api.github.com/repos"), coreDownloadUrl32 = Global.clashMetaCoreUrl + "/download/{0}/Clash.Meta-windows-386-{0}.zip", - coreDownloadUrl64 = Global.clashMetaCoreUrl + "/download/{0}/Clash.Meta-windows-amd64" + (bArchV3 ? "" : "-compatible") + "-{0}.zip", + coreDownloadUrl64 = Global.clashMetaCoreUrl + "/download/{0}/Clash.Meta-windows-amd64-compatible-{0}.zip", match = "v", versionArg = "-v" });