diff options
-rw-r--r-- | src/Make_cyg_ming.mak | 27 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 16 insertions, 13 deletions
diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak index 11b4c3af79..7c1cbd9c9a 100644 --- 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 5895b66974..5e7d570914 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4517, +/**/ 4516, /**/ 4515, |