fix esp_project CMakeLists.txt

[matrix_esp_thesis] / 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 352ab9cbe32dd7dc25093e9dcdd15d833107a203..07bb160a11dec3d150e65d7bb11efbbb2b9216f7 100644 (file)
--- a/esp32/esp_project/components/olm/CMakeLists.txt
+++ b/esp32/esp_project/components/olm/CMakeLists.txt
@@ -1,6 +1,6 @@
 idf_component_register(SRCS\r
                             "../../../../ext/olm/src/account.cpp"\r
-                            #"../../../../ext/olm/lib/crypto-algorithms/aes.c"\r
+                            "../../../../ext/olm/lib/crypto-algorithms/aes.c"\r
                             "../../../../ext/olm/src/base64.cpp"\r
                             "../../../../ext/olm/src/cipher.cpp"\r
                             "../../../../ext/olm/src/crypto.cpp"\r
@@ -16,29 +16,22 @@ idf_component_register(SRCS
                             "../../../../ext/olm/src/pickle.cpp"\r
                             "../../../../ext/olm/src/pickle_encoding.c"\r
                             "../../../../ext/olm/src/pk.cpp"\r
+                            "../../../../ext/olm/src/ratchet.cpp"\r
                             "../../../../ext/olm/src/sas.c"\r
                             "../../../../ext/olm/src/session.cpp"\r
                             "../../../../ext/olm/lib/crypto-algorithms/sha256.c"\r
                             "../../../../ext/olm/src/utility.cpp"\r
-                            "../../../../src/matrix.c"\r
-                            "../../../../src/matrix_http_mongoose.c"\r
-                            "../../../../ext/mongoose/mongoose.c"\r
-                            "../../../../ext/mjson/src/mjson.c"\r
                        INCLUDE_DIRS\r
                             "../../../../ext/olm/include"\r
                             "../../../../ext/olm/lib"\r
-                            "../../../../ext/mongoose"\r
-                            "../../../../ext/mjson/src"\r
                             "../../../../src"\r
                        REQUIRES\r
-                            esp_timer\r
-                            mbedtls)\r
+                            esp_timer)\r
 \r
 add_definitions(-DOLM_STATIC_DEFINE)\r
 add_definitions(-DOLMLIB_VERSION_MAJOR=3)\r
 add_definitions(-DOLMLIB_VERSION_MINOR=2)\r
 add_definitions(-DOLMLIB_VERSION_PATCH=15)\r
-add_definitions(-DMG_ENABLE_MBEDTLS=1)\r
 \r
-SET(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -fpermissive")\r
+SET(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -fpermissive -Wl,--allow-multiple-definition")\r
 \r