X-Git-Url: https://gitweb.ps.run/matrix_esp_thesis/blobdiff_plain/80dc4ce95cbe915a3aaa7e2e18f545916d6ec769..9eaa420b7bf51cc81c50e7f4ca0f256498a07c86:/esp32/esp_project/components/olm/CMakeLists.txt

diff --git a/esp32/esp_project/components/olm/CMakeLists.txt b/esp32/esp_project/components/olm/CMakeLists.txt
index 352ab9c..e17b8ad 100644
--- a/esp32/esp_project/components/olm/CMakeLists.txt
+++ b/esp32/esp_project/components/olm/CMakeLists.txt
@@ -1,6 +1,6 @@
 idf_component_register(SRCS
                             "../../../../ext/olm/src/account.cpp"
-                            #"../../../../ext/olm/lib/crypto-algorithms/aes.c"
+                            "../../../../ext/olm/lib/crypto-algorithms/aes.c"
                             "../../../../ext/olm/src/base64.cpp"
                             "../../../../ext/olm/src/cipher.cpp"
                             "../../../../ext/olm/src/crypto.cpp"
@@ -16,29 +16,23 @@ idf_component_register(SRCS
                             "../../../../ext/olm/src/pickle.cpp"
                             "../../../../ext/olm/src/pickle_encoding.c"
                             "../../../../ext/olm/src/pk.cpp"
+                            "../../../../ext/olm/src/ratchet.cpp"
                             "../../../../ext/olm/src/sas.c"
                             "../../../../ext/olm/src/session.cpp"
                             "../../../../ext/olm/lib/crypto-algorithms/sha256.c"
                             "../../../../ext/olm/src/utility.cpp"
-                            "../../../../src/matrix.c"
-                            "../../../../src/matrix_http_mongoose.c"
-                            "../../../../ext/mongoose/mongoose.c"
-                            "../../../../ext/mjson/src/mjson.c"
                        INCLUDE_DIRS
                             "../../../../ext/olm/include"
                             "../../../../ext/olm/lib"
-                            "../../../../ext/mongoose"
-                            "../../../../ext/mjson/src"
                             "../../../../src"
                        REQUIRES
-                            esp_timer
-                            mbedtls)
+                            esp_timer)
 
 add_definitions(-DOLM_STATIC_DEFINE)
 add_definitions(-DOLMLIB_VERSION_MAJOR=3)
 add_definitions(-DOLMLIB_VERSION_MINOR=2)
 add_definitions(-DOLMLIB_VERSION_PATCH=15)
-add_definitions(-DMG_ENABLE_MBEDTLS=1)
 
-SET(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -fpermissive")
+SET(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -fpermissive -Wl,--allow-multiple-definition")
+SET(CMAKE_CXX_COMPILER  "C:/Espressif/tools/xtensa-esp32-elf/esp-12.2.0_20230208/xtensa-esp32-elf/bin/xtensa-esp32-elf-gcc.exe")