From 0d261371b7843d5f0632ac7ab73db8c125d639d3 Mon Sep 17 00:00:00 2001 From: Mark <> Date: Wed, 11 Sep 2024 20:59:48 +0200 Subject: [PATCH] (client) add Cross.toml and remove mers support --- musicdb-client/Cargo.toml | 8 ++++---- musicdb-client/Cross.toml | 6 ++++++ 2 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 musicdb-client/Cross.toml diff --git a/musicdb-client/Cargo.toml b/musicdb-client/Cargo.toml index b7505fe..afbf1c9 100644 --- a/musicdb-client/Cargo.toml +++ b/musicdb-client/Cargo.toml @@ -12,8 +12,8 @@ directories = "5.0.1" regex = "1.9.3" speedy2d = { version = "1.12.0", optional = true } toml = "0.7.6" -mers_lib = { version = "0.3.2", optional = true } -musicdb-mers = { version = "0.1.0", path = "../musicdb-mers", optional = true } +# mers_lib = { version = "0.3.2", optional = true } +# musicdb-mers = { version = "0.1.0", path = "../musicdb-mers", optional = true } uianimator = "0.1.1" [features] @@ -27,6 +27,6 @@ default = ["gui", "playback"] # playback: # enables syncplayer modes, where the client mirrors the server's playback gui = ["speedy2d"] -merscfg = ["mers_lib", "musicdb-mers", "speedy2d"] -mers = ["mers_lib", "musicdb-mers"] +# merscfg = ["mers_lib", "musicdb-mers", "speedy2d"] +# mers = ["mers_lib", "musicdb-mers"] playback = ["musicdb-lib/playback"] diff --git a/musicdb-client/Cross.toml b/musicdb-client/Cross.toml new file mode 100644 index 0000000..d222800 --- /dev/null +++ b/musicdb-client/Cross.toml @@ -0,0 +1,6 @@ +[build] +pre-build = [ + "dpkg --add-architecture $CROSS_DEB_ARCH", + "apt-get update && apt-get --assume-yes install libasound2-dev libasound2-dev:$CROSS_DEB_ARCH" +] +default-target = "aarch64-unknown-linux-gnu"