From edeaa5a78a7d10eae13829aefada80dda5404e3f Mon Sep 17 00:00:00 2001 From: Qiu Yuzhou Date: Tue, 8 May 2018 12:14:28 +0800 Subject: [PATCH] Fixes project. --- ShadowsocksX-NG.xcodeproj/project.pbxproj | 12 ++++++------ ShadowsocksX-NG/install_ss_local.sh | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ShadowsocksX-NG.xcodeproj/project.pbxproj b/ShadowsocksX-NG.xcodeproj/project.pbxproj index 119acd4..602d488 100755 --- a/ShadowsocksX-NG.xcodeproj/project.pbxproj +++ b/ShadowsocksX-NG.xcodeproj/project.pbxproj @@ -48,9 +48,6 @@ 9B5832071E7421B2009D5B7D /* virtual-server-icon-3.png in Resources */ = {isa = PBXBuildFile; fileRef = 9B5832061E7421B2009D5B7D /* virtual-server-icon-3.png */; }; 9B58320B1E7422DB009D5B7D /* http.png in Resources */ = {isa = PBXBuildFile; fileRef = 9B58320A1E7422DB009D5B7D /* http.png */; }; 9B5832111E742632009D5B7D /* kcptun_1.png in Resources */ = {isa = PBXBuildFile; fileRef = 9B5832101E742632009D5B7D /* kcptun_1.png */; }; - 9B5AA0A1209C100C00E8B659 /* libsodium.23.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9B5AA09F209C100C00E8B659 /* libsodium.23.dylib */; }; - 9B5AA0A3209C103900E8B659 /* libcares.2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9B5AA0A2209C103900E8B659 /* libcares.2.dylib */; }; - 9B5AA0A5209C115B00E8B659 /* libmbedcrypto.2.8.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9B5AA0A4209C115B00E8B659 /* libmbedcrypto.2.8.0.dylib */; }; 9B5AA0AC209C43C200E8B659 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 9B5AA0AB209C43C200E8B659 /* Credits.rtf */; }; 9B6BF9541E27B2570061B9A7 /* ServiceManagement.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9B6BF9531E27B2570061B9A7 /* ServiceManagement.framework */; }; 9B86459D1E7C2CAD00A84029 /* ProxyInterfacesViewCtrl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9B86459C1E7C2CAD00A84029 /* ProxyInterfacesViewCtrl.swift */; }; @@ -72,6 +69,9 @@ 9BB706A71D1B982300551F0E /* SWBApplication.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BB706A51D1B982300551F0E /* SWBApplication.m */; }; 9BBE7B751F508A0E00E8FFE5 /* fix_dir_owner.sh in Resources */ = {isa = PBXBuildFile; fileRef = 9BBE7B711F50790500E8FFE5 /* fix_dir_owner.sh */; }; 9BC70EDC1D2E3E3100EDA4CA /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 9B172A6C1D0ADDDD00B87B9A /* Localizable.strings */; }; + 9BCB1D6C20A15B0E005BABE7 /* libsodium.23.dylib in Resources */ = {isa = PBXBuildFile; fileRef = 9B5AA09F209C100C00E8B659 /* libsodium.23.dylib */; }; + 9BCB1D6D20A15B0E005BABE7 /* libcares.2.dylib in Resources */ = {isa = PBXBuildFile; fileRef = 9B5AA0A2209C103900E8B659 /* libcares.2.dylib */; }; + 9BCB1D6E20A15B0E005BABE7 /* libmbedcrypto.2.8.0.dylib in Resources */ = {isa = PBXBuildFile; fileRef = 9B5AA0A4209C115B00E8B659 /* libmbedcrypto.2.8.0.dylib */; }; 9BEEF0691D04D4D500FC52B3 /* install_ss_local.sh in Resources */ = {isa = PBXBuildFile; fileRef = 9BEEF0651D04CB8500FC52B3 /* install_ss_local.sh */; }; 9BEEF06A1D04D4D500FC52B3 /* start_ss_local.sh in Resources */ = {isa = PBXBuildFile; fileRef = 9BEEF0661D04CE8D00FC52B3 /* start_ss_local.sh */; }; 9BEEF06B1D04D4D500FC52B3 /* stop_ss_local.sh in Resources */ = {isa = PBXBuildFile; fileRef = 9BEEF0671D04CE9A00FC52B3 /* stop_ss_local.sh */; }; @@ -257,12 +257,9 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 9B5AA0A3209C103900E8B659 /* libcares.2.dylib in Frameworks */, 9B6BF9541E27B2570061B9A7 /* ServiceManagement.framework in Frameworks */, 9B3FFF3E1D08D9910019A709 /* SystemConfiguration.framework in Frameworks */, - 9B5AA0A5209C115B00E8B659 /* libmbedcrypto.2.8.0.dylib in Frameworks */, 258E511BA910B0521B24DAB8 /* Pods_ShadowsocksX_NG.framework in Frameworks */, - 9B5AA0A1209C100C00E8B659 /* libsodium.23.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -633,6 +630,9 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 9BCB1D6C20A15B0E005BABE7 /* libsodium.23.dylib in Resources */, + 9BCB1D6D20A15B0E005BABE7 /* libcares.2.dylib in Resources */, + 9BCB1D6E20A15B0E005BABE7 /* libmbedcrypto.2.8.0.dylib in Resources */, 9BBE7B751F508A0E00E8FFE5 /* fix_dir_owner.sh in Resources */, 9B3F7BFF1E82BF5B00C68B75 /* libev.4.dylib in Resources */, 1C82DBAA1FA96FB600B32551 /* install_simple_obfs.sh in Resources */, diff --git a/ShadowsocksX-NG/install_ss_local.sh b/ShadowsocksX-NG/install_ss_local.sh index 5d20d47..ab50404 100755 --- a/ShadowsocksX-NG/install_ss_local.sh +++ b/ShadowsocksX-NG/install_ss_local.sh @@ -24,19 +24,19 @@ cp -f libev.4.dylib "$TargetDir" # 2.8.0 https://bintray.com/homebrew/bottles/mbedtls cp -f libmbedcrypto.2.8.0.dylib "$TargetDir" -ln -s "$TargetDir/libmbedcrypto.2.8.0.dylib" "$TargetDir/libmbedcrypto.1.dylib" +ln -sfh "$TargetDir/libmbedcrypto.2.8.0.dylib" "$TargetDir/libmbedcrypto.1.dylib" # 8.42 https://bintray.com/homebrew/bottles/pcre cp -f libpcre.1.dylib "$TargetDir" # 1.0.16 https://bintray.com/homebrew/bottles/libsodium cp -f libsodium.23.dylib "$TargetDir" -ln -s "$TargetDir/libsodium.23.dylib" "$TargetDir/libsodium.dylib" +ln -sfh "$TargetDir/libsodium.23.dylib" "$TargetDir/libsodium.dylib" #cp -f libudns.0.dylib "$TargetDir" # 1.14.0 https://bintray.com/homebrew/bottles/c-ares cp -f libcares.2.dylib "$TargetDir" -ln -s "$TargetDir/libcares.2.dylib" "$TargetDir/libcares.dylib" +ln -sfh "$TargetDir/libcares.2.dylib" "$TargetDir/libcares.dylib" echo done