Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-08 09:26:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

more fixes for android builds

Browse Source
This commit is contained in:
dignifiedquire
2019-04-28 21:41:08 +03:00
parent 2acaf54f69
commit 6e931d3e7b
2 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
build.rs
View File

@@ -34,7 +34,8 @@ fn main() {
add_search_path("./include/include"); add_search_path("./include/include");
add_search_path("./include/libs"); add_search_path("./include/libs");
if std::env::var("TARGET").unwrap().contains("-apple") { let target = std::env::var("TARGET").unwrap();
if target.contains("-apple") || target.contains("-darwin") {
link_static("etpan"); link_static("etpan");
link_dylib("iconv"); link_dylib("iconv");
@@ -45,16 +46,26 @@ fn main() {
link_dylib("sasl2"); link_dylib("sasl2");
link_dylib("z"); link_dylib("z");
link_dylib("pthread"); link_dylib("pthread");
link_dylib("tools"); } else if target.contains("-android") {
} else if std::env::var("TARGET").unwrap().contains("-android") {
add_search_path("./include/libs/arm64-v8a");
add_search_path("./include/cyrus-sasl-android-4/libs/arm64-v8a");
add_search_path("./include/cyrus-sasl-android-4/include"); add_search_path("./include/cyrus-sasl-android-4/include");
add_search_path("./include/openssl-android-3/libs/arm64-v8a");
add_search_path("./include/openssl-android-3/include"); add_search_path("./include/openssl-android-3/include");
add_search_path("./include/iconv-android-1/libs/arm64-v8a");
add_search_path("./include/iconv-android-1/include"); add_search_path("./include/iconv-android-1/include");
let arch = if target.contains("x86") {
"x86"
} else if target.contains("64") {
"arm64-v8a"
} else if target.contains("v7") {
"armeabi-v7a"
} else {
"armeabi"
};
add_search_path(&format!("./include/libs/{}", arch));
add_search_path(&format!("./include/iconv-android-1/libs/{}", arch));
add_search_path(&format!("./include/openssl-android-3/libs/{}", arch));
add_search_path(&format!("./include/cyrus-sasl-android-4/libs/{}", arch));
// dependencies for libetpan // dependencies for libetpan
link_static("crypto"); link_static("crypto");
link_static("sasl2"); link_static("sasl2");
@@ -64,16 +75,15 @@ fn main() {
// libetpan iteself // libetpan iteself
link_static("etpan"); link_static("etpan");
} else if target.contains("-linux") {
// local tools
link_static("tools");
} else if std::env::var("TARGET").unwrap().contains("-linux") {
link_dylib("etpan"); link_dylib("etpan");
link_dylib("sasl2"); link_dylib("sasl2");
link_dylib("z"); link_dylib("z");
link_dylib("pthread"); link_dylib("pthread");
link_dylib("tools");
} else { } else {
panic!("unsupported target"); panic!("unsupported target");
} }
// local tools
link_static("tools");
} }

8
deltachat-ffi/src/lib.rs
View File

@@ -973,19 +973,17 @@ pub unsafe extern "C" fn dc_msg_get_state(msg: *mut dc_msg::dc_msg_t) -> libc::c
} }
#[no_mangle] #[no_mangle]
pub unsafe extern "C" fn dc_msg_get_timestamp(msg: *mut dc_msg::dc_msg_t) -> libc::int64_t { pub unsafe extern "C" fn dc_msg_get_timestamp(msg: *mut dc_msg::dc_msg_t) -> libc::time_t {
dc_msg::dc_msg_get_timestamp(msg) dc_msg::dc_msg_get_timestamp(msg)
} }
#[no_mangle] #[no_mangle]
pub unsafe extern "C" fn dc_msg_get_received_timestamp( pub unsafe extern "C" fn dc_msg_get_received_timestamp(msg: *mut dc_msg::dc_msg_t) -> libc::time_t {
msg: *mut dc_msg::dc_msg_t,
) -> libc::int64_t {
dc_msg::dc_msg_get_received_timestamp(msg) dc_msg::dc_msg_get_received_timestamp(msg)
} }
#[no_mangle] #[no_mangle]
pub unsafe extern "C" fn dc_msg_get_sort_timestamp(msg: *mut dc_msg::dc_msg_t) -> libc::int64_t { pub unsafe extern "C" fn dc_msg_get_sort_timestamp(msg: *mut dc_msg::dc_msg_t) -> libc::time_t {
dc_msg::dc_msg_get_sort_timestamp(msg) dc_msg::dc_msg_get_sort_timestamp(msg)
} }