Skip to content

MacOS & ARM64 support #15

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −2
Open

MacOS & ARM64 support #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion crates/byondapi-rs/src/static_global.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ fn init_lib() -> byondapi_sys::ByondApi {
.expect("Failed to initialize library.")
}

#[cfg(target_os = "linux")]
#[cfg(any(target_os = "linux", target_os = "macos"))]
fn init_lib() -> byondapi_sys::ByondApi {
for func in inventory::iter::<super::InitFunc> {
func.0();
Expand Down
9 changes: 8 additions & 1 deletion crates/byondapi-sys/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,17 @@ fn copy_wrapper(lib_dir: &Path) -> PathBuf {
fn generate_all() {
let out_dir = PathBuf::from(std::env::var("OUT_DIR").expect("OUT_DIR not defined"));

let target_triple = std::env::var("TARGET").unwrap_or("".into());
let is_64_bit = target_triple.starts_with("aarch64");

get_headers()
.into_iter()
.for_each(|(path, (major, minor))| {
let target = out_dir.join("byondapi.h");
std::fs::copy(path, target).expect("Failed to copy to out_dir");
let wrapper = copy_wrapper(&out_dir);

let builder = bindgen::Builder::default()
let mut builder = bindgen::Builder::default()
.header(wrapper.to_string_lossy())
.dynamic_library_name("ByondApi")
.dynamic_link_require_all(true)
Expand All @@ -60,6 +63,10 @@ fn generate_all() {
.parse_callbacks(Box::new(bindgen::CargoCallbacks::new()))
.parse_callbacks(Box::new(DoxygenCallbacks));

if is_64_bit {
builder = builder.clang_arg("-DDM_64BIT")
}

builder
.generate()
.expect("Unable to generate bindings")
Expand Down
Loading