Skip to content

Commit 5c8ad6d

Browse files
Merge pull request #9 from rust-wii/libc
Use official libc implementation
2 parents 11c1e1f + bbc173d commit 5c8ad6d

File tree

6 files changed

+1267
-1164
lines changed

6 files changed

+1267
-1164
lines changed

Cargo.lock

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

ogc-sys/Cargo.toml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
[package]
22
name = "ogc-sys"
3-
version = "0.4.0"
3+
version = "0.4.1"
44
authors = ["rust-wii"]
55
edition = "2018"
66

7-
[dependencies.libc]
8-
git = "https://github.com/rust-wii/libc.git"
9-
branch = "wii"
10-
default-features = false
7+
[dependencies]
8+
libc = "0.2"

ogc-sys/bindgen.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ bindgen wrapper.h \
1919
--no-layout-tests \
2020
--ctypes-prefix "::libc" \
2121
--no-prepend-enum-name \
22+
--disable-untagged-union \
2223
--generate "functions,types,vars" \
2324
--blacklist-type "u(8|16|32|64|128)" \
2425
--blacklist-type "i(8|16|32|64|128)" \

ogc-sys/build.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
fn main() {
22
let dkp_path = std::env::var("DEVKITPRO").unwrap();
33

4+
println!(
5+
"cargo:rustc-link-search=native={}/devkitPPC/powerpc-eabi/lib",
6+
dkp_path
7+
);
48
println!("cargo:rustc-link-search=native={}/libogc/lib/wii", dkp_path);
9+
println!("cargo:rustc-link-lib=static=c");
10+
println!("cargo:rustc-link-lib=static=sysbase");
511
println!("cargo:rustc-link-lib=static=ogc");
612
}

ogc-sys/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#![allow(non_upper_case_globals)]
22
#![allow(non_camel_case_types)]
33
#![allow(non_snake_case)]
4-
#![feature(const_fn)]
54
#![no_std]
65

76
include!("ogc.rs");

0 commit comments

Comments
 (0)