Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support weak functions. #172

Merged
merged 12 commits into from
Apr 10, 2022
Merged

Support weak functions. #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
72fa82c
Support weak functions.
wmedrano Apr 9, 2022
33e242b
clean deps.
wmedrano Apr 9, 2022
9e239e7
fix features in ci
wmedrano Apr 9, 2022
e36b0b6
mark more functions weak.
wmedrano Apr 9, 2022
66cc548
Add more weak functions.
wmedrano Apr 9, 2022
56c1959
fix
wmedrano Apr 9, 2022
32ef765
fix
wmedrano Apr 9, 2022
e3bb096
Use codegen to generate file.
wmedrano Apr 9, 2022
70378d4
fix
wmedrano Apr 9, 2022
ab76631
Dont check in codegen file.
wmedrano Apr 10, 2022
2c736fd
cleanup
wmedrano Apr 10, 2022
04808f9
cleanup
wmedrano Apr 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions .github/workflows/rust.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,11 @@ jobs:

- name: Lint (No Features)
run: cargo clippy --all-targets --no-default-features -- -D clippy::all
- name: Lint (All Features)
run: cargo clippy --all-targets --no-default-features --features dlopen,metadata -- -D clippy::all
- name: Lint (dlopen)
run: cargo clippy --all-targets --no-default-features --features dlopen -- -D clippy::all
- name: Lint (metadata)
run: cargo clippy --all-targets --no-default-features --features metadata -- -D clippy::all

- name: Build (No Features)
run: cargo build --verbose --no-default-features
- name: Build (All Features)
run: cargo build --verbose --no-default-features --features dlopen,metadata
- name: Build (dlopen)
run: cargo build --verbose --no-default-features --features dlopen
- name: Build (metadata)
run: cargo build --verbose --no-default-features --features metadata

Expand Down
8 changes: 3 additions & 5 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,11 @@ license = "MIT"
name = "jack"
readme = "README.md"
repository = "https://github.com/RustAudio/rust-jack"
version = "0.9.2"
version = "0.10.0"

[dependencies]
bitflags = "1"
dlib = "0.5"
jack-sys = {path = "./jack-sys", version = "0.3.4"}
jack-sys = {version = "0.4", path = "./jack-sys"}
lazy_static = "1.4"
libc = "0.2"
log = "0.4"
Expand All @@ -22,6 +21,5 @@ log = "0.4"
crossbeam-channel = "0.5"

[features]
default = ["dlopen"]
dlopen = ["jack-sys/dlopen"]
default = []
metadata = []
10 changes: 2 additions & 8 deletions jack-sys/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,13 @@ license = "MIT OR Apache-2.0"
links = "jack"
name = "jack-sys"
repository = "https://github.com/RustAudio/rust-jack/tree/main/jack-sys"
version = "0.3.4"
version = "0.4.0"

[dependencies]
dlib = "0.5"
dlopen = {version = "0.1", optional = true}
lazy_static = "1.4"
libc = "0.2"
libloading = "0.7"

[build-dependencies]
bitflags = "1"
pkg-config = "0.3"

[features]
# If dlopen is set, then dlib must be used to call jack-sys functions. See
# https://github.com/vberger/dlib.
default = []
Loading