[OMPT-svn-commit] OpenMPT r20687 - in branches/OpenMPT-1.31: . build/make doc/libopenmpt

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

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

Log:
Merged revision(s) 20684-20686 from trunk/OpenMPT:
[New] build: Makefile: MinGW-w64: Add WINDOWS_CRT option with values [crtdll,msvcrt,ucrt].
........
[Doc] libopenmpt: Update changelog.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/build/make/config-mingw-w64.mk
   branches/OpenMPT-1.31/doc/libopenmpt/changelog.md

Modified: branches/OpenMPT-1.31/build/make/config-mingw-w64.mk
==============================================================================
--- branches/OpenMPT-1.31/build/make/config-mingw-w64.mk	Mon Apr 29 10:34:31 2024	(r20686)
+++ branches/OpenMPT-1.31/build/make/config-mingw-w64.mk	Mon Apr 29 11:05:22 2024	(r20687)
@@ -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),)

Modified: branches/OpenMPT-1.31/doc/libopenmpt/changelog.md
==============================================================================
--- branches/OpenMPT-1.31/doc/libopenmpt/changelog.md	Mon Apr 29 10:34:31 2024	(r20686)
+++ branches/OpenMPT-1.31/doc/libopenmpt/changelog.md	Mon Apr 29 11:05:22 2024	(r20687)
@@ -11,6 +11,9 @@
     `libopenmpt/bindings/freebasic/libopenmpt_ext.bi` were missing from the
     Autotools package.
 
+ *  [**New**] New `Makefile` `CONFIG=mingw-w64` option
+    `WINDOWS_CRT=[crtdll,msvcrt,ucrt]` to select the toolchain CRT library.
+
  *  M15: Loosen SoundTracker file rejection heuristics a bit to allow loading of
     schmokk.mod and scramble_2.mod. Other heuristics has been tightened a bit.
  *  MOD: Change VBlank timing heuristic to always assume CIA timing when long