Mercurial > vim

diff src/Make_cyg_ming.mak @ 27998:ef7d9789919d v8.2.4524

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.4524: MS-Windows: cannot build with some sodium libraries Commit: https://github.com/vim/vim/commit/d8f8629b1bf566e1dada7515e9b146c69e5d9757 Author: K.Takata <kentkt@csc.jp> Date: Mon Mar 7 15:16:15 2022 +0000 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)
author Bram Moolenaar <Bram@vim.org>
date Mon, 07 Mar 2022 16:30:04 +0100
parents da660b0f20d1
children cc1f2ef46aaa
line wrap: on
line diff
--- 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