Mercurial > vim

comparison src/Make_cyg_ming.mak @ 27486:c7e18e99dbe8 v8.2.4271

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.4271: MS-Windows: cannot build with Ruby 3.1.0 Commit: https://github.com/vim/vim/commit/1f47a287ee4f8b1d007dff878b23dd0cd6104f38 Author: K.Takata <kentkt@csc.jp> Date: Mon Jan 31 13:25:36 2022 +0000 patch 8.2.4271: MS-Windows: cannot build with Ruby 3.1.0 Problem: MS-Windows: cannot build with Ruby 3.1.0. Solution: Adjust the DLL name and include directory. (Ken Takata, closes #9666)
author Bram Moolenaar <Bram@vim.org>
date Mon, 31 Jan 2022 14:30:04 +0100
parents ee1019e59bef
children e9e493983e11
comparison
equal deleted inserted replaced
27485:0226a849fd5b 27486:c7e18e99dbe8
464 RUBY_PLATFORM = i586-mswin32 464 RUBY_PLATFORM = i586-mswin32
465 else ifneq ($(wildcard $(RUBY)/lib/ruby/$(RUBY_API_VER_LONG)/i386-mingw32),) 465 else ifneq ($(wildcard $(RUBY)/lib/ruby/$(RUBY_API_VER_LONG)/i386-mingw32),)
466 RUBY_PLATFORM = i386-mingw32 466 RUBY_PLATFORM = i386-mingw32
467 else ifneq ($(wildcard $(RUBY)/lib/ruby/$(RUBY_API_VER_LONG)/x64-mingw32),) 467 else ifneq ($(wildcard $(RUBY)/lib/ruby/$(RUBY_API_VER_LONG)/x64-mingw32),)
468 RUBY_PLATFORM = x64-mingw32 468 RUBY_PLATFORM = x64-mingw32
469 else ifneq ($(wildcard $(RUBY)/lib/ruby/$(RUBY_API_VER_LONG)/x64-mingw-ucrt),)
470 RUBY_PLATFORM = x64-mingw-ucrt
469 else 471 else
470 RUBY_PLATFORM = i386-mswin32 472 RUBY_PLATFORM = i386-mswin32
471 endif 473 endif
472 endif 474 endif
473 475
477 else 479 else
478 ifndef RUBY_MSVCRT_NAME 480 ifndef RUBY_MSVCRT_NAME
479 # Base name of msvcrXX.dll which is used by ruby's dll. 481 # Base name of msvcrXX.dll which is used by ruby's dll.
480 RUBY_MSVCRT_NAME = msvcrt 482 RUBY_MSVCRT_NAME = msvcrt
481 endif 483 endif
482 ifeq ($(ARCH),x86-64) 484 ifeq ($(RUBY_PLATFORM),x64-mingw-ucrt)
485 RUBY_INSTALL_NAME = x64-ucrt-ruby$(RUBY_API_VER)
486 else ifeq ($(ARCH),x86-64)
483 RUBY_INSTALL_NAME = x64-$(RUBY_MSVCRT_NAME)-ruby$(RUBY_API_VER) 487 RUBY_INSTALL_NAME = x64-$(RUBY_MSVCRT_NAME)-ruby$(RUBY_API_VER)
484 else 488 else
485 RUBY_INSTALL_NAME = $(RUBY_MSVCRT_NAME)-ruby$(RUBY_API_VER) 489 RUBY_INSTALL_NAME = $(RUBY_MSVCRT_NAME)-ruby$(RUBY_API_VER)
486 endif 490 endif
487 endif 491 endif