[OMPT-svn-commit] OpenMPT r20684 - trunk/OpenMPT/build/make

[<sv...@op...>]

Author: manx
Date: Mon Apr 29 10:22:54 2024
New Revision: 20684
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20684

Log:
[New] build: Makefile: MinGW-w64: Add WINDOWS_CRT option with values [crtdll,msvcrt,ucrt].

Modified:
   trunk/OpenMPT/build/make/config-mingw-w64.mk

Modified: trunk/OpenMPT/build/make/config-mingw-w64.mk
==============================================================================
--- trunk/OpenMPT/build/make/config-mingw-w64.mk	Sun Apr 28 20:59:21 2024	(r20683)
+++ trunk/OpenMPT/build/make/config-mingw-w64.mk	Mon Apr 29 10:22:54 2024	(r20684)
@@ -13,17 +13,27 @@
 $(error unknown WINDOWS_ARCH)
 endif
 
+ifeq ($(WINDOWS_CRT),)
+MINGW_CRT = mingw32
+else ifeq ($(WINDOWS_CRT),crtdll)
+MINGW_CRT = mingw32crt
+else ifeq ($(WINDOWS_CRT),msvcrt)
+MINGW_CRT = mingw32
+else ifeq ($(WINDOWS_CRT),ucrt)
+MINGW_CRT = mingw32ucrt
+endif
+
 ifeq ($(origin CC),default)
-CC  = $(MINGW_ARCH)-w64-mingw32-gcc$(MINGW_FLAVOUR)
+CC  = $(MINGW_ARCH)-w64-$(MINGW_CRT)-gcc$(MINGW_FLAVOUR)
 endif
 ifeq ($(origin CXX),default)
-CXX = $(MINGW_ARCH)-w64-mingw32-g++$(MINGW_FLAVOUR)
+CXX = $(MINGW_ARCH)-w64-$(MINGW_CRT)-g++$(MINGW_FLAVOUR)
 endif
 ifeq ($(origin LD),default)
 LD  = $(CXX)
 endif
 ifeq ($(origin AR),default)
-AR  = $(MINGW_ARCH)-w64-mingw32-ar$(MINGW_FLAVOUR)
+AR  = $(MINGW_ARCH)-w64-$(MINGW_CRT)-ar$(MINGW_FLAVOUR)
 endif
 
 ifneq ($(STDCXX),)