timoreo/matrix-3ds-sdk
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move OLM to sdk

Browse source
This commit is contained in:
timoreo 2023-12-10 19:58:05 +01:00
parent 8150c15e8c
commit c671cd464c
Signed by: timoreo
GPG key ID: 121A72C3512BA288
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored Normal file
View file

@ -0,0 +1,3 @@
[submodule "olm"]
path = olm
url = git@ahur.ac:timoreo/olm.git

3
CMakeLists.txt
View file

@ -3,6 +3,7 @@ list(APPEND CMAKE_PREFIX_PATH "${DEVKITPRO}/portlibs/3ds/lib/pkgconfig/")
cmake_minimum_required(VERSION 3.24) cmake_minimum_required(VERSION 3.24)
project(matrix-3ds-sdk) project(matrix-3ds-sdk)
add_subdirectory(olm)
add_library(matrix-3ds-sdk source/matrixclient.cpp source/memorystore.cpp source/util.cpp) add_library(matrix-3ds-sdk source/matrixclient.cpp source/memorystore.cpp source/util.cpp)
find_package(PkgConfig REQUIRED) find_package(PkgConfig REQUIRED)
pkg_check_modules(jansson REQUIRED IMPORTED_TARGET jansson) pkg_check_modules(jansson REQUIRED IMPORTED_TARGET jansson)
@ -12,7 +13,7 @@ file(READ "${DEVKITPRO}/portlibs/3ds/lib/libcurl.la" contents)
if (contents MATCHES "dependency_libs *= *'([^']*)'") if (contents MATCHES "dependency_libs *= *'([^']*)'")
string(STRIP "${CMAKE_MATCH_1}" deps) string(STRIP "${CMAKE_MATCH_1}" deps)
string(REGEX REPLACE " +" ";" deps "${deps}") string(REGEX REPLACE " +" ";" deps "${deps}")
target_link_libraries(matrix-3ds-sdk PRIVATE curl PkgConfig::jansson ${deps}) target_link_libraries(matrix-3ds-sdk PRIVATE curl PkgConfig::jansson olm ${deps})
endif() endif()
target_include_directories(matrix-3ds-sdk PUBLIC source include "${DEVKITPRO}/portlibs/3ds/include/") target_include_directories(matrix-3ds-sdk PUBLIC source include "${DEVKITPRO}/portlibs/3ds/include/")

1
olm Submodule

@ -0,0 +1 @@
Subproject commit cb3fe622ae742674436e361bdefe534d300ced47