Browse Source

Remove support for ARMv7 (32-bit) on iOS

All iOS devices since the iPhone 5S support ARMv8 (64-bit).

The last iOS version supported on ARMv7 devices is 10.x, which is
too old to run Godot 4.0 projects since the minimum supported
iOS version is 11.0.
Hugo Locurcio 3 years ago
parent
commit
74fc4410f4

+ 1 - 1
.github/workflows/ios_builds.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Setup python and scons
       - name: Setup python and scons
         uses: ./.github/actions/godot-deps
         uses: ./.github/actions/godot-deps
 
 
-      - name: Compilation (armv7)
+      - name: Compilation (arm64v8)
         uses: ./.github/actions/godot-build
         uses: ./.github/actions/godot-build
         with:
         with:
           sconsflags: ${{ env.SCONSFLAGS }}
           sconsflags: ${{ env.SCONSFLAGS }}

+ 2 - 2
misc/dist/ios_xcode/godot_ios.xcodeproj/project.pbxproj

@@ -325,7 +325,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "$provisioning_profile_uuid_debug";
 				PROVISIONING_PROFILE = "$provisioning_profile_uuid_debug";
 				TARGETED_DEVICE_FAMILY = "$targeted_device_family";
 				TARGETED_DEVICE_FAMILY = "$targeted_device_family";
-				VALID_ARCHS = "armv7 armv7s arm64 i386 x86_64";
+				VALID_ARCHS = "arm64 x86_64";
 				WRAPPER_EXTENSION = app;
 				WRAPPER_EXTENSION = app;
 			};
 			};
 			name = Debug;
 			name = Debug;
@@ -356,7 +356,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "$provisioning_profile_uuid_release";
 				PROVISIONING_PROFILE = "$provisioning_profile_uuid_release";
 				TARGETED_DEVICE_FAMILY = "$targeted_device_family";
 				TARGETED_DEVICE_FAMILY = "$targeted_device_family";
-				VALID_ARCHS = "armv7 armv7s arm64 i386 x86_64";
+				VALID_ARCHS = "arm64 x86_64";
 				WRAPPER_EXTENSION = app;
 				WRAPPER_EXTENSION = app;
 			};
 			};
 			name = Release;
 			name = Release;

+ 0 - 1
modules/gdnative/gdnative_library_editor_plugin.cpp

@@ -315,7 +315,6 @@ GDNativeLibraryEditor::GDNativeLibraryEditor() {
 
 
 		NativePlatformConfig platform_ios;
 		NativePlatformConfig platform_ios;
 		platform_ios.name = "iOS";
 		platform_ios.name = "iOS";
-		platform_ios.entries.push_back("armv7");
 		platform_ios.entries.push_back("arm64");
 		platform_ios.entries.push_back("arm64");
 		platform_ios.entries.push_back("x86_64");
 		platform_ios.entries.push_back("x86_64");
 		// iOS can use both Static and Dynamic libraries.
 		// iOS can use both Static and Dynamic libraries.

+ 0 - 1
modules/mono/editor/GodotTools/GodotTools/Export/AotBuilder.cs

@@ -537,7 +537,6 @@ MONO_AOT_MODE_LAST = 1000,
         {
         {
             var iosArchs = new[]
             var iosArchs = new[]
             {
             {
-                "armv7",
                 "arm64"
                 "arm64"
             };
             };
 
 

+ 0 - 1
platform/iphone/export/export_plugin.cpp

@@ -43,7 +43,6 @@ void EditorExportPlatformIOS::get_preset_features(const Ref<EditorExportPreset>
 
 
 Vector<EditorExportPlatformIOS::ExportArchitecture> EditorExportPlatformIOS::_get_supported_architectures() {
 Vector<EditorExportPlatformIOS::ExportArchitecture> EditorExportPlatformIOS::_get_supported_architectures() {
 	Vector<ExportArchitecture> archs;
 	Vector<ExportArchitecture> archs;
-	archs.push_back(ExportArchitecture("armv7", false)); // Disabled by default, not included in official templates.
 	archs.push_back(ExportArchitecture("arm64", true));
 	archs.push_back(ExportArchitecture("arm64", true));
 	return archs;
 	return archs;
 }
 }