(client) add Cross.toml and remove mers support

This commit is contained in:
Mark 2024-09-11 20:59:48 +02:00
parent f34524f575
commit 0d261371b7
2 changed files with 10 additions and 4 deletions

View File

@ -12,8 +12,8 @@ directories = "5.0.1"
regex = "1.9.3" regex = "1.9.3"
speedy2d = { version = "1.12.0", optional = true } speedy2d = { version = "1.12.0", optional = true }
toml = "0.7.6" toml = "0.7.6"
mers_lib = { version = "0.3.2", optional = true } # mers_lib = { version = "0.3.2", optional = true }
musicdb-mers = { version = "0.1.0", path = "../musicdb-mers", optional = true } # musicdb-mers = { version = "0.1.0", path = "../musicdb-mers", optional = true }
uianimator = "0.1.1" uianimator = "0.1.1"
[features] [features]
@ -27,6 +27,6 @@ default = ["gui", "playback"]
# playback: # playback:
# enables syncplayer modes, where the client mirrors the server's playback # enables syncplayer modes, where the client mirrors the server's playback
gui = ["speedy2d"] gui = ["speedy2d"]
merscfg = ["mers_lib", "musicdb-mers", "speedy2d"] # merscfg = ["mers_lib", "musicdb-mers", "speedy2d"]
mers = ["mers_lib", "musicdb-mers"] # mers = ["mers_lib", "musicdb-mers"]
playback = ["musicdb-lib/playback"] playback = ["musicdb-lib/playback"]

View File

@ -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"