patch 8.2.4517: MS-Windows: cannot specify location of sodium library

Problem:    MS-Windows: cannot specify location of sodium library.
Solution:   Allow for using a path for SODIUM. (Ken Takata, closes #9896)

diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index 11b4c3af795a0065136af38a1962ec0048e7d15d..7c1cbd9c9a92392015b7646c0d8b0aa24f79b006 100644 (file)
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -32,30 +32,31 @@
 # Set to TINY to make minimal version (few features).
 FEATURES=HUGE
 
-# set to yes for a debug build
+# Set to yes for a debug build.
 DEBUG=no
 
-# set to yes to create a mapfile
+# Set to yes to create a mapfile.
 #MAP=yes
 
-# set to yes to measure code coverage
+# Set to yes to measure code coverage.
 COVERAGE=no
 
-# better encryption support using libsodium
+# Better encryption support using libsodium.
+# Set to yes or specify the path to the libsodium directory to enable it.
 #SODIUM=yes
 
-# set to SIZE for size, SPEED for speed, MAXSPEED for maximum optimization
+# Set to SIZE for size, SPEED for speed, MAXSPEED for maximum optimization.
 OPTIMIZE=MAXSPEED
 
-# set to yes to make gvim, no for vim
+# Set to yes to make gvim, no for vim.
 GUI=yes
 
-# set to yes to enable the DLL support (EXPERIMENTAL).
+# Set to yes to enable the DLL support (EXPERIMENTAL).
 # Creates vim{32,64}.dll, and stub gvim.exe and vim.exe.
 # "GUI" should be also set to "yes".
 #VIMDLL=yes
 
-# set to no if you do not want to use DirectWrite (DirectX)
+# Set to no if you do not want to use DirectWrite (DirectX).
 # MinGW-w64 is needed, and ARCH should be set to i686 or x86-64.
 DIRECTX=yes
 
@@ -524,10 +525,6 @@ CXXFLAGS = -std=gnu++11
 WINDRES_FLAGS =
 EXTRA_LIBS =
 
-ifdef SODIUM
-DEFINES += -DHAVE_SODIUM
-endif
-
 ifdef GETTEXT
 DEFINES += -DHAVE_GETTEXT -DHAVE_LOCALE_H
 GETTEXTINCLUDE = $(GETTEXT)/include
@@ -671,7 +668,11 @@ DEFINES += -DFEAT_DIRECTX_COLOR_EMOJI
  endif
 endif
 
-ifeq ($(SODIUM),yes)
+ifdef SODIUM
+DEFINES += -DHAVE_SODIUM
+ ifneq ($(SODIUM),yes)
+CFLAGS += -I $(SODIUM)/include
+ endif
  ifndef DYNAMIC_SODIUM
 DYNAMIC_SODIUM=yes
  endif

diff --git a/src/version.c b/src/version.c
index 5895b6697429d20e7e63e31a3e7fff93ecdecef4..5e7d570914d279731e9ad9da1840b78d6826f186 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4517,
 /**/
     4516,
 /**/