diff --git a/CMakeLists.txt b/CMakeLists.txt index a7fe0cb..dbc77e3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -104,6 +104,8 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") list(APPEND CMAKE_PREFIX_PATH /opt/homebrew/opt/ncurses) list(APPEND OPENSSL_ROOT_DIR /usr/local/opt/openssl) list(APPEND OPENSSL_ROOT_DIR /opt/homebrew/opt/openssl) +elseif (${CMAKE_SYSTEM_NAME} MATCHES "Android") + add_compile_definitions(_XOPEN_SOURCE_EXTENDED) endif() # Headers @@ -220,6 +222,9 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") target_link_libraries(nmail PUBLIC "${CFNETWORK_LIBRARY}") endif() endif() +elseif (${CMAKE_SYSTEM_NAME} MATCHES "Android") + find_library(WORDEXP_LIBRARY android-wordexp) + target_link_libraries(nmail PUBLIC ${WORDEXP_LIBRARY}) endif() # Includes diff --git a/ext/libetpan/CMakeLists.txt b/ext/libetpan/CMakeLists.txt index 5d4c743..e693d6a 100644 --- a/ext/libetpan/CMakeLists.txt +++ b/ext/libetpan/CMakeLists.txt @@ -367,7 +367,7 @@ target_compile_options(${LIBNAME} PRIVATE -w -Wall $<$:-DDEBUG>) # Linking target_link_libraries(${LIBNAME} PUBLIC ${CURL_LIBRARIES} ${EXPAT_LIBRARIES} ${ZLIB_LIBRARIES} ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY} ${CYRUS_SASL_LIBRARY}) -# Linking (macOS) +# Linking platform specifics if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") find_library(ICONV_LIBRARY iconv REQUIRED) find_library(COREFOUNDATION_LIBRARY CoreFoundation REQUIRED) @@ -378,6 +378,9 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") find_library(CFNETWORK_LIBRARY CFNetwork REQUIRED) target_link_libraries(${LIBNAME} PUBLIC "${CFNETWORK_LIBRARY}") endif() +elseif (${CMAKE_SYSTEM_NAME} MATCHES "Android") + find_library(ICONV_LIBRARY iconv REQUIRED) + target_link_libraries(${LIBNAME} PUBLIC "${ICONV_LIBRARY}") endif() # Install diff --git a/src/nmail.1 b/src/nmail.1 index 03ea3f8..0b4041c 100644 --- a/src/nmail.1 +++ b/src/nmail.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man. -.TH NMAIL "1" "August 2024" "nmail 5.1.13" "User Commands" +.TH NMAIL "1" "August 2024" "nmail 5.1.14" "User Commands" .SH NAME nmail \- ncurses mail .SH SYNOPSIS diff --git a/src/version.cpp b/src/version.cpp index e0b5483..82e24e0 100644 --- a/src/version.cpp +++ b/src/version.cpp @@ -7,7 +7,7 @@ #include "version.h" -#define NMAIL_VERSION "5.1.13" +#define NMAIL_VERSION "5.1.14" std::string Version::GetBuildOs() {