From 45d8f39e8593faaa4b75a95fd49dc4492738bca9 Mon Sep 17 00:00:00 2001 From: Mischa Spiegelmock Date: Sun, 22 Dec 2024 16:15:03 -0800 Subject: [PATCH 1/6] chore: Release projectm version 3.1.1 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index e13645c..361c62f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "projectm" -version = "3.1.0" +version = "3.1.1" edition = "2021" rust-version = "1.65" authors = ["AnomieVision ", "Mischa Spiegelmock "] From 43de579b1e66523d0c61069488ae33366d9bb6c4 Mon Sep 17 00:00:00 2001 From: Mischa Spiegelmock Date: Sun, 22 Dec 2024 22:18:11 -0800 Subject: [PATCH 2/6] fmt --- projectm-sys/build.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projectm-sys/build.rs b/projectm-sys/build.rs index cdc7f5f..1513a33 100644 --- a/projectm-sys/build.rs +++ b/projectm-sys/build.rs @@ -18,7 +18,7 @@ fn build_shared_libs_flag() -> &'static str { if cfg!(feature = "static") { "OFF" // Disable shared libs to enable static linking } else { - "ON" // Enable shared libs + "ON" // Enable shared libs } } @@ -184,4 +184,4 @@ fn main() { // Generate Rust bindings using bindgen bindgen(); -} \ No newline at end of file +} From 0b069a35b87e2c47f10c99072a659c77de8ba5e0 Mon Sep 17 00:00:00 2001 From: Mischa Spiegelmock Date: Tue, 24 Dec 2024 20:28:55 -0800 Subject: [PATCH 3/6] Platform link flags --- Cargo.toml | 2 +- projectm-sys/.cargo/config.toml | 5 +---- projectm-sys/build.rs | 23 +++++++++++++++++++++++ 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 361c62f..7a49b7f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ readme = "README.md" [dependencies] libc = "0.2" -#projectm-sys = { path = "projectm-sys", version = "1.0.9-rc.1", features = ["playlist"] } +#projectm-sys = { path = "projectm-sys", version = "1", features = ["playlist", "static"] } projectm-sys = { version = "1.2.1" } rand = "0.8" diff --git a/projectm-sys/.cargo/config.toml b/projectm-sys/.cargo/config.toml index e2c3513..8a2f47d 100644 --- a/projectm-sys/.cargo/config.toml +++ b/projectm-sys/.cargo/config.toml @@ -1,5 +1,2 @@ [target.wasm32-unknown-emscripten] -linker = ".cargo/linker-emscripten" - -[target.x86_64-unknown-linux-gnu] -rustflags = "-C link-arg=-lGL -C link-arg=-lstdc++ -C link-arg=-lgomp" +linker = ".cargo/linker-emscripten" \ No newline at end of file diff --git a/projectm-sys/build.rs b/projectm-sys/build.rs index 1513a33..9786c2a 100644 --- a/projectm-sys/build.rs +++ b/projectm-sys/build.rs @@ -182,6 +182,29 @@ fn main() { } } + // Platform-specific link flags for C++ and OpenGL + #[cfg(target_os = "macos")] + { + println!("cargo:rustc-link-lib=c++"); + println!("cargo:rustc-link-lib=framework=OpenGL"); + } + #[cfg(target_os = "linux")] + { + // On Linux, link stdc++ and GL. + println!("cargo:rustc-link-lib=stdc++"); + println!("cargo:rustc-link-lib=GL"); + println!("cargo:rustc-link-lib=gomp"); + } + #[cfg(target_os = "windows")] + { + println!("cargo:rustc-link-lib=opengl32"); + } + #[cfg(target_os = "emscripten")] + { + // Emscripten typically handles GL calls differently, so you might skip or rely on the + // emscripten compiler for linking. + } + // Generate Rust bindings using bindgen bindgen(); } From 882f0e41e1446712f03036dcc616285b994a4932 Mon Sep 17 00:00:00 2001 From: Mischa Spiegelmock Date: Tue, 24 Dec 2024 20:29:21 -0800 Subject: [PATCH 4/6] chore: Release projectm-sys version 1.2.2 --- projectm-sys/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projectm-sys/Cargo.toml b/projectm-sys/Cargo.toml index 254fc09..1235784 100644 --- a/projectm-sys/Cargo.toml +++ b/projectm-sys/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "projectm-sys" -version = "1.2.1" +version = "1.2.2" edition = "2021" rust-version = "1.65" authors = ["AnomieVision ", "Mischa Spiegelmock "] From 63a61e5f614893d4caabada9ab6cafadbf2f36a4 Mon Sep 17 00:00:00 2001 From: Mischa Spiegelmock Date: Tue, 24 Dec 2024 20:31:56 -0800 Subject: [PATCH 5/6] sys --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 7a49b7f..2fe448b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,7 +14,7 @@ readme = "README.md" [dependencies] libc = "0.2" #projectm-sys = { path = "projectm-sys", version = "1", features = ["playlist", "static"] } -projectm-sys = { version = "1.2.1" } +projectm-sys = { version = "1" } rand = "0.8" [features] From 080ac236b36a07f34285711d96b2d2b00a47f697 Mon Sep 17 00:00:00 2001 From: Mischa Spiegelmock Date: Tue, 24 Dec 2024 20:32:05 -0800 Subject: [PATCH 6/6] chore: Release projectm version 3.1.2 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 2fe448b..718812a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "projectm" -version = "3.1.1" +version = "3.1.2" edition = "2021" rust-version = "1.65" authors = ["AnomieVision ", "Mischa Spiegelmock "]