diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 3632571..9a9aba9 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -9,7 +9,7 @@ jobs: - name: Update run: | sudo apt-get update -y -qq || true - sudo apt-get install -y build-essential git make zip libsdl2-dev libsdl2-2.0-0 libsdl2-net-dev libsdl2-mixer-dev libsdl2-image-dev libsdl2-gfx-dev libsdl2-ttf-dev gcc-aarch64-linux-gnu binutils-aarch64-linux-gnu libssl-dev + sudo apt-get install -y build-essential git make zip libsdl2-dev libsdl2-2.0-0 libsdl2-net-dev libsdl2-mixer-dev libsdl2-image-dev libsdl2-gfx-dev libsdl2-ttf-dev gcc-aarch64-linux-gnu binutils-aarch64-linux-gnu cmake #sudo apt install -y libssl-dev:arm64 libasound2-dev:arm64 sudo sh -c "echo '192.168.1.253 descartes.local' >> /etc/hosts" sudo sh -c "echo '192.168.1.253 build.ladose.net' >> /etc/hosts" diff --git a/Cargo.lock b/Cargo.lock index 9ca620f..d218d01 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -107,6 +107,15 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" +[[package]] +name = "cmake" +version = "0.1.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7caa3f9de89ddbe2c607f4101924c5abec803763ae9534e4f4d7d8f84aa81f0" +dependencies = [ + "cc", +] + [[package]] name = "cynic" version = "3.10.0" @@ -1065,6 +1074,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "951deab27af08ed9c6068b7b0d05a93c91f0a8eb16b6b816a5e73452a43521d3" dependencies = [ "cfg-if", + "cmake", "libc", "version-compare", ] diff --git a/Cargo.toml b/Cargo.toml index 14e4257..f2510e2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,5 @@ cynic-codegen = { version = "3" } [dependencies.sdl2] version = "0.37" default-features = false -features = ["ttf","image","gfx","mixer"] +features = ["ttf","image","gfx"] -[target.aarch64-unknown-linux-gnu] -linker = "/usr/bin/aarch64-linux-gnu-gcc"