update Makefile

diff --git a/Makefile b/Makefile
index c82a055818d022c5b46d1da3616da12d887da81a..ce1ae2b9c1ac66a3dc5ca3a19204ca6981667ab2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,9 @@
-CC=clang++\r
+CC=clang\r
 \r
 C_OPTS=-Wall -Wextra -pedantic\r
 C_OPTS+=src/matrix.c\r
 C_OPTS+=src/matrix_http_mongoose.c\r
-C_OPTS+=ext/mjson/src/mjson.c\r
-C_OPTS+=ext/mongoose/mongoose.c\r
+C_OPTS+=out/*.o\r
 C_OPTS+=-I src/\r
 C_OPTS+=-I ext/olm/include/\r
 C_OPTS+=-I ext/mjson/src/\r
@@ -13,23 +12,34 @@ C_OPTS+=-l ws2_32
 C_OPTS+=-l ssl\r
 C_OPTS+=-l crypto\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
-\r
+#C_OPTS+=-fuse-ld=lld.exe -g -gcodeview -Wl,/debug,/pdb:out/test.pdb\r
 #C_OPTS+=-Wl,--verbose\r
 \r
 out/examples/%: examples/%.c src/*\r
        $(CC) -o out/examples/$* examples/$*.c $(C_OPTS)\r
 \r
-.PHONY: examples\r
+olm:\r
+       cd out && \\r
+       $(CC) -c \\r
+               ../ext/olm/src/* \\r
+               ../ext/olm/lib/crypto-algorithms/aes.c \\r
+               ../ext/olm/lib/curve25519-donna/curve25519-donna.c \\r
+               ../ext/olm/lib/crypto-algorithms/sha256.c \\r
+               -I ../ext/olm/include \\r
+               -I ../ext/olm/lib \\r
+               -DOLM_STATIC_DEFINE \\r
+               -DOLMLIB_VERSION_MAJOR=3 \\r
+               -DOLMLIB_VERSION_MINOR=2 \\r
+               -DOLMLIB_VERSION_PATCH=15\r
+\r
+mongoose:\r
+       cd out && \\r
+       $(CC) -c ../ext/mongoose/mongoose.c -I ../ext/mongoose/ -DMG_ENABLE_OPENSSL=1\r
+\r
+mjson:\r
+       cd out && \\r
+       $(CC) -c ../ext/mjson/src/mjson.c -I ../ext/mjson/src/\r
 \r
-examples: out/examples/Login out/examples/Send out/examples/SendEncrypted out/examples/Sync\r
+deps: olm mongoose mjson\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
+.PHONY: deps olm mongoose mjson
\ No newline at end of file