Mercurial > mxe-octave

diff src/mingw-w64.mk @ 5961:7c0066684448

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add support for building with UCRT on Windows. * configure.ac: Add new configure switch "--with-windows-msvcrt". It can be set to "msvcrt" (default) or "ucrt". * Makefile.in: Make configure result of new switch available in makefile rules. * src/mingw-w64.mk, src/build-gcc.mk: Select CRT when installing system headers and when compiling system runtime. See also: https://octave.discourse.group/t/1821
author Markus Mützel <markus.muetzel@gmx.de>
date Thu, 18 Nov 2021 14:49:26 +0100
parents ec73307e819c
children 15322fbad67c
line wrap: on
line diff
--- a/src/mingw-w64.mk	Sun Nov 21 12:29:36 2021 +0100
+++ b/src/mingw-w64.mk	Thu Nov 18 14:49:26 2021 +0100
@@ -22,6 +22,12 @@
   $(PKG)_WINAPI_VERSION_FLAGS := --with-default-win32-winnt=0x0601
 endif
 
+ifneq ($(HOST_MSVCRT),ucrt)
+  $(PKG)_DEFAULT_MSVCRT := --with-default-msvcrt=msvcrt
+else
+  $(PKG)_DEFAULT_MSVCRT := --with-default-msvcrt=ucrt
+endif
+
 define $(PKG)_BUILD
   mkdir '$(1).headers-build'
   cd '$(1).headers-build' && '$(1)/mingw-w64-headers/configure' \
@@ -30,7 +36,8 @@
     --enable-sdk=all \
     --enable-idl \
     --enable-secure-api \
-    $($(PKG)_WINAPI_VERSION_FLAGS)
+    $($(PKG)_WINAPI_VERSION_FLAGS) \
+    $($(PKG)_DEFAULT_MSVCRT)
 
   $(MAKE) -C '$(1).headers-build' install
 endef