diff --git a/V2RayX/AppDelegate.m b/V2RayX/AppDelegate.m
index b316d34..e4874e3 100644
--- a/V2RayX/AppDelegate.m
+++ b/V2RayX/AppDelegate.m
@@ -300,7 +300,7 @@ - (BOOL)isSysconfVersionOK {
}
- (IBAction)openReleasePage:(id)sender {
- [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://github.com/TZmax/V2RayXS/releases/latest"]];
+ [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://github.com/tzmax/V2RayXS/releases/latest"]];
}
- (IBAction)checkUpgrade:(id)sender {
diff --git a/V2RayX/Info.plist b/V2RayX/Info.plist
index 9ed5866..296ba60 100644
--- a/V2RayX/Info.plist
+++ b/V2RayX/Info.plist
@@ -21,7 +21,7 @@
CFBundleSignature
????
CFBundleVersion
- $(CURRENT_PROJECT_VERSION)
+ 2
LSMinimumSystemVersion
$(MACOSX_DEPLOYMENT_TARGET)
LSUIElement
diff --git a/V2RayX/dlcorex.sh b/V2RayX/dlcorex.sh
index 92b685d..d695a50 100755
--- a/V2RayX/dlcorex.sh
+++ b/V2RayX/dlcorex.sh
@@ -5,16 +5,21 @@ BOLD='\033[1m'
NORMAL='\033[0m'
cd "$SRCROOT"
-output="v0"
-if [[ -f ./xray-core-bin/xray ]]; then
+output="v${VERSION}"
+if [[ -f ./xray-core-bin/xray ]] || [ "$1" == "" ]; then
output=$(./xray-core-bin/xray --version)
fi
existingVersion=${output:5:${#VERSION}}
-if [ "$VERSION" != "$existingVersion" ]; then
+osArch=$(uname -m)
+if [[ "$VERSION" != "$existingVersion" ]] || [ "$1" != "" ]; then
getCore=0
mkdir -p xray-core-bin
cd xray-core-bin
- curl -s -L -o xray-macos.zip https://github.com/XTLS/Xray-core/releases/download/v${VERSION}/Xray-macos-64.zip
+ osArchName="64" # intel
+ if [[ "$osArch" != "x86_64" ]] || [ "$1" == "arm64" ]; then
+ osArchName="arm64-v8a" # m1
+ fi
+ curl -s -L -o xray-macos.zip https://github.com/XTLS/Xray-core/releases/download/v${VERSION}/Xray-macos-${osArchName}.zip
if [[ $? == 0 ]]; then
unzip -o xray-macos.zip
getCore=1
diff --git a/V2RayXS.xcodeproj/project.pbxproj b/V2RayXS.xcodeproj/project.pbxproj
index 4d15bdd..450803e 100644
--- a/V2RayXS.xcodeproj/project.pbxproj
+++ b/V2RayXS.xcodeproj/project.pbxproj
@@ -766,13 +766,18 @@
9504C08A1C662C3000352520 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = (
+ "$(ARCHS_STANDARD)",
+ armv7,
+ amd64,
+ );
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "-";
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 1;
INFOPLIST_FILE = V2RayX/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
- MARKETING_VERSION = 1.5.4;
+ MARKETING_VERSION = 1.5.5;
PRODUCT_BUNDLE_IDENTIFIER = cenmrev.V2RayXS;
PRODUCT_NAME = "$(TARGET_NAME)";
};
@@ -781,13 +786,19 @@
9504C08B1C662C3000352520 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = (
+ "$(ARCHS_STANDARD)",
+ armv7,
+ amd64,
+ );
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "-";
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 1;
INFOPLIST_FILE = V2RayX/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
- MARKETING_VERSION = 1.5.4;
+ MARKETING_VERSION = 1.5.5;
+ ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = cenmrev.V2RayXS;
PRODUCT_NAME = "$(TARGET_NAME)";
};