Mercurial > vim
diff src/Make_mvc.mak @ 27231:e1cedf009920 v8.2.4144
patch 8.2.4144: cannot load libsodium dynamically
Commit: https://github.com/vim/vim/commit/1a8825d7a3484d76ca16ea2aa9769cadca7758a4
Author: K.Takata <kentkt@csc.jp>
Date: Wed Jan 19 13:32:57 2022 +0000
patch 8.2.4144: cannot load libsodium dynamically
Problem: Cannot load libsodium dynamically.
Solution: Support dynamic loading on MS-Windows. (Ken Takata, closes https://github.com/vim/vim/issues/9554)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Wed, 19 Jan 2022 14:45:05 +0100 |
| parents | 01cd3323e4cf |
| children | d5570658f18d |
line wrap: on
line diff
--- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -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