eden-emu/eden
24
3
Fork 15
Code Issues 138 Pull requests 60 Projects 1 Releases Packages Wiki Activity Actions

[android] fix openssl linking

Browse source 
Signed-off-by: crueter <crueter@eden-emu.dev>
This commit is contained in:
crueter 2025-08-13 12:55:26 -04:00 • committed by crueter
parent 421bbeb818
commit d9442ac3b8
Signed by: crueter
GPG key ID: 425ACD2D4830EBC6
2 changed files with 8 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

20
CMakeLists.txt
View file

@ -178,8 +178,9 @@ if (ANDROID)
include(CPMUtil) include(CPMUtil)
# download openssl # download openssl
# TODO(crueter): windows
if (ENABLE_OPENSSL) if (ENABLE_OPENSSL)
set(BUILD_SHARED_LIBS OFF) set(BUILD_SHARED_LIBS ON)
AddPackage( AddPackage(
NAME OpenSSL NAME OpenSSL
REPO crueter/OpenSSL-CI REPO crueter/OpenSSL-CI
@ -192,22 +193,7 @@ if (ANDROID)
BUNDLED_PACKAGE ON BUNDLED_PACKAGE ON
) )
# TODO(crueter): configure directly doesn't seem to work here, not sure why include(${OpenSSL_SOURCE_DIR}/openssl.cmake)
# needs file generation too
set(OPENSSL_INCLUDE_DIR ${OpenSSL_SOURCE_DIR}/include)
set(OPENSSL_LIB_DIR ${OpenSSL_SOURCE_DIR}/lib)
add_library(OpenSSL::Crypto STATIC IMPORTED)
set_target_properties(OpenSSL::Crypto PROPERTIES
IMPORTED_LOCATION ${OPENSSL_LIB_DIR}/libcrypto.a
INCLUDE_DIRECTORIES ${OPENSSL_INCLUDE_DIR}
)
add_library(OpenSSL::SSL STATIC IMPORTED)
set_target_properties(OpenSSL::SSL PROPERTIES
IMPORTED_LOCATION ${OPENSSL_LIB_DIR}/libssl.a
INCLUDE_DIRECTORIES ${OPENSSL_INCLUDE_DIR}
)
endif() endif()
endif() endif()

9
src/core/CMakeLists.txt
View file

@ -1249,10 +1249,11 @@ if(ENABLE_OPENSSL)
find_package(OpenSSL REQUIRED) find_package(OpenSSL REQUIRED)
target_sources(core PRIVATE target_sources(core PRIVATE
hle/service/ssl/ssl_backend_openssl.cpp) hle/service/ssl/ssl_backend_openssl.cpp)
target_link_libraries(core PRIVATE OpenSSL::SSL) if (ANDROID)
message(STATUS "xd ${OPENSSL_INCLUDE_DIR}") link_openssl(core)
target_include_directories(core PUBLIC ${OPENSSL_INCLUDE_DIR}) else()
# link_openssl(core) target_link_libraries(core PRIVATE OpenSSL::SSL)
endif()
elseif (APPLE) elseif (APPLE)
target_sources(core PRIVATE target_sources(core PRIVATE
hle/service/ssl/ssl_backend_securetransport.cpp) hle/service/ssl/ssl_backend_securetransport.cpp)