diff --git a/common/dynlib/src/lib.rs b/common/dynlib/src/lib.rs index 33833e0cf5..be7ef39c28 100644 --- a/common/dynlib/src/lib.rs +++ b/common/dynlib/src/lib.rs @@ -121,10 +121,9 @@ impl LoadedLib { /// files within it for any changes. pub fn init( package: &'static str, - dyn_package: &'static str, package_source_dir: &'static str, ) -> Arc>> { - let lib_storage = Arc::new(Mutex::new(Some(LoadedLib::compile_load(dyn_package)))); + let lib_storage = Arc::new(Mutex::new(Some(LoadedLib::compile_load(package)))); // TODO: use crossbeam let (reload_send, reload_recv) = mpsc::channel(); @@ -164,7 +163,7 @@ pub fn init( "Hot reloading {} because files in `{}` modified.", package, package_source_dir ); - hotreload(dyn_package, &lib_storage_clone); + hotreload(package, &lib_storage_clone); } }) .unwrap(); diff --git a/server/agent/src/lib.rs b/server/agent/src/lib.rs index 83257f21d4..ba8e421aed 100644 --- a/server/agent/src/lib.rs +++ b/server/agent/src/lib.rs @@ -17,7 +17,7 @@ use {common_dynlib::LoadedLib, lazy_static::lazy_static, std::sync::Arc, std::sy #[cfg(feature = "use-dyn-lib")] lazy_static! { pub static ref LIB: Arc>> = - common_dynlib::init("veloren-server-agent", "veloren-server-agent", "agent"); + common_dynlib::init("veloren-server-agent", "agent"); } #[cfg(feature = "use-dyn-lib")] diff --git a/voxygen/anim/src/lib.rs b/voxygen/anim/src/lib.rs index 5d5c8adfac..fc6ebafe33 100644 --- a/voxygen/anim/src/lib.rs +++ b/voxygen/anim/src/lib.rs @@ -99,7 +99,7 @@ pub type Bone = Transform; #[cfg(feature = "use-dyn-lib")] lazy_static! { static ref LIB: Arc>> = - common_dynlib::init("veloren-voxygen-anim", "veloren-voxygen-anim", "anim"); + common_dynlib::init("veloren-voxygen-anim", "anim"); } #[cfg(feature = "use-dyn-lib")] diff --git a/voxygen/egui/src/lib.rs b/voxygen/egui/src/lib.rs index d00154d063..ca8e76dac4 100644 --- a/voxygen/egui/src/lib.rs +++ b/voxygen/egui/src/lib.rs @@ -37,7 +37,7 @@ use { #[cfg(feature = "use-dyn-lib")] lazy_static! { static ref LIB: Arc>> = - common_dynlib::init("veloren-voxygen-egui", "veloren-voxygen-egui", "egui"); + common_dynlib::init("veloren-voxygen-egui", "egui"); } #[cfg(feature = "use-dyn-lib")]