0
0
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00

patch 8.2.4144: cannot load libsodium dynamically

Problem:    Cannot load libsodium dynamically.
Solution:   Support dynamic loading on MS-Windows. (Ken Takata, closes #9554)
This commit is contained in:
K.Takata
2022-01-19 13:32:57 +00:00
committed by Bram Moolenaar
parent b0b2b73dca
commit 1a8825d7a3
7 changed files with 144 additions and 7 deletions

View File

@@ -42,10 +42,10 @@
# Sound support: SOUND=yes (default is yes)
#
# Sodium support: SODIUM=[Path to Sodium directory]
# Dynamic built with libsodium
# You need to install the msvc package from
# https://download.libsodium.org/libsodium/releases/
# and package the libsodium.dll with Vim
# DYNAMIC_SODIUM=yes (to load the Sodium DLL dynamically)
# You need to install the msvc package from
# https://download.libsodium.org/libsodium/releases/
# and package the libsodium.dll with Vim
#
#
# DLL support (EXPERIMENTAL): VIMDLL=yes (default is no)
@@ -384,6 +384,9 @@ SOUND = no
!ifndef SODIUM
SODIUM = no
!endif
!ifndef DYNAMIC_SODIUM
DYNAMIC_SODIUM = yes
!endif
!if "$(SODIUM)" != "no"
! if "$(CPU)" == "AMD64"
@@ -397,8 +400,13 @@ SODIUM = no
!if "$(SODIUM)" != "no"
SOD_INC = /I "$(SODIUM)\include"
! if "$(DYNAMIC_SODIUM)" == "yes"
SOD_DEFS = -DHAVE_SODIUM -DDYNAMIC_SODIUM
SOD_LIB =
! else
SOD_DEFS = -DHAVE_SODIUM
SOD_LIB = $(SOD_LIB)\libsodium.lib
! endif
!endif
!ifndef NETBEANS