Skip to content

Commit 844457a

Browse files
committed
fix lifetimes
1 parent fa50fd2 commit 844457a

File tree

3 files changed

+16
-9
lines changed

3 files changed

+16
-9
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ readme = "README.md"
1414
[dependencies]
1515
libc = "0.2"
1616
#projectm-sys = { path = "projectm-sys", version = "1.0.9-rc.1", features = ["playlist"] }
17-
projectm-sys = { version = "1.0.10" }
17+
projectm-sys = { version = "1.1.0-alpha.1" }
1818
rand = "0.8"
1919

2020
[features]

projectm-sys/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "projectm-sys"
3-
version = "1.0.10"
3+
version = "1.1.0-alpha.1"
44
edition = "2021"
55
rust-version = "1.65"
66
authors = ["AnomieVision <[email protected]>", "Mischa Spiegelmock <[email protected]>"]

projectm-sys/build.rs

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ fn enable_playlist() -> &'static str {
1212
"OFF"
1313
}
1414
}
15+
1516
// Are we linking to shared or static libraries?
1617
fn build_shared_libs_flag() -> &'static str {
1718
if cfg!(feature = "static") {
@@ -71,22 +72,28 @@ fn main() {
7172

7273
// Define the installation path for vcpkg
7374
let vcpkg_installed = vcpkg_root.join("installed").join("x64-windows-static-md");
75+
let vcpkg_installed_str = vcpkg_installed.to_str().unwrap();
76+
77+
// Define projectM_Eval_DIR and store in a variable
78+
let projectm_eval_dir = projectm_path.join("vendor").join("projectm-eval");
79+
let projectm_eval_dir_str = projectm_eval_dir.to_str().unwrap();
80+
81+
// Convert vcpkg_toolchain to string
82+
let vcpkg_toolchain_str = vcpkg_toolchain.to_str().unwrap();
7483

7584
// Configure and build libprojectM using CMake for Windows
76-
let mut cmake_config = cmake::Config::new(&projectm_path)
85+
let mut cmake_config = cmake::Config::new(&projectm_path);
86+
cmake_config
7787
.generator("Visual Studio 17 2022")
78-
.define("CMAKE_TOOLCHAIN_FILE", &vcpkg_toolchain)
88+
.define("CMAKE_TOOLCHAIN_FILE", vcpkg_toolchain_str)
7989
.define("VCPKG_TARGET_TRIPLET", "x64-windows-static-md")
8090
.define(
8191
"CMAKE_MSVC_RUNTIME_LIBRARY",
8292
"MultiThreaded$<$<CONFIG:Debug>:Debug>DLL",
8393
)
8494
.define("ENABLE_PLAYLIST", enable_playlist_flag)
85-
.define(
86-
"projectM_Eval_DIR",
87-
&projectm_path.join("vendor").join("projectm-eval"),
88-
)
89-
.define("CMAKE_PREFIX_PATH", &vcpkg_installed)
95+
.define("projectM_Eval_DIR", projectm_eval_dir_str)
96+
.define("CMAKE_PREFIX_PATH", vcpkg_installed_str)
9097
.define("CMAKE_VERBOSE_MAKEFILE", "ON")
9198
.define("BUILD_TESTING", "OFF")
9299
.define("BUILD_EXAMPLES", "OFF")

0 commit comments

Comments
 (0)