summaryrefslogtreecommitdiffstats
path: root/src/Make_cyg_ming.mak
diff options
context:
space:
mode:
authorK.Takata <kentkt@csc.jp>2022-03-07 15:16:15 +0000
committerBram Moolenaar <Bram@vim.org>2022-03-07 15:16:15 +0000
commitd8f8629b1bf566e1dada7515e9b146c69e5d9757 (patch)
treeb6206939ce6839fd684f76c620b7a17b753739fe /src/Make_cyg_ming.mak
parent6ca883dd8a585a85acdf9303b434211ea91872a7 (diff)
patch 8.2.4524: MS-Windows: cannot build with some sodium librariesv8.2.4524
Problem: MS-Windows: cannot build with some sodium libraries. Solution: Make the DLL name configuragle. Add build instructions. (Ken Takata, closes #9905)
Diffstat (limited to 'src/Make_cyg_ming.mak')
-rw-r--r--src/Make_cyg_ming.mak7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index 7c1cbd9c9a..a2d8f3b1e5 100644
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -670,14 +670,17 @@ endif
ifdef SODIUM
DEFINES += -DHAVE_SODIUM
- ifneq ($(SODIUM),yes)
+ ifeq ($(SODIUM),yes)
+SODIUM_DLL = libsodium-23.dll
+ else
+SODIUM_DLL = libsodium.dll
CFLAGS += -I $(SODIUM)/include
endif
ifndef DYNAMIC_SODIUM
DYNAMIC_SODIUM=yes
endif
ifeq ($(DYNAMIC_SODIUM),yes)
-DEFINES += -DDYNAMIC_SODIUM
+DEFINES += -DDYNAMIC_SODIUM -DDYNAMIC_SODIUM_DLL=\"$(SODIUM_DLL)\"
else
SODIUMLIB = -lsodium
endif