github
/
v2rayN
mirror of https://github.com/2dust/v2rayN
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "Merge pull request #2654 from FrzMtrsprt/ArchV3" 

This reverts commit ccda957e8f, reversing
changes made to 4dfb0fa213.
pull/2663/head
2dust 2022-09-30 20:22:48 +08:00
parent ccda957e8f
commit e23fe00a37
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
v2rayN/v2rayN/Handler/LazyConfig.cs
View File

@ -1,6 +1,5 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Runtime.Intrinsics.X86;
using v2rayN.Mode; using v2rayN.Mode;
using System.Linq; using System.Linq;
@ -69,10 +68,6 @@ namespace v2rayN.Handler
{ {
coreInfos = new List<CoreInfo>(); coreInfos = new List<CoreInfo>();
// Detects microarch level v3
// See https://github.com/golang/go/wiki/MinimumRequirements#amd64
bool bArchV3 = Avx2.X64.IsSupported;
coreInfos.Add(new CoreInfo coreInfos.Add(new CoreInfo
{ {
coreType = ECoreType.v2rayN, coreType = ECoreType.v2rayN,
@ -142,7 +137,7 @@ namespace v2rayN.Handler
coreUrl = Global.clashCoreUrl, coreUrl = Global.clashCoreUrl,
coreReleaseApiUrl = Global.clashCoreUrl.Replace(@"https://github.com", @"https://api.github.com/repos"), coreReleaseApiUrl = Global.clashCoreUrl.Replace(@"https://github.com", @"https://api.github.com/repos"),
coreDownloadUrl32 = Global.clashCoreUrl + "/download/{0}/clash-windows-386-{0}.zip", 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", match = "v",
versionArg = "-v" versionArg = "-v"
}); });
@ -155,7 +150,7 @@ namespace v2rayN.Handler
coreUrl = Global.clashMetaCoreUrl, coreUrl = Global.clashMetaCoreUrl,
coreReleaseApiUrl = Global.clashMetaCoreUrl.Replace(@"https://github.com", @"https://api.github.com/repos"), coreReleaseApiUrl = Global.clashMetaCoreUrl.Replace(@"https://github.com", @"https://api.github.com/repos"),
coreDownloadUrl32 = Global.clashMetaCoreUrl + "/download/{0}/Clash.Meta-windows-386-{0}.zip", 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", match = "v",
versionArg = "-v" versionArg = "-v"
}); });