asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #57822 from Calinou/ios-remove-armv7

Browse source
This commit is contained in:
Rémi Verschelde 2022-02-08 23:25:16 +01:00 committed by GitHub
commit ba1024f42d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/ios_builds.yml vendored
View file

@ -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 }}

4
misc/dist/ios_xcode/godot_ios.xcodeproj/project.pbxproj vendored
View file

@ -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;

1
modules/gdnative/gdnative_library_editor_plugin.cpp
View file

@ -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.

1
modules/mono/editor/GodotTools/GodotTools/Export/AotBuilder.cs
View file

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

1
platform/iphone/export/export_plugin.cpp
View file

@ -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;
} }