From a8d401ae4f6ae88f53c4c32d8eaf57c06834f86e Mon Sep 17 00:00:00 2001 From: Alon Cohen-Magen Date: Sat, 20 Nov 2021 00:58:22 +0200 Subject: [PATCH 1/2] Allow to dynamic link to sdl2 --- Cargo.lock | 4 ++-- gb/Cargo.toml | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5351c143..0660ac1c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -150,9 +150,9 @@ dependencies = [ [[package]] name = "cmake" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb6210b637171dfba4cda12e579ac6dc73f5165ad56133e5d72ef3131f320855" +checksum = "b7b858541263efe664aead4a5209a4ae5c5d2811167d4ed4ee0944503f8d2089" dependencies = [ "cc", ] diff --git a/gb/Cargo.toml b/gb/Cargo.toml index 05b7cb6d..ff059a64 100644 --- a/gb/Cargo.toml +++ b/gb/Cargo.toml @@ -14,11 +14,13 @@ lib_gb = {path = "../lib_gb/"} log = "0.4" fern = "0.6.0" chrono = "0.4" -sdl2 = {version = "0.34", features = ["bundled","static-link"]} +sdl2 = {package = "sdl2", version = "0.34"} wav = "1.0" crossbeam-channel = "0.5" cfg-if = "1.0" [features] +default = ["static-sdl"] sdl-resample = [] -push-audio = [] \ No newline at end of file +push-audio = [] +static-sdl = ["sdl2/bundled", "sdl2/static-link"] \ No newline at end of file From acca065ddbc8cc9069f4eed526ca323e49e36282 Mon Sep 17 00:00:00 2001 From: alloncm Date: Sun, 21 Nov 2021 01:38:44 +0200 Subject: [PATCH 2/2] Remove redundant code in the Cargo.toml file --- gb/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gb/Cargo.toml b/gb/Cargo.toml index ff059a64..78cbc4d5 100644 --- a/gb/Cargo.toml +++ b/gb/Cargo.toml @@ -14,7 +14,7 @@ lib_gb = {path = "../lib_gb/"} log = "0.4" fern = "0.6.0" chrono = "0.4" -sdl2 = {package = "sdl2", version = "0.34"} +sdl2 = "0.34" wav = "1.0" crossbeam-channel = "0.5" cfg-if = "1.0"