diff options
| author | K.Takata <kentkt@csc.jp> | 2022-01-19 13:32:57 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-01-19 13:32:57 +0000 |
| commit | 1a8825d7a3484d76ca16ea2aa9769cadca7758a4 (patch) | |
| tree | 3fa19e87656a4a3ef97ad6fc4635719c841d24c9 /src/Make_mvc.mak | |
| parent | b0b2b73dca40c26ff1f4befe5c3aad3fd4bccfad (diff) | |
| download | vim-git-1a8825d7a3484d76ca16ea2aa9769cadca7758a4.tar.gz | |
patch 8.2.4144: cannot load libsodium dynamicallyv8.2.4144
Problem: Cannot load libsodium dynamically.
Solution: Support dynamic loading on MS-Windows. (Ken Takata, closes #9554)
Diffstat (limited to 'src/Make_mvc.mak')
| -rw-r--r-- | src/Make_mvc.mak | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index b33d24b1a..6889a91d8 100644 --- 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 |