Mercurial > vim

comparison src/Make_mvc.mak @ 27231:e1cedf009920 v8.2.4144

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.4144: cannot load libsodium dynamically Commit: https://github.com/vim/vim/commit/1a8825d7a3484d76ca16ea2aa9769cadca7758a4 Author: K.Takata <kentkt@csc.jp> Date: Wed Jan 19 13:32:57 2022 +0000 patch 8.2.4144: cannot load libsodium dynamically Problem: Cannot load libsodium dynamically. Solution: Support dynamic loading on MS-Windows. (Ken Takata, closes https://github.com/vim/vim/issues/9554)
author Bram Moolenaar <Bram@vim.org>
date Wed, 19 Jan 2022 14:45:05 +0100
parents 01cd3323e4cf
children d5570658f18d
comparison
equal deleted inserted replaced
27230:c405d50702b1 27231:e1cedf009920
40 # Will also enable CHANNEL 40 # Will also enable CHANNEL
41 # 41 #
42 # Sound support: SOUND=yes (default is yes) 42 # Sound support: SOUND=yes (default is yes)
43 # 43 #
44 # Sodium support: SODIUM=[Path to Sodium directory] 44 # Sodium support: SODIUM=[Path to Sodium directory]
45 # Dynamic built with libsodium 45 # DYNAMIC_SODIUM=yes (to load the Sodium DLL dynamically)
46 # You need to install the msvc package from 46 # You need to install the msvc package from
47 # https://download.libsodium.org/libsodium/releases/ 47 # https://download.libsodium.org/libsodium/releases/
48 # and package the libsodium.dll with Vim 48 # and package the libsodium.dll with Vim
49 # 49 #
50 # 50 #
51 # DLL support (EXPERIMENTAL): VIMDLL=yes (default is no) 51 # DLL support (EXPERIMENTAL): VIMDLL=yes (default is no)
52 # Creates vim{32,64}.dll, and stub gvim.exe and vim.exe. 52 # Creates vim{32,64}.dll, and stub gvim.exe and vim.exe.
53 # The shared codes between the GUI and the console are built into 53 # The shared codes between the GUI and the console are built into
382 !endif 382 !endif
383 383
384 !ifndef SODIUM 384 !ifndef SODIUM
385 SODIUM = no 385 SODIUM = no
386 !endif 386 !endif
387 !ifndef DYNAMIC_SODIUM
388 DYNAMIC_SODIUM = yes
389 !endif
387 390
388 !if "$(SODIUM)" != "no" 391 !if "$(SODIUM)" != "no"
389 ! if "$(CPU)" == "AMD64" 392 ! if "$(CPU)" == "AMD64"
390 SOD_LIB = $(SODIUM)\x64\Release\v140\dynamic 393 SOD_LIB = $(SODIUM)\x64\Release\v140\dynamic
391 ! elseif "$(CPU)" == "i386" 394 ! elseif "$(CPU)" == "i386"
395 ! endif 398 ! endif
396 !endif 399 !endif
397 400
398 !if "$(SODIUM)" != "no" 401 !if "$(SODIUM)" != "no"
399 SOD_INC = /I "$(SODIUM)\include" 402 SOD_INC = /I "$(SODIUM)\include"
403 ! if "$(DYNAMIC_SODIUM)" == "yes"
404 SOD_DEFS = -DHAVE_SODIUM -DDYNAMIC_SODIUM
405 SOD_LIB =
406 ! else
400 SOD_DEFS = -DHAVE_SODIUM 407 SOD_DEFS = -DHAVE_SODIUM
401 SOD_LIB = $(SOD_LIB)\libsodium.lib 408 SOD_LIB = $(SOD_LIB)\libsodium.lib
409 ! endif
402 !endif 410 !endif
403 411
404 !ifndef NETBEANS 412 !ifndef NETBEANS
405 NETBEANS = $(GUI) 413 NETBEANS = $(GUI)
406 !endif 414 !endif