[OMPT-svn-commit] OpenMPT r22711 - in branches/OpenMPT-1.30: . build/make

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

Author: manx
Date: Thu Jan  2 22:49:26 2025
New Revision: 22711
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22711

Log:
Merged revision(s) 22707 from trunk/OpenMPT:
[Fix] build: Makefile: MinGW-w64: MinGW does not define _UNICODE in its CRT headers when UNICODE is defined, like Microsoft does. #define _UNICODE manually when passing -municode.
........

Modified:
   branches/OpenMPT-1.30/   (props changed)
   branches/OpenMPT-1.30/build/make/config-mingw-w64.mk

Modified: branches/OpenMPT-1.30/build/make/config-mingw-w64.mk
==============================================================================
--- branches/OpenMPT-1.30/build/make/config-mingw-w64.mk	Thu Jan  2 22:48:59 2025	(r22710)
+++ branches/OpenMPT-1.30/build/make/config-mingw-w64.mk	Thu Jan  2 22:49:26 2025	(r22711)
@@ -33,10 +33,12 @@
 
 CPPFLAGS +=
 ifeq ($(MINGW_COMPILER),clang)
+CPPFLAGS += -D_UNICODE
 CXXFLAGS += -municode
 CFLAGS   += -municode
 LDFLAGS  += -mconsole -mthreads
 else
+CPPFLAGS += -D_UNICODE
 CXXFLAGS += -municode -mthreads
 CFLAGS   += -municode -mthreads
 LDFLAGS  += -mconsole