From 4955bbaa294e3eb7540116639eaf9978731b6e99 Mon Sep 17 00:00:00 2001 From: timoreo Date: Sun, 10 Dec 2023 19:58:05 +0100 Subject: [PATCH] Move OLM to sdk --- .gitmodules | 3 --- CMakeLists.txt | 1 - matrix-3ds-sdk | 2 +- olm | 1 - 4 files changed, 1 insertion(+), 6 deletions(-) delete mode 160000 olm diff --git a/.gitmodules b/.gitmodules index c0add99..3f18495 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,6 @@ [submodule "quirc"] path = quirc url = https://gitea.ahur.ac/timoreo/quirc.git -[submodule "olm"] - path = olm - url = https://gitea.ahur.ac/timoreo/olm.git [submodule "matrix-3ds-sdk"] path = matrix-3ds-sdk url = https://gitea.ahur.ac/timoreo/matrix-3ds-sdk.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 349a59e..be59f91 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,6 @@ enable_language(ASM) add_compile_options(-O2 -Wall -Wextra -pedantic -Wno-unused-parameter) add_subdirectory(matrix-3ds-sdk) -add_subdirectory(olm) add_executable(matrix-3ds-client src/main.cpp) find_package(PkgConfig REQUIRED) pkg_check_modules(jansson REQUIRED IMPORTED_TARGET jansson) diff --git a/matrix-3ds-sdk b/matrix-3ds-sdk index 8150c15..c671cd4 160000 --- a/matrix-3ds-sdk +++ b/matrix-3ds-sdk @@ -1 +1 @@ -Subproject commit 8150c15e8ca4f25ca87a9f2549abc2bf77450a29 +Subproject commit c671cd464c2ac29538572a4257b5d1fe91f4cd2d diff --git a/olm b/olm deleted file mode 160000 index cb3fe62..0000000 --- a/olm +++ /dev/null @@ -1 +0,0 @@ -Subproject commit cb3fe622ae742674436e361bdefe534d300ced47