From a82046ee4d6d2142ba2ae7a5d2e31c5dcebe8daf Mon Sep 17 00:00:00 2001 From: Luke Date: Thu, 16 Mar 2023 10:31:47 -0400 Subject: [PATCH] fix linker flag for android and add separate base64 note to changelog (#123) --- CHANGELOG.md | 1 + cmake/linkerFlagsTargets.cmake | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 061e6d3f8..69035ee59 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ The format is based on [keep a changelog](http://keepachangelog.com/) and this p - Fixed encoding issue with some cursors sent to the server. - Fixed an exception that could be thrown when the client sent match data over a bad network. - Upgraded libcurl to 7.88.1 which fixed a rare Websocket SSL handshake issue on Unix systems. +- Fixed base64 dependency in Android SSL for broader Android API level support. ### Changed - Improved build automation around test suite. diff --git a/cmake/linkerFlagsTargets.cmake b/cmake/linkerFlagsTargets.cmake index 5c5a031eb..767af3401 100644 --- a/cmake/linkerFlagsTargets.cmake +++ b/cmake/linkerFlagsTargets.cmake @@ -4,5 +4,5 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang # like when we link libc++ statically or openssl # NOTE: target specifically nakama-sdk (our library), because we DONT want it to be set on # nakama-test (test executable) in some cases (namely when linking libc++ statically) - target_link_options(nakama-sdk PRIVATE -Wl,--exclude-libs ALL) + target_link_options(nakama-sdk PRIVATE -Wl,--exclude-libs,ALL) endif()