remove submodules

[matrix_esp_thesis] / Makefile

diff --git a/Makefile b/Makefile
index 88b1941467427fd1cf0d9ac19d3a5b65a8cccf3e..c82a055818d022c5b46d1da3616da12d887da81a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-CC=gcc\r
+CC=clang++\r
 \r
 C_OPTS=-Wall -Wextra -pedantic\r
 C_OPTS+=src/matrix.c\r
@@ -9,12 +9,13 @@ C_OPTS+=-I src/
 C_OPTS+=-I ext/olm/include/\r
 C_OPTS+=-I ext/mjson/src/\r
 C_OPTS+=-I ext/mongoose/\r
-C_OPTS+=-L out/olm/\r
 C_OPTS+=-l ws2_32\r
 C_OPTS+=-l ssl\r
 C_OPTS+=-l crypto\r
-C_OPTS+=-l olm\r
+C_OPTS+=-l stdc++\r
+C_OPTS+=out/olmdbg/libolm.a\r
 C_OPTS+=-D MG_ENABLE_OPENSSL=1\r
+C_OPTS+=-fuse-ld=lld.exe -g -gcodeview -Wl,/debug,/pdb:out/test.pdb\r
 # C_OPTS+=-I ext/curl/include/\r
 # C_OPTS+=-L ext/curl/build/lib/\r
 # C_OPTS+=-l curl\r
@@ -26,4 +27,9 @@ out/examples/%: examples/%.c src/*
 \r
 .PHONY: examples\r
 \r
-examples: out/examples/Login out/examples/Send out/examples/SendEncrypted out/examples/Sync
\ No newline at end of file
+examples: out/examples/Login out/examples/Send out/examples/SendEncrypted out/examples/Sync\r
+\r
+out/olm/libolm.a:\r
+       cd out/olm\r
+       cmake -DBUILD_SHARED_LIBS=OFF -DOLM_TESTS=OFF ../../ext/olm\r
+       cmake --build .
\ No newline at end of file