Support CMAKE_OSX_SYSROOT

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "audiopus_sys"
-version = "0.2.1"
+version = "0.2.2"
 license = "ISC"
 repository = "https://github.com/lakelezz/audiopus_sys.git"
 authors = ["Lakelezz <[email protected]>"]

build.rs

@@ -47,7 +47,24 @@ fn build_opus(is_static: bool) {
     );
 
     println!("cargo:info=Building Opus via CMake.");
-    let opus_build_dir = cmake::build(opus_path);
+    let mut cmake_config = cmake::Config::new(opus_path);
+
+    if let Ok(android_target) = env::var("CARGO_NDK_ANDROID_TARGET") {
+        cmake_config.define("ANDROID_ABI", android_target);
+
+        if let Ok(toolchain_file) = env::var("CARGO_NDK_CMAKE_TOOLCHAIN_PATH") {
+            cmake_config.define("CMAKE_TOOLCHAIN_FILE", toolchain_file);
+        }
+    }
+
+    if let Ok(toolchain_file) = env::var("CMAKE_TOOLCHAIN_FILE") {
+        cmake_config.define("CMAKE_TOOLCHAIN_FILE", toolchain_file);
+    }
+
+    if let Ok(value) = env::var("CMAKE_OSX_SYSROOT") {
+        cmake_config.configure_arg(format!("-DCMAKE_OSX_SYSROOT={value}"));
+    }
+    let opus_build_dir = cmake_config.build();
     link_opus(is_static, opus_build_dir.display())
 }
 

src/lib.rs

@@ -5,79 +5,79 @@
 #![allow(non_snake_case)]
 
 
-pub const OPUS_OK: u32 = 0;
+pub const OPUS_OK: i32 = 0;
 pub const OPUS_BAD_ARG: i32 = -1;
 pub const OPUS_BUFFER_TOO_SMALL: i32 = -2;
 pub const OPUS_INTERNAL_ERROR: i32 = -3;
 pub const OPUS_INVALID_PACKET: i32 = -4;
 pub const OPUS_UNIMPLEMENTED: i32 = -5;
 pub const OPUS_INVALID_STATE: i32 = -6;
 pub const OPUS_ALLOC_FAIL: i32 = -7;
