Skip to content

Commit

Permalink
fix android termux build
Browse files Browse the repository at this point in the history
  • Loading branch information
d99kris committed Aug 25, 2024
1 parent c284ba2 commit fa93600
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 3 deletions.
5 changes: 5 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion ext/libetpan/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ target_compile_options(${LIBNAME} PRIVATE -w -Wall $<$<CONFIG:Debug>:-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)
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/nmail.1
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/version.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#include "version.h"

#define NMAIL_VERSION "5.1.13"
#define NMAIL_VERSION "5.1.14"

std::string Version::GetBuildOs()
{
Expand Down

0 comments on commit fa93600

Please sign in to comment.