[iOS] Use platform generated api to initialize iOS plugins
This commit is contained in:
parent
19d240c8a7
commit
d48d7cc94f
4 changed files with 90 additions and 7 deletions
48
platform/iphone/api/api.cpp
Normal file
48
platform/iphone/api/api.cpp
Normal file
|
@ -0,0 +1,48 @@
|
|||
/*************************************************************************/
|
||||
/* api.cpp */
|
||||
/*************************************************************************/
|
||||
/* This file is part of: */
|
||||
/* GODOT ENGINE */
|
||||
/* https://godotengine.org */
|
||||
/*************************************************************************/
|
||||
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */
|
||||
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */
|
||||
/* */
|
||||
/* Permission is hereby granted, free of charge, to any person obtaining */
|
||||
/* a copy of this software and associated documentation files (the */
|
||||
/* "Software"), to deal in the Software without restriction, including */
|
||||
/* without limitation the rights to use, copy, modify, merge, publish, */
|
||||
/* distribute, sublicense, and/or sell copies of the Software, and to */
|
||||
/* permit persons to whom the Software is furnished to do so, subject to */
|
||||
/* the following conditions: */
|
||||
/* */
|
||||
/* The above copyright notice and this permission notice shall be */
|
||||
/* included in all copies or substantial portions of the Software. */
|
||||
/* */
|
||||
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
|
||||
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
|
||||
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
|
||||
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
|
||||
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
|
||||
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
|
||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
|
||||
#include "api.h"
|
||||
|
||||
#if defined(IPHONE_ENABLED)
|
||||
|
||||
void register_iphone_api() {
|
||||
godot_ios_plugins_initialize();
|
||||
}
|
||||
|
||||
void unregister_iphone_api() {
|
||||
godot_ios_plugins_deinitialize();
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
void register_iphone_api() {}
|
||||
void unregister_iphone_api() {}
|
||||
|
||||
#endif
|
42
platform/iphone/api/api.h
Normal file
42
platform/iphone/api/api.h
Normal file
|
@ -0,0 +1,42 @@
|
|||
/*************************************************************************/
|
||||
/* api.h */
|
||||
/*************************************************************************/
|
||||
/* This file is part of: */
|
||||
/* GODOT ENGINE */
|
||||
/* https://godotengine.org */
|
||||
/*************************************************************************/
|
||||
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */
|
||||
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */
|
||||
/* */
|
||||
/* Permission is hereby granted, free of charge, to any person obtaining */
|
||||
/* a copy of this software and associated documentation files (the */
|
||||
/* "Software"), to deal in the Software without restriction, including */
|
||||
/* without limitation the rights to use, copy, modify, merge, publish, */
|
||||
/* distribute, sublicense, and/or sell copies of the Software, and to */
|
||||
/* permit persons to whom the Software is furnished to do so, subject to */
|
||||
/* the following conditions: */
|
||||
/* */
|
||||
/* The above copyright notice and this permission notice shall be */
|
||||
/* included in all copies or substantial portions of the Software. */
|
||||
/* */
|
||||
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
|
||||
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
|
||||
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
|
||||
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
|
||||
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
|
||||
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
|
||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
|
||||
#ifndef IPHONE_API_H
|
||||
#define IPHONE_API_H
|
||||
|
||||
#if defined(IPHONE_ENABLED)
|
||||
extern void godot_ios_plugins_initialize();
|
||||
extern void godot_ios_plugins_deinitialize();
|
||||
#endif
|
||||
|
||||
void register_iphone_api();
|
||||
void unregister_iphone_api();
|
||||
|
||||
#endif // IPHONE_API_H
|
|
@ -44,9 +44,6 @@
|
|||
#include "servers/visual/rasterizer.h"
|
||||
#include "servers/visual_server.h"
|
||||
|
||||
extern void godot_ios_plugins_initialize();
|
||||
extern void godot_ios_plugins_deinitialize();
|
||||
|
||||
class OSIPhone : public OS_Unix {
|
||||
|
||||
private:
|
||||
|
|
|
@ -114,8 +114,6 @@ int OSIPhone::get_current_video_driver() const {
|
|||
}
|
||||
|
||||
void OSIPhone::start() {
|
||||
godot_ios_plugins_initialize();
|
||||
|
||||
Main::start();
|
||||
|
||||
if (joypad_iphone) {
|
||||
|
@ -320,8 +318,6 @@ void OSIPhone::finalize() {
|
|||
memdelete(ios);
|
||||
}
|
||||
|
||||
godot_ios_plugins_deinitialize();
|
||||
|
||||
visual_server->finish();
|
||||
memdelete(visual_server);
|
||||
// memdelete(rasterizer);
|
||||
|
|
Loading…
Reference in a new issue