cory/tildefriends
5
6
Fork 2
Code Issues 39 Pull Requests Actions 1 Releases 33 Wiki Activity

Add libsodium to the tree and build what's needed from source.

Browse Source 
git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@3859 ed5197a5-7fde-0310-b194-c3ffbd925b24
This commit is contained in:
Cory McWilliams
2022-03-08 03:42:47 +00:00
parent efc5eb2aff
commit 352f33f5a1
584 changed files with 140249 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
Makefile
View File

@ -33,6 +33,7 @@ $(APP_OBJS): CFLAGS += \
-Ideps/sqlite \
-Ideps/libuv/include \
-Ideps/xopt \
-Ideps/libsodium \
-Werror
BASE64C_SOURCES = deps/base64c/src/base64c.c
@ -98,6 +99,45 @@ $(UV_OBJS): CFLAGS += \
-Wno-sign-compare \
-D_GNU_SOURCE \
SODIUM_SOURCES = \
deps/libsodium/src/libsodium/crypto_auth/hmacsha512/auth_hmacsha512.c \
deps/libsodium/src/libsodium/crypto_auth/hmacsha512256/auth_hmacsha512256.c \
deps/libsodium/src/libsodium/crypto_box/crypto_box.c \
deps/libsodium/src/libsodium/crypto_box/curve25519xsalsa20poly1305/box_curve25519xsalsa20poly1305.c \
deps/libsodium/src/libsodium/crypto_core/ed25519/ref10/ed25519_ref10.c \
deps/libsodium/src/libsodium/crypto_core/hsalsa20/ref2/core_hsalsa20_ref2.c \
deps/libsodium/src/libsodium/crypto_core/salsa/ref/core_salsa_ref.c \
deps/libsodium/src/libsodium/crypto_hash/sha256/cp/hash_sha256_cp.c \
deps/libsodium/src/libsodium/crypto_hash/sha256/hash_sha256.c \
deps/libsodium/src/libsodium/crypto_hash/sha512/cp/hash_sha512_cp.c \
deps/libsodium/src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna.c \
deps/libsodium/src/libsodium/crypto_onetimeauth/poly1305/onetimeauth_poly1305.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/scalarmult_curve25519.c \
deps/libsodium/src/libsodium/crypto_secretbox/crypto_secretbox_easy.c \
deps/libsodium/src/libsodium/crypto_sign/crypto_sign.c \
deps/libsodium/src/libsodium/crypto_sign/ed25519/ref10/keypair.c \
deps/libsodium/src/libsodium/crypto_sign/ed25519/ref10/open.c \
deps/libsodium/src/libsodium/crypto_sign/ed25519/ref10/sign.c \
deps/libsodium/src/libsodium/crypto_stream/salsa20/ref/salsa20_ref.c \
deps/libsodium/src/libsodium/crypto_stream/salsa20/stream_salsa20.c \
deps/libsodium/src/libsodium/crypto_stream/xsalsa20/stream_xsalsa20.c \
deps/libsodium/src/libsodium/crypto_verify/sodium/verify.c \
deps/libsodium/src/libsodium/randombytes/randombytes.c \
deps/libsodium/src/libsodium/randombytes/sysrandom/randombytes_sysrandom.c \
deps/libsodium/src/libsodium/sodium/core.c \
deps/libsodium/src/libsodium/sodium/utils.c
SODIUM_OBJS_DBG = $(patsubst %.c,$(BUILD_DIR_DBG)/%.o,$(SODIUM_SOURCES))
SODIUM_OBJS_REL = $(patsubst %.c,$(BUILD_DIR_REL)/%.o,$(SODIUM_SOURCES))
SODIUM_OBJS := $(SODIUM_OBJS_DBG) $(SODIUM_OBJS_REL)
$(SODIUM_OBJS): CFLAGS += \
-DCONFIGURED=1 \
-DMINIMAL=1 \
-Wno-unused-function \
-Wno-unused-variable \
-Ideps/libsodium/src/libsodium/include/sodium
SQLITE_SOURCES = deps/sqlite/sqlite3.c
SQLITE_OBJS_DBG = $(patsubst %.c,$(BUILD_DIR_DBG)/%.o,$(SQLITE_SOURCES))
SQLITE_OBJS_REL = $(patsubst %.c,$(BUILD_DIR_REL)/%.o,$(SQLITE_SOURCES))
@ -149,8 +189,8 @@ LDFLAGS += \
-ldl \
-lm \
-lssl \
-lcrypto \
-lsodium
-lcrypto #\
#-lsodium
debug: $(BUILD_DIR_DBG)/$(PROJECT)
release: $(BUILD_DIR_REL)/$(PROJECT)
@ -162,6 +202,7 @@ ALL_APP_OBJS_DBG = \
$(BASE64C_OBJS_DBG) \
$(BLOWFISH_OBJS_DBG) \
$(UV_OBJS_DBG) \
$(SODIUM_OBJS_DBG) \
$(SQLITE_OBJS_DBG) \
$(QUICKJS_OBJS_DBG) \
$(XOPT_OBJS_DBG)
@ -170,6 +211,7 @@ ALL_APP_OBJS_REL = \
$(BASE64C_OBJS_REL) \
$(BLOWFISH_OBJS_REL) \
$(UV_OBJS_REL) \
$(SODIUM_OBJS_REL) \
$(SQLITE_OBJS_REL) \
$(QUICKJS_OBJS_REL) \
$(XOPT_OBJS_REL)