mirrors/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-01-24 03:24:32 -05:00
Code Issues Projects Releases Packages Wiki Activity

GDNative Editor: Support selecting frameworks for iOS

Browse source
This commit is contained in:
Sergey Minakov 2020-07-02 12:47:20 +03:00
parent 864224a5c1
commit ad2248a3bd
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
modules/gdnative/gdnative_library_editor_plugin.cpp
View file

@ -127,15 +127,24 @@ void GDNativeLibraryEditor::_on_item_button(Object *item, int column, int id) {
String section = (id == BUTTON_SELECT_DEPENDENCES || id == BUTTON_CLEAR_DEPENDENCES) ? "dependencies" : "entry"; String section = (id == BUTTON_SELECT_DEPENDENCES || id == BUTTON_CLEAR_DEPENDENCES) ? "dependencies" : "entry";
if (id == BUTTON_SELECT_LIBRARY || id == BUTTON_SELECT_DEPENDENCES) { if (id == BUTTON_SELECT_LIBRARY || id == BUTTON_SELECT_DEPENDENCES) {
TreeItem *treeItem = Object::cast_to<TreeItem>(item)->get_parent();
EditorFileDialog::FileMode mode = EditorFileDialog::FILE_MODE_OPEN_FILE; EditorFileDialog::FileMode mode = EditorFileDialog::FILE_MODE_OPEN_FILE;
if (id == BUTTON_SELECT_DEPENDENCES) { if (id == BUTTON_SELECT_DEPENDENCES) {
mode = EditorFileDialog::FILE_MODE_OPEN_FILES; mode = EditorFileDialog::FILE_MODE_OPEN_FILES;
} else if (treeItem->get_text(0) == "iOS") {
mode = EditorFileDialog::FILE_MODE_OPEN_ANY;
} }
file_dialog->set_meta("target", target); file_dialog->set_meta("target", target);
file_dialog->set_meta("section", section); file_dialog->set_meta("section", section);
file_dialog->clear_filters(); file_dialog->clear_filters();
file_dialog->add_filter(Object::cast_to<TreeItem>(item)->get_parent()->get_metadata(0));
String filter_string = treeItem->get_metadata(0);
Vector<String> filters = filter_string.split(",", false, 0);
for (int i = 0; i < filters.size(); i++) {
file_dialog->add_filter(filters[i]);
}
file_dialog->set_file_mode(mode); file_dialog->set_file_mode(mode);
file_dialog->popup_centered_ratio(); file_dialog->popup_centered_ratio();
@ -309,7 +318,9 @@ GDNativeLibraryEditor::GDNativeLibraryEditor() {
platform_ios.name = "iOS"; platform_ios.name = "iOS";
platform_ios.entries.push_back("armv7"); platform_ios.entries.push_back("armv7");
platform_ios.entries.push_back("arm64"); platform_ios.entries.push_back("arm64");
platform_ios.library_extension = "*.dylib"; // iOS can use both Static and Dynamic libraries.
// Frameworks is actually a folder with files.
platform_ios.library_extension = "*.framework; Framework, *.xcframework; Binary Framework, *.a; Static Library, *.dylib; Dynamic Library";
platforms["iOS"] = platform_ios; platforms["iOS"] = platform_ios;
} }
@ -360,6 +371,7 @@ GDNativeLibraryEditor::GDNativeLibraryEditor() {
//file_dialog->set_resizable(true); //file_dialog->set_resizable(true);
add_child(file_dialog); add_child(file_dialog);
file_dialog->connect("file_selected", callable_mp(this, &GDNativeLibraryEditor::_on_library_selected)); file_dialog->connect("file_selected", callable_mp(this, &GDNativeLibraryEditor::_on_library_selected));
file_dialog->connect("dir_selected", callable_mp(this, &GDNativeLibraryEditor::_on_library_selected));
file_dialog->connect("files_selected", callable_mp(this, &GDNativeLibraryEditor::_on_dependencies_selected)); file_dialog->connect("files_selected", callable_mp(this, &GDNativeLibraryEditor::_on_dependencies_selected));
new_architecture_dialog = memnew(ConfirmationDialog); new_architecture_dialog = memnew(ConfirmationDialog);