diff --git a/Makefile b/Makefile index 1fb36eaa..86615b28 100644 --- a/Makefile +++ b/Makefile @@ -93,9 +93,9 @@ macos-libs: ios-libs: #not tested mkdir -p $(DESKTOP_OUT)/ &&\ - rm -rf $(IOS_OUT)/libcore.xcframework + rm -rf $(IOS_OUT)/Libcore.xcframework curl -L $(CORE_URL)/$(CORE_NAME)-ios.xcframework.tar.gz | tar xz -C "$(IOS_OUT)" && \ - mv $(IOS_OUT)/$(CORE_NAME)-ios.xcframework $(IOS_OUT)/libcore.xcframework + mv $(IOS_OUT)/$(CORE_NAME)-ios.xcframework $(IOS_OUT)/Libcore.xcframework get-geo-assets: curl -L https://github.com/SagerNet/sing-geoip/releases/latest/download/geoip.db -o $(GEO_ASSETS_DIR)/geoip.db @@ -142,7 +142,7 @@ release: # Create a new tag for release. -ios-temp-preapre: +ios-temp-prepare: flutter upgrade flutter pub upgrade make prepare platform=ios diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 3f355ca7..6a440dd2 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -951,7 +951,8 @@ "\"${PODS_ROOT}/MLKitCommon/Frameworks\"", "\"${PODS_ROOT}/MLKitVision/Frameworks\"", "$(PROJECT_DIR)/Flutter", - "$(PROJECT_DIR)/Frameworks", + "$(PROJECT_DIR)/Frameworks/**", + "$(PROJECT_DIR)/..", ); INFOPLIST_FILE = Runner/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( @@ -1163,7 +1164,7 @@ CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; DEVELOPMENT_TEAM = 3JFTY5BP58; ENABLE_BITCODE = NO; - "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "i386 arm64"; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "i386 arm64 amd64"; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "\"${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher\"", @@ -1193,7 +1194,8 @@ "\"${PODS_ROOT}/MLKitCommon/Frameworks\"", "\"${PODS_ROOT}/MLKitVision/Frameworks\"", "$(PROJECT_DIR)/Flutter", - "$(PROJECT_DIR)/Frameworks", + "$(PROJECT_DIR)/Frameworks/**", + "$(PROJECT_DIR)/..", ); INFOPLIST_FILE = Runner/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( @@ -1266,7 +1268,8 @@ "\"${PODS_ROOT}/MLKitCommon/Frameworks\"", "\"${PODS_ROOT}/MLKitVision/Frameworks\"", "$(PROJECT_DIR)/Flutter", - "$(PROJECT_DIR)/Frameworks", + "$(PROJECT_DIR)/Frameworks/**", + "$(PROJECT_DIR)/..", ); INFOPLIST_FILE = Runner/Info.plist; LD_RUNPATH_SEARCH_PATHS = (