Mirrors/bevy
2
0
Fork 0
mirror of https://github.com/bevyengine/bevy synced 2024-11-10 07:04:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Feature to disable libloading (#363)

Browse source 
esp. helpful for wasm target
Made default only for `bevy` crate
This commit is contained in:
Waridley 2020-09-01 19:02:11 -05:00 committed by GitHub
parent 3d6d2431fe
commit 4e587db775
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Cargo.toml
View file

@ -13,9 +13,17 @@ readme = "README.md"
exclude = ["assets/**/*", "tools/**/*", ".github/**/*", "crates/**/*"]
[features]
default = ["bevy_audio", "bevy_gltf", "bevy_wgpu", "bevy_winit", "png", "hdr", "mp3", "x11"]
default = [
"bevy_audio", "bevy_gltf", "bevy_wgpu", "bevy_winit",
"dynamic_plugins", "png", "hdr", "mp3", "x11"
]
profiler = ["bevy_ecs/profiler", "bevy_diagnostic/profiler"]
wgpu_trace = ["bevy_wgpu/trace"]
dynamic_plugins = [
"bevy_core/dynamic_plugins",
"bevy_app/dynamic_plugins",
"bevy_type_registry/dynamic_plugins",
]
# Image format support for texture loading (PNG and HDR are enabled by default)
png = ["bevy_render/png"]

5
crates/bevy_app/Cargo.toml
View file

@ -9,6 +9,9 @@ repository = "https://github.com/bevyengine/bevy"
license = "MIT"
keywords = ["bevy"]
[features]
dynamic_plugins = ["libloading"]
[dependencies]
# bevy
bevy_derive = { path = "../bevy_derive", version = "0.1" }
@ -17,6 +20,6 @@ bevy_tasks = { path = "../bevy_tasks", version = "0.1" }
bevy_math = { path = "../bevy_math", version = "0.1" }
# other
libloading = "0.6"
libloading = { version = "0.6", optional = true }
log = { version = "0.4", features = ["release_max_level_info"] }
serde = { version = "1.0", features = ["derive"]}

5
crates/bevy_app/src/app_builder.rs
View file

@ -1,7 +1,9 @@
#[cfg(feature = "dynamic_plugins")]
use crate::plugin::dynamically_load_plugin;
use crate::{
app::{App, AppExit},
event::Events,
plugin::{dynamically_load_plugin, Plugin},
plugin::Plugin,
stage, startup_stage,
};
use bevy_ecs::{FromResources, IntoQuerySystem, Resources, System, World};
@ -220,6 +222,7 @@ impl AppBuilder {
self
}
#[cfg(feature = "dynamic_plugins")]
pub fn load_plugin(&mut self, path: &str) -> &mut Self {
let (_lib, plugin) = dynamically_load_plugin(path);
log::debug!("loaded plugin: {}", plugin.name());

2
crates/bevy_app/src/plugin.rs
View file

@ -1,4 +1,5 @@
use crate::AppBuilder;
#[cfg(feature = "dynamic_plugins")]
use libloading::{Library, Symbol};
use std::any::Any;
@ -14,6 +15,7 @@ pub trait Plugin: Any + Send + Sync {
pub type CreatePlugin = unsafe fn() -> *mut dyn Plugin;
#[cfg(feature = "dynamic_plugins")]
/// Dynamically links a plugin a the given path. The plugin must export the [CreatePlugin] function.
pub fn dynamically_load_plugin(path: &str) -> (Library, Box<dyn Plugin>) {
let lib = Library::new(path).unwrap();

3
crates/bevy_core/Cargo.toml
View file

@ -9,6 +9,9 @@ repository = "https://github.com/bevyengine/bevy"
license = "MIT"
keywords = ["bevy"]
[features]
dynamic_plugins = ["bevy_app/dynamic_plugins", "bevy_type_registry/dynamic_plugins"]
[dependencies]
bevy_app = { path = "../bevy_app", version = "0.1" }
bevy_derive = { path = "../bevy_derive", version = "0.1" }

3
crates/bevy_type_registry/Cargo.toml
View file

@ -9,6 +9,9 @@ repository = "https://github.com/bevyengine/bevy"
license = "MIT"
keywords = ["bevy"]
[features]
dynamic_plugins = ["bevy_app/dynamic_plugins"]
[dependencies]
# bevy
bevy_app = { path = "../bevy_app", version = "0.1" }