diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml index 84f63a6..552ac73 100644 --- a/.github/workflows/linux-build.yml +++ b/.github/workflows/linux-build.yml @@ -17,7 +17,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Install dependencies - run: sudo apt-get update && sudo apt-get install -y libasound2 libsdl2-dev libsdl2-ttf-dev libsdl2-mixer-dev libsdl2-image-dev ffmpeg libavcodec-dev libavdevice-dev libavfilter-dev libavformat-dev libavutil-dev libpostproc-dev libswresample-dev libswscale-dev pkg-config build-essential + run: sudo apt-get update && sudo apt-get install -y libasound2 libsdl2-dev libsdl2-ttf-dev libsdl2-image-dev ffmpeg libavcodec-dev libavdevice-dev libavfilter-dev libavformat-dev libavutil-dev libpostproc-dev libswresample-dev libswscale-dev pkg-config build-essential - name: Build run: cargo build --verbose #- name: Run tests diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml index 5f8a112..2718827 100644 --- a/.github/workflows/win-build.yml +++ b/.github/workflows/win-build.yml @@ -22,7 +22,7 @@ jobs: .\msys2-installer.exe in --confirm-command --accept-messages --root C:/msys64-bidrum - name: Install FFmpeg and SDL2 run: | - C:\msys64-bidrum\usr\bin\bash.exe -l -c "pacman --noconfirm -S mingw-w64-x86_64-toolchain mingw-w64-x86_64-ffmpeg mingw-w64-x86_64-clang mingw-w64-x86_64-SDL2 mingw-w64-x86_64-SDL2_ttf mingw-w64-x86_64-SDL2_image mingw-w64-x86_64-SDL2_mixer mingw-w64-x86_64-pkg-config" + C:\msys64-bidrum\usr\bin\bash.exe -l -c "pacman --noconfirm -S mingw-w64-x86_64-toolchain mingw-w64-x86_64-ffmpeg mingw-w64-x86_64-clang mingw-w64-x86_64-SDL2 mingw-w64-x86_64-SDL2_ttf mingw-w64-x86_64-SDL2_image mingw-w64-x86_64-pkg-config" - name: Prepare GNU toolchain for rust run: | rustup toolchain install stable-gnu diff --git a/README.md b/README.md index 4023db6..3ca5e7f 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ ### Linux 1. Install `git-lfs` before you clone 1. Install rust -1. Install ffmpeg 7.*, sdl2, sdl2_mixer, sdl2_image, sdl2_ttf. +1. Install ffmpeg 7.*, sdl2, sdl2_image, sdl2_ttf. - For instructions on sdl2 installation, see [rust-sdl2 README](https://github.com/Rust-SDL2/rust-sdl2). 1. Run `cargo build` - If there's an error related to FFmpeg library building, try installing EVERY libraries related to libclang, INCLUDING development libraries. this may fix the problem. @@ -14,7 +14,7 @@ ### Mac OS 1. Install `git-lfs` before you clone 1. Install rust -1. Install ffmpeg 7.*, sdl2, sdl2_mixer, sdl2_image, sdl2_ttf. +1. Install ffmpeg 7.*, sdl2, sdl2_image, sdl2_ttf. - For instructions on sdl2 installation, see [rust-sdl2 README](https://github.com/Rust-SDL2/rust-sdl2). 1. Type `export LIBRARY_PATH="$LIBRARY_PATH:$(brew --prefix)/lib"` to your terminal. 1. Run `cargo build` @@ -31,7 +31,7 @@ Due to difficulties on building Rust FFmpeg library on Windows, The GNU toolchai 1. Run following command on **MSYS2 SHELL**. (**NOT POWERSHELL / CMD / GIT BASH**) - Append `--noconfirm` parameter if you want to say "yes" to all the questions automatically ```bash - pacman -S mingw-w64-x86_64-toolchain mingw-w64-x86_64-ffmpeg mingw-w64-x86_64-clang mingw-w64-x86_64-SDL2 mingw-w64-x86_64-SDL2_ttf mingw-w64-x86_64-SDL2_image mingw-w64-x86_64-SDL2_mixer + pacman -S mingw-w64-x86_64-toolchain mingw-w64-x86_64-ffmpeg mingw-w64-x86_64-clang mingw-w64-x86_64-SDL2 mingw-w64-x86_64-SDL2_ttf mingw-w64-x86_64-SDL2_image ``` 1. (Optional) Run the following commands in PowerShell or cmd and remember default host and default toolchain. - You can use the default host and default toolchain remembered here after building bidrum, with `rustup set default-host` and `rustup default` commands. diff --git a/game/Cargo.toml b/game/Cargo.toml index 025c173..3a92bde 100644 --- a/game/Cargo.toml +++ b/game/Cargo.toml @@ -12,7 +12,7 @@ clap = { version = "4.4.13", features = ["derive"] } ffmpeg-next = "7.0.0" kira = "0.8.6" num-rational = "0.4.1" -sdl2 = { version = "0.36.0", features = ["image", "ttf", "mixer"] } +sdl2 = { version = "0.36.0", features = ["image", "ttf"] } serde = { version = "1.0.195", features = ["derive"] } serde_json = "1.0.111" serialport = "4.3.0"