-pub const OPUS_SET_APPLICATION_REQUEST: u32 = 4000;
-pub const OPUS_GET_APPLICATION_REQUEST: u32 = 4001;
-pub const OPUS_SET_BITRATE_REQUEST: u32 = 4002;
-pub const OPUS_GET_BITRATE_REQUEST: u32 = 4003;
-pub const OPUS_SET_MAX_BANDWIDTH_REQUEST: u32 = 4004;
-pub const OPUS_GET_MAX_BANDWIDTH_REQUEST: u32 = 4005;
-pub const OPUS_SET_VBR_REQUEST: u32 = 4006;
-pub const OPUS_GET_VBR_REQUEST: u32 = 4007;
-pub const OPUS_SET_BANDWIDTH_REQUEST: u32 = 4008;
-pub const OPUS_GET_BANDWIDTH_REQUEST: u32 = 4009;
-pub const OPUS_SET_COMPLEXITY_REQUEST: u32 = 4010;
-pub const OPUS_GET_COMPLEXITY_REQUEST: u32 = 4011;
-pub const OPUS_SET_INBAND_FEC_REQUEST: u32 = 4012;
-pub const OPUS_GET_INBAND_FEC_REQUEST: u32 = 4013;
-pub const OPUS_SET_PACKET_LOSS_PERC_REQUEST: u32 = 4014;
-pub const OPUS_GET_PACKET_LOSS_PERC_REQUEST: u32 = 4015;
-pub const OPUS_SET_DTX_REQUEST: u32 = 4016;
-pub const OPUS_GET_DTX_REQUEST: u32 = 4017;
-pub const OPUS_SET_VBR_CONSTRAINT_REQUEST: u32 = 4020;
-pub const OPUS_GET_VBR_CONSTRAINT_REQUEST: u32 = 4021;
-pub const OPUS_SET_FORCE_CHANNELS_REQUEST: u32 = 4022;
-pub const OPUS_GET_FORCE_CHANNELS_REQUEST: u32 = 4023;
-pub const OPUS_SET_SIGNAL_REQUEST: u32 = 4024;
-pub const OPUS_GET_SIGNAL_REQUEST: u32 = 4025;
-pub const OPUS_GET_LOOKAHEAD_REQUEST: u32 = 4027;
-pub const OPUS_GET_SAMPLE_RATE_REQUEST: u32 = 4029;
-pub const OPUS_GET_FINAL_RANGE_REQUEST: u32 = 4031;
-pub const OPUS_GET_PITCH_REQUEST: u32 = 4033;
-pub const OPUS_SET_GAIN_REQUEST: u32 = 4034;
-pub const OPUS_GET_GAIN_REQUEST: u32 = 4045;
-pub const OPUS_SET_LSB_DEPTH_REQUEST: u32 = 4036;
-pub const OPUS_GET_LSB_DEPTH_REQUEST: u32 = 4037;
-pub const OPUS_GET_LAST_PACKET_DURATION_REQUEST: u32 = 4039;
-pub const OPUS_SET_EXPERT_FRAME_DURATION_REQUEST: u32 = 4040;
-pub const OPUS_GET_EXPERT_FRAME_DURATION_REQUEST: u32 = 4041;
-pub const OPUS_SET_PREDICTION_DISABLED_REQUEST: u32 = 4042;
-pub const OPUS_GET_PREDICTION_DISABLED_REQUEST: u32 = 4043;
-pub const OPUS_SET_PHASE_INVERSION_DISABLED_REQUEST: u32 = 4046;
-pub const OPUS_GET_PHASE_INVERSION_DISABLED_REQUEST: u32 = 4047;
-pub const OPUS_GET_IN_DTX_REQUEST: u32 = 4049;
+pub const OPUS_SET_APPLICATION_REQUEST: i32 = 4000;
+pub const OPUS_GET_APPLICATION_REQUEST: i32 = 4001;
+pub const OPUS_SET_BITRATE_REQUEST: i32 = 4002;
+pub const OPUS_GET_BITRATE_REQUEST: i32 = 4003;
+pub const OPUS_SET_MAX_BANDWIDTH_REQUEST: i32 = 4004;
+pub const OPUS_GET_MAX_BANDWIDTH_REQUEST: i32 = 4005;
+pub const OPUS_SET_VBR_REQUEST: i32 = 4006;
+pub const OPUS_GET_VBR_REQUEST: i32 = 4007;
+pub const OPUS_SET_BANDWIDTH_REQUEST: i32 = 4008;
+pub const OPUS_GET_BANDWIDTH_REQUEST: i32 = 4009;
+pub const OPUS_SET_COMPLEXITY_REQUEST: i32 = 4010;
+pub const OPUS_GET_COMPLEXITY_REQUEST: i32 = 4011;
+pub const OPUS_SET_INBAND_FEC_REQUEST: i32 = 4012;
+pub const OPUS_GET_INBAND_FEC_REQUEST: i32 = 4013;
+pub const OPUS_SET_PACKET_LOSS_PERC_REQUEST: i32 = 4014;
+pub const OPUS_GET_PACKET_LOSS_PERC_REQUEST: i32 = 4015;
+pub const OPUS_SET_DTX_REQUEST: i32 = 4016;
+pub const OPUS_GET_DTX_REQUEST: i32 = 4017;
+pub const OPUS_SET_VBR_CONSTRAINT_REQUEST: i32 = 4020;
+pub const OPUS_GET_VBR_CONSTRAINT_REQUEST: i32 = 4021;
+pub const OPUS_SET_FORCE_CHANNELS_REQUEST: i32 = 4022;
+pub const OPUS_GET_FORCE_CHANNELS_REQUEST: i32 = 4023;
+pub const OPUS_SET_SIGNAL_REQUEST: i32 = 4024;
+pub const OPUS_GET_SIGNAL_REQUEST: i32 = 4025;
+pub const OPUS_GET_LOOKAHEAD_REQUEST: i32 = 4027;
+pub const OPUS_GET_SAMPLE_RATE_REQUEST: i32 = 4029;
+pub const OPUS_GET_FINAL_RANGE_REQUEST: i32 = 4031;
+pub const OPUS_GET_PITCH_REQUEST: i32 = 4033;
+pub const OPUS_SET_GAIN_REQUEST: i32 = 4034;
+pub const OPUS_GET_GAIN_REQUEST: i32 = 4045;
+pub const OPUS_SET_LSB_DEPTH_REQUEST: i32 = 4036;
+pub const OPUS_GET_LSB_DEPTH_REQUEST: i32 = 4037;
+pub const OPUS_GET_LAST_PACKET_DURATION_REQUEST: i32 = 4039;
+pub const OPUS_SET_EXPERT_FRAME_DURATION_REQUEST: i32 = 4040;
+pub const OPUS_GET_EXPERT_FRAME_DURATION_REQUEST: i32 = 4041;
+pub const OPUS_SET_PREDICTION_DISABLED_REQUEST: i32 = 4042;
+pub const OPUS_GET_PREDICTION_DISABLED_REQUEST: i32 = 4043;
+pub const OPUS_SET_PHASE_INVERSION_DISABLED_REQUEST: i32 = 4046;
+pub const OPUS_GET_PHASE_INVERSION_DISABLED_REQUEST: i32 = 4047;
+pub const OPUS_GET_IN_DTX_REQUEST: i32 = 4049;
 pub const OPUS_AUTO: i32 = -1000;
 pub const OPUS_BITRATE_MAX: i32 = -1;
