From e282ef3acd7fcb4b2ba16863a7a0a7a8439f9335 Mon Sep 17 00:00:00 2001 From: Luke Street Date: Mon, 7 Feb 2022 15:16:20 -0500 Subject: [PATCH] Update SDL; add no-link feature --- Cargo.toml | 1 + sdl2-sys/Cargo.toml | 1 + sdl2-sys/SDL | 2 +- sdl2-sys/build.rs | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index ee1ff6c0..aad89e49 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -55,6 +55,7 @@ use-vcpkg = ["sdl2-sys/use-vcpkg"] use_mac_framework = ["sdl2-sys/use_mac_framework"] bundled = ["sdl2-sys/bundled"] static-link = ["sdl2-sys/static-link"] +no-link = ["sdl2-sys/no-link"] [package.metadata.docs.rs] features = ["default", "gfx", "mixer", "image", "ttf"] diff --git a/sdl2-sys/Cargo.toml b/sdl2-sys/Cargo.toml index abc63fc7..88978075 100644 --- a/sdl2-sys/Cargo.toml +++ b/sdl2-sys/Cargo.toml @@ -50,6 +50,7 @@ use-pkgconfig = ["pkg-config"] use-vcpkg = ["vcpkg"] use-bindgen = ["bindgen"] static-link = [] +no-link = [] use_mac_framework = [] bundled = ["cmake"] mixer = [] diff --git a/sdl2-sys/SDL b/sdl2-sys/SDL index a1e992b1..53091e36 160000 --- a/sdl2-sys/SDL +++ b/sdl2-sys/SDL @@ -1 +1 @@ -Subproject commit a1e992b110b9adf3305a5ebb5514f0e970f7911e +Subproject commit 53091e36a3b418e33133bae2f018954c006f86b8 diff --git a/sdl2-sys/build.rs b/sdl2-sys/build.rs index 730cd3d7..33929523 100644 --- a/sdl2-sys/build.rs +++ b/sdl2-sys/build.rs @@ -495,6 +495,7 @@ fn main() { println!("cargo:include={}", sdl2_includes); } + #[cfg(not(feature = "no-link"))] link_sdl2(target_os); // Android builds shared libhidapi.so even for static builds.