From d711993b3b4ac023d2eae7b4ed73be0f456040ac Mon Sep 17 00:00:00 2001 From: Cory McWilliams Date: Thu, 5 Oct 2023 00:52:59 +0000 Subject: [PATCH] I need to configure libsodium better. git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@4492 ed5197a5-7fde-0310-b194-c3ffbd925b24 --- Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Makefile b/Makefile index c37da2bd..a7dbd8a5 100644 --- a/Makefile +++ b/Makefile @@ -304,6 +304,7 @@ SODIUM_SOURCES := \ deps/libsodium/src/libsodium/crypto_pwhash/argon2/blake2b-long.c \ deps/libsodium/src/libsodium/crypto_scalarmult/crypto_scalarmult.c \ deps/libsodium/src/libsodium/crypto_scalarmult/curve25519/ref10/x25519_ref10.c \ + deps/libsodium/src/libsodium/crypto_scalarmult/curve25519/sandy2x/curve25519_sandy2x.c \ deps/libsodium/src/libsodium/crypto_scalarmult/curve25519/scalarmult_curve25519.c \ deps/libsodium/src/libsodium/crypto_secretbox/crypto_secretbox_easy.c \ deps/libsodium/src/libsodium/crypto_secretbox/xsalsa20poly1305/secretbox_xsalsa20poly1305.c \ @@ -329,6 +330,9 @@ SODIUM_OBJS := $(call get_objs,SODIUM_SOURCES) $(SODIUM_OBJS): CFLAGS += \ -DCONFIGURED=1 \ -DMINIMAL=1 \ + -DHAVE_ALLOCA \ + -DHAVE_CPUID_V \ + -DHAVE_GCC_MEMORY_FENCES \ -Wno-unused-function \ -Wno-unused-variable \ -Wno-type-limits \ @@ -336,6 +340,8 @@ $(SODIUM_OBJS): CFLAGS += \ -Wno-attributes \ -Ideps/libsodium/builds/msvc \ -Ideps/libsodium/src/libsodium/include/sodium +#(SODIUM_OBJS_unix): CFLAGS += \ + -DHAVE_ALLOCA_H SQLITE_SOURCES := deps/sqlite/sqlite3.c SQLITE_OBJS := $(call get_objs,SQLITE_SOURCES)