-pub const OPUS_APPLICATION_VOIP: u32 = 2048;
-pub const OPUS_APPLICATION_AUDIO: u32 = 2049;
-pub const OPUS_APPLICATION_RESTRICTED_LOWDELAY: u32 = 2051;
-pub const OPUS_SIGNAL_VOICE: u32 = 3001;
-pub const OPUS_SIGNAL_MUSIC: u32 = 3002;
-pub const OPUS_BANDWIDTH_NARROWBAND: u32 = 1101;
-pub const OPUS_BANDWIDTH_MEDIUMBAND: u32 = 1102;
-pub const OPUS_BANDWIDTH_WIDEBAND: u32 = 1103;
-pub const OPUS_BANDWIDTH_SUPERWIDEBAND: u32 = 1104;
-pub const OPUS_BANDWIDTH_FULLBAND: u32 = 1105;
-pub const OPUS_FRAMESIZE_ARG: u32 = 5000;
-pub const OPUS_FRAMESIZE_2_5_MS: u32 = 5001;
-pub const OPUS_FRAMESIZE_5_MS: u32 = 5002;
-pub const OPUS_FRAMESIZE_10_MS: u32 = 5003;
-pub const OPUS_FRAMESIZE_20_MS: u32 = 5004;
-pub const OPUS_FRAMESIZE_40_MS: u32 = 5005;
-pub const OPUS_FRAMESIZE_60_MS: u32 = 5006;
-pub const OPUS_FRAMESIZE_80_MS: u32 = 5007;
-pub const OPUS_FRAMESIZE_100_MS: u32 = 5008;
-pub const OPUS_FRAMESIZE_120_MS: u32 = 5009;
-pub const OPUS_RESET_STATE: u32 = 4028;
-pub const OPUS_MULTISTREAM_GET_ENCODER_STATE_REQUEST: u32 = 5120;
-pub const OPUS_MULTISTREAM_GET_DECODER_STATE_REQUEST: u32 = 5122;
+pub const OPUS_APPLICATION_VOIP: i32 = 2048;
+pub const OPUS_APPLICATION_AUDIO: i32 = 2049;
+pub const OPUS_APPLICATION_RESTRICTED_LOWDELAY: i32 = 2051;
+pub const OPUS_SIGNAL_VOICE: i32 = 3001;
+pub const OPUS_SIGNAL_MUSIC: i32 = 3002;
+pub const OPUS_BANDWIDTH_NARROWBAND: i32 = 1101;
+pub const OPUS_BANDWIDTH_MEDIUMBAND: i32 = 1102;
+pub const OPUS_BANDWIDTH_WIDEBAND: i32 = 1103;
+pub const OPUS_BANDWIDTH_SUPERWIDEBAND: i32 = 1104;
+pub const OPUS_BANDWIDTH_FULLBAND: i32 = 1105;
+pub const OPUS_FRAMESIZE_ARG: i32 = 5000;
+pub const OPUS_FRAMESIZE_2_5_MS: i32 = 5001;
+pub const OPUS_FRAMESIZE_5_MS: i32 = 5002;
+pub const OPUS_FRAMESIZE_10_MS: i32 = 5003;
+pub const OPUS_FRAMESIZE_20_MS: i32 = 5004;
+pub const OPUS_FRAMESIZE_40_MS: i32 = 5005;
+pub const OPUS_FRAMESIZE_60_MS: i32 = 5006;
+pub const OPUS_FRAMESIZE_80_MS: i32 = 5007;
+pub const OPUS_FRAMESIZE_100_MS: i32 = 5008;
+pub const OPUS_FRAMESIZE_120_MS: i32 = 5009;
+pub const OPUS_RESET_STATE: i32 = 4028;
+pub const OPUS_MULTISTREAM_GET_ENCODER_STATE_REQUEST: i32 = 5120;
+pub const OPUS_MULTISTREAM_GET_DECODER_STATE_REQUEST: i32 = 5122;
 pub type opus_int32 = ::std::os::raw::c_int;
 pub type opus_uint32 = ::std::os::raw::c_uint;
 pub type opus_int16 = ::std::os::raw::c_short;