Skip to content

Commit 2a823a0

Browse files
committed
merge
2 parents f6b25d0 + 31731ef commit 2a823a0

File tree

6 files changed

+181
-147
lines changed

6 files changed

+181
-147
lines changed

.cargo/config.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[env]
22
# use pipewire for audio
3-
SDL_AUDIODRIVER = "pipewire"
3+
#SDL_AUDIODRIVER = "pipewire"

Cargo.lock

Lines changed: 26 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ rust-version = "1.68.2"
66

77
[dependencies]
88
libc = "*"
9-
#projectm = { path = "../projectm-rs", version = "2.0.2", features = ["playlist"] }
10-
projectm = { version = "2.0.2", features = ['playlist'] }
11-
sdl3 = { version = "0.10.8", features = ["build-from-source"] }
9+
#projectm = { path = "../projectm-rs", version = "3", features = ["playlist"] }
10+
projectm = { version = "3", features = ['playlist'] }
11+
sdl3 = { version = "0.11", features = ["build-from-source-static"] }
1212
#sdl3 = { path = "../../sdl3-rs", version = "0", features = ["build-from-source"] }
1313
rand = "0.8.5"
1414
include_dir = "0.7"

0 commit comments

Comments
 (0)