diff --git a/Cargo.toml b/Cargo.toml index 63aaafd..bf4a163 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,7 +18,7 @@ anyhow = "1.0.42" [package.metadata.vcpkg] dependencies = ["sdl2", "sdl2-image[libjpeg-turbo,tiff,libwebp]", "sdl2-ttf", "sdl2-gfx", "sdl2-mixer[mpg123]"] git = "https://github.com/microsoft/vcpkg" -rev = "261c458af6e3eed5d099144aff95d2b5035f656b" +rev = "025e564979cc01d0fbc5c920aa8a36635efb01bb" [package.metadata.vcpkg.target] -x86_64-pc-windows-msvc = { triplet = "x64-windows", dependencies = ["yasm", "sdl2", "sdl2-image[libjpeg-turbo,tiff,libwebp]", "sdl2-ttf", "sdl2-gfx", "sdl2-mixer[mpg123]"] } +x86_64-pc-windows-msvc = { triplet = "x64-windows-static-md", dependencies = ["yasm", "sdl2", "sdl2-image[libjpeg-turbo,tiff,libwebp]", "sdl2-ttf", "sdl2-gfx", "sdl2-mixer"] } diff --git a/src/main.rs b/src/main.rs index f6a3f8b..0b0a069 100644 --- a/src/main.rs +++ b/src/main.rs @@ -496,7 +496,8 @@ fn main() -> Result<()> { let sdl_context = sdl2::init().map_err(|e| anyhow!(e))?; let video_subsystem = sdl_context.video().map_err(|e| anyhow!(e))?; let image_context = sdl2::image::init(InitFlag::PNG | InitFlag::JPG).map_err(|e| anyhow!(e))?; - let mixer_context = sdl2::mixer::init(MixerInitFlag::MP3).map_err(|e| anyhow!(e))?; + let mixer_flag = if cfg!(windows) { MixerInitFlag::empty() } else { MixerInitFlag::MP3 }; + let mixer_context = sdl2::mixer::init(mixer_flag).map_err(|e| anyhow!(e))?; let ttf_context = sdl2::ttf::init()?; // let audio_subsystem = sdl_context.audio().map_err(|e| anyhow!(e))?;