Add iOS export option for device family
(cherry picked from commit 19ae8193ee
)
This commit is contained in:
parent
857fd831c1
commit
0d7130f37c
2 changed files with 20 additions and 4 deletions
|
@ -247,7 +247,7 @@
|
||||||
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
|
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
|
||||||
OTHER_LDFLAGS = "$linker_flags";
|
OTHER_LDFLAGS = "$linker_flags";
|
||||||
SDKROOT = iphoneos;
|
SDKROOT = iphoneos;
|
||||||
TARGETED_DEVICE_FAMILY = "1,2";
|
TARGETED_DEVICE_FAMILY = "$targeted_device_family";
|
||||||
};
|
};
|
||||||
name = Debug;
|
name = Debug;
|
||||||
};
|
};
|
||||||
|
@ -286,7 +286,7 @@
|
||||||
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
|
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
|
||||||
OTHER_LDFLAGS = "$linker_flags";
|
OTHER_LDFLAGS = "$linker_flags";
|
||||||
SDKROOT = iphoneos;
|
SDKROOT = iphoneos;
|
||||||
TARGETED_DEVICE_FAMILY = "1,2";
|
TARGETED_DEVICE_FAMILY = "$targeted_device_family";
|
||||||
VALIDATE_PRODUCT = YES;
|
VALIDATE_PRODUCT = YES;
|
||||||
};
|
};
|
||||||
name = Release;
|
name = Release;
|
||||||
|
@ -315,7 +315,7 @@
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = $identifier;
|
PRODUCT_BUNDLE_IDENTIFIER = $identifier;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
PROVISIONING_PROFILE = "$provisioning_profile_uuid_debug";
|
PROVISIONING_PROFILE = "$provisioning_profile_uuid_debug";
|
||||||
TARGETED_DEVICE_FAMILY = "1,2";
|
TARGETED_DEVICE_FAMILY = "$targeted_device_family";
|
||||||
VALID_ARCHS = "armv7 armv7s arm64 i386 x86_64";
|
VALID_ARCHS = "armv7 armv7s arm64 i386 x86_64";
|
||||||
WRAPPER_EXTENSION = app;
|
WRAPPER_EXTENSION = app;
|
||||||
};
|
};
|
||||||
|
@ -345,7 +345,7 @@
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = $identifier;
|
PRODUCT_BUNDLE_IDENTIFIER = $identifier;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
PROVISIONING_PROFILE = "$provisioning_profile_uuid_release";
|
PROVISIONING_PROFILE = "$provisioning_profile_uuid_release";
|
||||||
TARGETED_DEVICE_FAMILY = "1,2";
|
TARGETED_DEVICE_FAMILY = "$targeted_device_family";
|
||||||
VALID_ARCHS = "armv7 armv7s arm64 i386 x86_64";
|
VALID_ARCHS = "armv7 armv7s arm64 i386 x86_64";
|
||||||
WRAPPER_EXTENSION = app;
|
WRAPPER_EXTENSION = app;
|
||||||
};
|
};
|
||||||
|
|
|
@ -352,6 +352,8 @@ void EditorExportPlatformIOS::get_export_options(List<ExportOption> *r_options)
|
||||||
r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/code_sign_identity_release", PROPERTY_HINT_PLACEHOLDER_TEXT, "iPhone Distribution"), ""));
|
r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/code_sign_identity_release", PROPERTY_HINT_PLACEHOLDER_TEXT, "iPhone Distribution"), ""));
|
||||||
r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "application/export_method_release", PROPERTY_HINT_ENUM, "App Store,Development,Ad-Hoc,Enterprise"), 0));
|
r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "application/export_method_release", PROPERTY_HINT_ENUM, "App Store,Development,Ad-Hoc,Enterprise"), 0));
|
||||||
|
|
||||||
|
r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "application/targeted_device_family", PROPERTY_HINT_ENUM, "iPhone,iPad,iPhone & iPad"), 2));
|
||||||
|
|
||||||
r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/name", PROPERTY_HINT_PLACEHOLDER_TEXT, "Game Name"), ""));
|
r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/name", PROPERTY_HINT_PLACEHOLDER_TEXT, "Game Name"), ""));
|
||||||
r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/info"), "Made with Godot Engine"));
|
r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/info"), "Made with Godot Engine"));
|
||||||
r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/identifier", PROPERTY_HINT_PLACEHOLDER_TEXT, "com.example.game"), ""));
|
r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/identifier", PROPERTY_HINT_PLACEHOLDER_TEXT, "com.example.game"), ""));
|
||||||
|
@ -466,6 +468,20 @@ void EditorExportPlatformIOS::_fix_config_file(const Ref<EditorExportPreset> &p_
|
||||||
strnew += lines[i].replace("$godot_archs", p_config.architectures) + "\n";
|
strnew += lines[i].replace("$godot_archs", p_config.architectures) + "\n";
|
||||||
} else if (lines[i].find("$linker_flags") != -1) {
|
} else if (lines[i].find("$linker_flags") != -1) {
|
||||||
strnew += lines[i].replace("$linker_flags", p_config.linker_flags) + "\n";
|
strnew += lines[i].replace("$linker_flags", p_config.linker_flags) + "\n";
|
||||||
|
} else if (lines[i].find("$targeted_device_family") != -1) {
|
||||||
|
String xcode_value;
|
||||||
|
switch ((int)p_preset->get("application/targeted_device_family")) {
|
||||||
|
case 0: // iPhone
|
||||||
|
xcode_value = "1";
|
||||||
|
break;
|
||||||
|
case 1: // iPad
|
||||||
|
xcode_value = "2";
|
||||||
|
break;
|
||||||
|
case 2: // iPhone & iPad
|
||||||
|
xcode_value = "1,2";
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
strnew += lines[i].replace("$targeted_device_family", xcode_value) + "\n";
|
||||||
} else if (lines[i].find("$cpp_code") != -1) {
|
} else if (lines[i].find("$cpp_code") != -1) {
|
||||||
strnew += lines[i].replace("$cpp_code", p_config.cpp_code) + "\n";
|
strnew += lines[i].replace("$cpp_code", p_config.cpp_code) + "\n";
|
||||||
} else if (lines[i].find("$docs_in_place") != -1) {
|
} else if (lines[i].find("$docs_in_place") != -1) {
|
||||||
|
|
Loading…
Reference in a new issue