From 8e357d1e9dc7d266c4c78a939596f0feb0cb4895 Mon Sep 17 00:00:00 2001 From: Henrique A Klein Date: Wed, 26 Jun 2024 18:35:32 -0300 Subject: [PATCH] Feat: Compiling GeniusSDK for Android with Boost 1.85 --- build | 2 +- cmake/CommonBuildParameters.cmake | 18 +++++++++++++++--- src/GeniusSDK.h | 4 ++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/build b/build index ef854d8..9c6cd72 160000 --- a/build +++ b/build @@ -1 +1 @@ -Subproject commit ef854d8d7917ad19394a683dc1af18095211e54e +Subproject commit 9c6cd721075014c33ff8ab7d54ec6a9a968bb9c0 diff --git a/cmake/CommonBuildParameters.cmake b/cmake/CommonBuildParameters.cmake index 428fb2f..7cc4fe4 100644 --- a/cmake/CommonBuildParameters.cmake +++ b/cmake/CommonBuildParameters.cmake @@ -1,6 +1,6 @@ # BOOST VERSION TO USE set(BOOST_MAJOR_VERSION "1" CACHE STRING "Boost Major Version") -set(BOOST_MINOR_VERSION "80" CACHE STRING "Boost Minor Version") +set(BOOST_MINOR_VERSION "85" CACHE STRING "Boost Minor Version") set(BOOST_PATCH_VERSION "0" CACHE STRING "Boost Patch Version") # convenience settings set(BOOST_VERSION "${BOOST_MAJOR_VERSION}.${BOOST_MINOR_VERSION}.${BOOST_PATCH_VERSION}") @@ -322,6 +322,15 @@ set(AsyncIOManager_DIR "${THIRDPARTY_BUILD_DIR}/AsyncIOManager/lib/cmake/AsyncIO find_package(AsyncIOManager CONFIG REQUIRED) include_directories(${AsyncIOManager_INCLUDE_DIR}) +# -------------------------------------------------------- +# Set config of gnus_upnp +set(gnus_upnp_INCLUDE_DIR "${_THIRDPARTY_BUILD_DIR}/gnus_upnp/include") +set(gnus_upnp_LIBRARY_DIR "${_THIRDPARTY_BUILD_DIR}/gnus_upnp/lib") +set(gnus_upnp_DIR "${_THIRDPARTY_BUILD_DIR}/gnus_upnp/lib/cmake/gnus_upnp") +find_package(gnus_upnp CONFIG REQUIRED) +include_directories(${gnus_upnp_INCLUDE_DIR}) + + # -------------------------------------------------------- # Set config of SuperGenius project if (NOT DEFINED SUPERGENIUS_SRC_DIR) @@ -335,8 +344,11 @@ if (NOT DEFINED SUPERGENIUS_SRC_DIR) endif() endif() -#set(SuperGenius_DIR "${SUPERGENIUS_SRC_DIR}/build/${CMAKE_SYSTEM_NAME}/${CMAKE_BUILD_TYPE}/SuperGenius/lib/cmake/SuperGenius/") -set(SuperGenius_DIR "${SUPERGENIUS_SRC_DIR}/.build/SuperGenius/lib/cmake/SuperGenius/") +set(SUPERGENIUS_BUILD_DIR "${SUPERGENIUS_SRC_DIR}/build/${CMAKE_SYSTEM_NAME}/${CMAKE_BUILD_TYPE}") +if (DEFINED ANDROID_ABI) + set(SUPERGENIUS_BUILD_DIR "${SUPERGENIUS_BUILD_DIR}/${ANDROID_ABI}") +endif() +set(SuperGenius_DIR "${SUPERGENIUS_BUILD_DIR}/SuperGenius/lib/cmake/SuperGenius/") print("SuperGenius_DIR: ${SuperGenius_DIR}") diff --git a/src/GeniusSDK.h b/src/GeniusSDK.h index c08b372..c3693c5 100644 --- a/src/GeniusSDK.h +++ b/src/GeniusSDK.h @@ -25,8 +25,8 @@ extern "C" { #endif - typedef char ImagePath_t[1024]; - typedef uint64_t PayAmount_t; + typedef char ImagePath_t[1024]; ///< ID/Path of the image to be processed + typedef uint64_t PayAmount_t; ///< Amount to be paid for the processing #ifndef __cplusplus }