Make it work on MacOS

bevy0.12
Elijah C. Voigt 2 years ago committed by Elijah Voigt
parent fce038b7ac
commit 5c92c07d94

591
Cargo.lock generated

File diff suppressed because it is too large Load Diff

@ -7,3 +7,6 @@ build = "build.rs"
[dependencies]
bevy_fmod = { version = "0.3", features = ["live-update"] }
bevy = { version = "0.11", features = ["jpeg", "hdr"] }
[features]
fmod = []

@ -1,8 +1,13 @@
fn main() {
println!("cargo:rustc-link-lib=fmod");
println!("cargo:rustc-link-lib=fmodstudio");
#[cfg(target_os = "linux")]
println!("cargo:rustc-link-search=lib/linux");
#[cfg(target_os = "windows")]
println!("cargo:rustc-link-search=lib/windows");
#[cfg(feature = "fmod")]
{
println!("cargo:rustc-link-lib=fmod");
println!("cargo:rustc-link-lib=fmodstudio");
}
}

@ -0,0 +1,13 @@
[toolchain]
channel = "nightly"
components = [
"rustfmt",
"rustc-dev",
"clippy",
"rls",
]
targets = [
"aarch64-apple-darwin",
"x86_64-unknown-linux-gnu",
"x86_64-pc-windows-msvc",
]

@ -2,6 +2,7 @@
/// TODO: Custom Asset: FmodEventMapper
///
use crate::prelude::*;
use bevy_fmod::prelude::*;
pub(crate) struct AudioPlugin;

@ -1,6 +1,8 @@
#![feature(iter_array_chunks)] // used in ray.rs
#[cfg(feature = "fmod")]
mod audio;
mod credits;
mod debug;
mod display2d;
@ -25,15 +27,12 @@ fn main() {
std::env::set_var("CARGO_MANIFEST_DIR", ".");
}
App::new()
.add_state::<GameState>()
.add_systems(Update, state.run_if(resource_changed::<State<GameState>>()))
.add_systems(Update, loading.run_if(in_state(GameState::Loading)))
.add_systems(
Update,
toggle_display_mode.run_if(on_event::<KeyboardInput>()),
)
.add_plugins((
let mut app = App::new();
app.add_state::<GameState>();
app.add_systems(Update, state.run_if(resource_changed::<State<GameState>>()));
app.add_systems(Update, loading.run_if(in_state(GameState::Loading)));
app.add_systems(Update,toggle_display_mode.run_if(on_event::<KeyboardInput>()));
app.add_plugins(
DefaultPlugins
.set(ImagePlugin::default_nearest())
.set(WindowPlugin {
@ -47,17 +46,34 @@ fn main() {
.set(AssetPlugin {
watch_for_changes: ChangeWatcher::with_delay(Duration::from_millis(200)),
..default()
}),
audio::AudioPlugin,
})
);
app.add_plugins(
credits::CreditsPlugin,
);
app.add_plugins(
debug::DebugPlugin,
);
app.add_plugins(
display2d::Display2dPlugin,
);
app.add_plugins(
display3d::Display3dPlugin,
);
app.add_plugins(
game::GamePlugin,
);
app.add_plugins(
loading::LoadingPlugin,
);
app.add_plugins(
menu::MenuPlugin,
))
.run();
);
#[cfg(feature = "fmod")]
app.add_plugins(
audio::AudioPlugin,
);
app.run();
}
#[derive(Clone, Copy, PartialEq, Eq, Hash, Debug, Default, States, Component)]

@ -2,5 +2,3 @@ pub use crate::*;
pub use bevy::asset::LoadState;
pub use bevy::gltf::Gltf;
pub use bevy::prelude::*;
pub use bevy_fmod::prelude::AudioSource;
pub use bevy_fmod::prelude::*;

Loading…
Cancel
Save