commit d8f8629b1bf566e1dada7515e9b146c69e5d9757
author K.Takata <kentkt@csc.jp> Mon Mar 07 15:16:15 2022 +0000
committer Bram Moolenaar <Bram@vim.org> Mon Mar 07 15:16:15 2022 +0000
tree b6206939ce6839fd684f76c620b7a17b753739fe
parent 6ca883dd8a585a85acdf9303b434211ea91872a7

patch 8.2.4524: MS-Windows: cannot build with some sodium libraries

Problem:    MS-Windows: cannot build with some sodium libraries.
Solution:   Make the DLL name configuragle.  Add build instructions.
            (Ken Takata, closes #9905)

src/Make_cyg_ming.mak

diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index 7c1cbd9..a2d8f3b 100644
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -670,14 +670,17 @@
 
 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