Mercurial > vim
comparison src/Make_cyg_ming.mak @ 27998:ef7d9789919d v8.2.4524
patch 8.2.4524: MS-Windows: cannot build with some sodium libraries
Commit: https://github.com/vim/vim/commit/d8f8629b1bf566e1dada7515e9b146c69e5d9757
Author: K.Takata <kentkt@csc.jp>
Date: Mon Mar 7 15:16:15 2022 +0000
patch 8.2.4524: MS-Windows: cannot build with some sodium libraries
Problem: MS-Windows: cannot build with some sodium libraries.
Solution: Make the DLL name configuragle. Add build instructions.
(Ken Takata, closes #9905)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Mon, 07 Mar 2022 16:30:04 +0100 |
parents | da660b0f20d1 |
children | cc1f2ef46aaa |
comparison
equal
deleted
inserted
replaced
27997:ceb745137863 | 27998:ef7d9789919d |
---|---|
668 endif | 668 endif |
669 endif | 669 endif |
670 | 670 |
671 ifdef SODIUM | 671 ifdef SODIUM |
672 DEFINES += -DHAVE_SODIUM | 672 DEFINES += -DHAVE_SODIUM |
673 ifneq ($(SODIUM),yes) | 673 ifeq ($(SODIUM),yes) |
674 SODIUM_DLL = libsodium-23.dll | |
675 else | |
676 SODIUM_DLL = libsodium.dll | |
674 CFLAGS += -I $(SODIUM)/include | 677 CFLAGS += -I $(SODIUM)/include |
675 endif | 678 endif |
676 ifndef DYNAMIC_SODIUM | 679 ifndef DYNAMIC_SODIUM |
677 DYNAMIC_SODIUM=yes | 680 DYNAMIC_SODIUM=yes |
678 endif | 681 endif |
679 ifeq ($(DYNAMIC_SODIUM),yes) | 682 ifeq ($(DYNAMIC_SODIUM),yes) |
680 DEFINES += -DDYNAMIC_SODIUM | 683 DEFINES += -DDYNAMIC_SODIUM -DDYNAMIC_SODIUM_DLL=\"$(SODIUM_DLL)\" |
681 else | 684 else |
682 SODIUMLIB = -lsodium | 685 SODIUMLIB = -lsodium |
683 endif | 686 endif |
684 endif | 687 endif |
685 | 688 |