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

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

Browse Source 
Problem:    MS-Windows: cannot specify location of sodium library.
Solution:   Allow for using a path for SODIUM. (Ken Takata, closes #9896)
This commit is contained in:
K.Takata
2022-03-06 14:01:52 +00:00
committed by Bram Moolenaar
parent 525eba00ef
commit 9eccee0e85
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/Make_cyg_ming.mak
View File

@@ -32,30 +32,31 @@
# Set to TINY to make minimal version (few features). # Set to TINY to make minimal version (few features).
FEATURES=HUGE FEATURES=HUGE
# set to yes for a debug build # Set to yes for a debug build.
DEBUG=no DEBUG=no
# set to yes to create a mapfile # Set to yes to create a mapfile.
#MAP=yes #MAP=yes
# set to yes to measure code coverage # Set to yes to measure code coverage.
COVERAGE=no 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 #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 OPTIMIZE=MAXSPEED
# set to yes to make gvim, no for vim # Set to yes to make gvim, no for vim.
GUI=yes 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. # Creates vim{32,64}.dll, and stub gvim.exe and vim.exe.
# "GUI" should be also set to "yes". # "GUI" should be also set to "yes".
#VIMDLL=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. # MinGW-w64 is needed, and ARCH should be set to i686 or x86-64.
DIRECTX=yes DIRECTX=yes
@@ -524,10 +525,6 @@ CXXFLAGS = -std=gnu++11
WINDRES_FLAGS = WINDRES_FLAGS =
EXTRA_LIBS = EXTRA_LIBS =
ifdef SODIUM
DEFINES += -DHAVE_SODIUM
endif
ifdef GETTEXT ifdef GETTEXT
DEFINES += -DHAVE_GETTEXT -DHAVE_LOCALE_H DEFINES += -DHAVE_GETTEXT -DHAVE_LOCALE_H
GETTEXTINCLUDE = $(GETTEXT)/include GETTEXTINCLUDE = $(GETTEXT)/include
@@ -671,7 +668,11 @@ DEFINES += -DFEAT_DIRECTX_COLOR_EMOJI
endif endif
endif endif
ifeq ($(SODIUM),yes) ifdef SODIUM
DEFINES += -DHAVE_SODIUM
ifneq ($(SODIUM),yes)
CFLAGS += -I $(SODIUM)/include
endif
ifndef DYNAMIC_SODIUM ifndef DYNAMIC_SODIUM
DYNAMIC_SODIUM=yes DYNAMIC_SODIUM=yes
endif endif

2
src/version.c
View File

@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
4517,
/**/ /**/
4516, 4516,
/**/ /**/