[OMPT-svn-commit] OpenMPT r22713 - in branches/OpenMPT-1.29: . build/make

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

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

Log:
[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. See r22707.

Modified:
   branches/OpenMPT-1.29/   (props changed)
   branches/OpenMPT-1.29/build/make/config-mingw64-win32.mk
   branches/OpenMPT-1.29/build/make/config-mingw64-win64.mk
   branches/OpenMPT-1.29/build/make/config-mingw64-winrt-amd64.mk
   branches/OpenMPT-1.29/build/make/config-mingw64-winrt-x86.mk

Modified: branches/OpenMPT-1.29/build/make/config-mingw64-win32.mk
==============================================================================
--- branches/OpenMPT-1.29/build/make/config-mingw64-win32.mk	Thu Jan  2 22:50:55 2025	(r22712)
+++ branches/OpenMPT-1.29/build/make/config-mingw64-win32.mk	Thu Jan  2 22:52:36 2025	(r22713)
@@ -9,7 +9,7 @@
 CXXFLAGS += $(CXXFLAGS_STDCXX)
 CFLAGS += $(CFLAGS_STDC)
 
-CPPFLAGS += -DWIN32 -D_WIN32
+CPPFLAGS += -DWIN32 -D_WIN32 -D_UNICODE
 CXXFLAGS += -municode -mconsole
 CFLAGS   += -municode -mconsole
 LDFLAGS  +=

Modified: branches/OpenMPT-1.29/build/make/config-mingw64-win64.mk
==============================================================================
--- branches/OpenMPT-1.29/build/make/config-mingw64-win64.mk	Thu Jan  2 22:50:55 2025	(r22712)
+++ branches/OpenMPT-1.29/build/make/config-mingw64-win64.mk	Thu Jan  2 22:52:36 2025	(r22713)
@@ -9,7 +9,7 @@
 CXXFLAGS += $(CXXFLAGS_STDCXX)
 CFLAGS += $(CFLAGS_STDC)
 
-CPPFLAGS += -DWIN32 -D_WIN32 -DWIN64 -D_WIN64
+CPPFLAGS += -DWIN32 -D_WIN32 -DWIN64 -D_WIN64 -D_UNICODE
 CXXFLAGS += -municode -mconsole 
 CFLAGS   += -municode -mconsole 
 LDFLAGS  +=

Modified: branches/OpenMPT-1.29/build/make/config-mingw64-winrt-amd64.mk
==============================================================================
--- branches/OpenMPT-1.29/build/make/config-mingw64-winrt-amd64.mk	Thu Jan  2 22:50:55 2025	(r22712)
+++ branches/OpenMPT-1.29/build/make/config-mingw64-winrt-amd64.mk	Thu Jan  2 22:52:36 2025	(r22713)
@@ -9,7 +9,7 @@
 CXXFLAGS += $(CXXFLAGS_STDCXX)
 CFLAGS += $(CFLAGS_STDC)
 
-CPPFLAGS += -DWIN32 -D_WIN32 -DWIN64 -D_WIN64 -DWINAPI_FAMILY=0x2 -D_WIN32_WINNT=0x0602
+CPPFLAGS += -DWIN32 -D_WIN32 -DWIN64 -D_WIN64 -D_UNICODE -DWINAPI_FAMILY=0x2 -D_WIN32_WINNT=0x0602
 CXXFLAGS += -municode -mconsole 
 CFLAGS   += -municode -mconsole 
 LDFLAGS  +=

Modified: branches/OpenMPT-1.29/build/make/config-mingw64-winrt-x86.mk
==============================================================================
--- branches/OpenMPT-1.29/build/make/config-mingw64-winrt-x86.mk	Thu Jan  2 22:50:55 2025	(r22712)
+++ branches/OpenMPT-1.29/build/make/config-mingw64-winrt-x86.mk	Thu Jan  2 22:52:36 2025	(r22713)
@@ -9,7 +9,7 @@
 CXXFLAGS += $(CXXFLAGS_STDCXX)
 CFLAGS += $(CFLAGS_STDC)
 
-CPPFLAGS += -DWIN32 -D_WIN32 -DWINAPI_FAMILY=0x2 -D_WIN32_WINNT=0x0602
+CPPFLAGS += -DWIN32 -D_WIN32 -D_UNICODE -DWINAPI_FAMILY=0x2 -D_WIN32_WINNT=0x0602
 CXXFLAGS += -municode -mconsole
 CFLAGS   += -municode -mconsole
 LDFLAGS  +=