Patch 8.2.4517

[Bram Moolenaar]

Patch 8.2.4517
Problem: MS-Windows: cannot specify location of sodium library.
Solution: Allow for using a path for SODIUM. (Ken Takata, closes #9896)
Files: src/Make_cyg_ming.mak


*** ../vim-8.2.4516/src/Make_cyg_ming.mak 2022-03-02 17:34:52.156249510 +0000
--- src/Make_cyg_ming.mak 2022-03-06 13:55:56.268268372 +0000
***************
*** 32,61 ****
# Set to TINY to make minimal version (few features).
FEATURES=HUGE

! # set to yes for a debug build
DEBUG=no

! # set to yes to create a mapfile
#MAP=yes

! # set to yes to measure code coverage
COVERAGE=no

! # better encryption support using libsodium
#SODIUM=yes

! # set to SIZE for size, SPEED for speed, MAXSPEED for maximum optimization
OPTIMIZE=MAXSPEED

! # set to yes to make gvim, no for vim
GUI=yes

! # 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)
# MinGW-w64 is needed, and ARCH should be set to i686 or x86-64.
DIRECTX=yes

--- 32,62 ----
# Set to TINY to make minimal version (few features).
FEATURES=HUGE

! # Set to yes for a debug build.
DEBUG=no

! # Set to yes to create a mapfile.
#MAP=yes

! # Set to yes to measure code coverage.
COVERAGE=no

! # 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.
OPTIMIZE=MAXSPEED

! # Set to yes to make gvim, no for vim.
GUI=yes

! # 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).
# MinGW-w64 is needed, and ARCH should be set to i686 or x86-64.
DIRECTX=yes

***************
*** 524,533 ****
WINDRES_FLAGS =
EXTRA_LIBS =

- ifdef SODIUM
- DEFINES += -DHAVE_SODIUM
- endif
-
ifdef GETTEXT
DEFINES += -DHAVE_GETTEXT -DHAVE_LOCALE_H
GETTEXTINCLUDE = $(GETTEXT)/include
--- 525,530 ----
***************
*** 671,677 ****
endif
endif

! ifeq ($(SODIUM),yes)
ifndef DYNAMIC_SODIUM
DYNAMIC_SODIUM=yes
endif
--- 668,678 ----
endif
endif

! ifdef SODIUM
! DEFINES += -DHAVE_SODIUM
! ifneq ($(SODIUM),yes)
! CFLAGS += -I $(SODIUM)/include
! endif
ifndef DYNAMIC_SODIUM
DYNAMIC_SODIUM=yes
endif
*** ../vim-8.2.4516/src/version.c 2022-03-05 22:07:29.137523254 +0000
--- src/version.c 2022-03-06 14:01:23.707317761 +0000
***************
*** 756,757 ****
--- 756,759 ----
{ /* Add new patch number below this line */
+ /**/
+ 4517,
/**/

--
hundred-and-one symptoms of being an internet addict:
176. You lie, even to user-friends, about how long you were online yesterday.

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///