Skip to content

Commit

Permalink
Feat: Compiling GeniusSDK for Android with Boost 1.85
Browse files Browse the repository at this point in the history
  • Loading branch information
henriqueaklein committed Jun 26, 2024
1 parent d2e47b7 commit 8e357d1
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 6 deletions.
2 changes: 1 addition & 1 deletion build
18 changes: 15 additions & 3 deletions cmake/CommonBuildParameters.cmake
Original file line number Diff line number Diff line change
@@ -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}")
Expand Down Expand Up @@ -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)
Expand All @@ -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}")
Expand Down
4 changes: 2 additions & 2 deletions src/GeniusSDK.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down

0 comments on commit 8e357d1

Please sign in to comment.