modplug-svn-commit Mailing List for modplug

A music tracker software for Windows.

Brought to you by: lpchip, manxorist, rewbs, saga-games

modplug-svn-commit — OpenMPT subversion commit notifications

You can subscribe to this list here.

2006	Jan	Feb	Mar (1)	Apr (1)	May	Jun (1)	Jul	Aug (10)	Sep	Oct	Nov	Dec (3)
2007	Jan (1)	Feb (2)	Mar (3)	Apr (2)	May (10)	Jun (2)	Jul (1)	Aug	Sep	Oct	Nov (3)	Dec
2008	Jan (6)	Feb (4)	Mar (5)	Apr (2)	May (1)	Jun (1)	Jul (4)	Aug (6)	Sep (2)	Oct (9)	Nov (1)	Dec (4)
2009	Jan (9)	Feb (2)	Mar (2)	Apr (2)	May (6)	Jun (18)	Jul (33)	Aug (39)	Sep (33)	Oct (24)	Nov (23)	Dec (22)
2010	Jan (29)	Feb (32)	Mar (51)	Apr (17)	May (31)	Jun (21)	Jul (32)	Aug (28)	Sep (35)	Oct (27)	Nov (11)	Dec (13)
2011	Jan (14)	Feb (13)	Mar (27)	Apr (27)	May (28)	Jun (20)	Jul (43)	Aug (52)	Sep (66)	Oct (61)	Nov (11)	Dec (8)
2012	Jan (20)	Feb (30)	Mar (38)	Apr (21)	May (33)	Jun (21)	Jul (25)	Aug (9)	Sep (24)	Oct (42)	Nov (27)	Dec (41)
2013	Jan (20)	Feb (35)	Mar (156)	Apr (298)	May (258)	Jun (201)	Jul (105)	Aug (60)	Sep (193)	Oct (245)	Nov (280)	Dec (194)
2014	Jan (63)	Feb (202)	Mar (200)	Apr (23)	May (53)	Jun (105)	Jul (18)	Aug (26)	Sep (110)	Oct (187)	Nov (97)	Dec (74)
2015	Jan (45)	Feb (55)	Mar (116)	Apr (116)	May (193)	Jun (164)	Jul (50)	Aug (111)	Sep (98)	Oct (71)	Nov (103)	Dec (63)
2016	Jan (33)	Feb (101)	Mar (182)	Apr (139)	May (140)	Jun (103)	Jul (165)	Aug (286)	Sep (208)	Oct (127)	Nov (97)	Dec (54)
2017	Jan (64)	Feb (335)	Mar (202)	Apr (212)	May (139)	Jun (127)	Jul (294)	Aug (154)	Sep (170)	Oct (152)	Nov (156)	Dec (62)
2018	Jan (168)	Feb (237)	Mar (196)	Apr (174)	May (174)	Jun (161)	Jul (127)	Aug (88)	Sep (149)	Oct (66)	Nov (52)	Dec (135)
2019	Jan (146)	Feb (126)	Mar (104)	Apr (58)	May (60)	Jun (28)	Jul (197)	Aug (129)	Sep (141)	Oct (148)	Nov (63)	Dec (100)
2020	Jan (74)	Feb (37)	Mar (59)	Apr (154)	May (194)	Jun (133)	Jul (313)	Aug (197)	Sep (49)	Oct (162)	Nov (143)	Dec (57)
2021	Jan (120)	Feb (107)	Mar (314)	Apr (157)	May (524)	Jun (169)	Jul (72)	Aug (133)	Sep (135)	Oct (146)	Nov (198)	Dec (325)
2022	Jan (409)	Feb (249)	Mar (138)	Apr (95)	May (102)	Jun (221)	Jul (66)	Aug (120)	Sep (192)	Oct (131)	Nov (53)	Dec (171)
2023	Jan (357)	Feb (82)	Mar (168)	Apr (218)	May (196)	Jun (86)	Jul (115)	Aug (49)	Sep (190)	Oct (102)	Nov (45)	Dec (76)
2024	Jan (86)	Feb (50)	Mar (324)	Apr (209)	May (197)	Jun (232)	Jul (194)	Aug (247)	Sep (219)	Oct (266)	Nov (328)	Dec (304)
2025	Jan (191)	Feb (115)	Mar (137)	Apr (32)	May (126)	Jun (403)	Jul (213)	Aug (203)	Sep (148)	Oct (109)	Nov (191)	Dec (209)
2026	Jan (127)	Feb (123)	Mar (160)	Apr (141)	May (49)	Jun (55)	Jul (91)	Aug (191)	Sep	Oct (114)	Nov	Dec

Flat | Threaded

1 2 3 .. 1034 > >> (Page 1 of 1034)

[OMPT-svn-commit] OpenMPT r25801 - trunk/OpenMPT

From: <sv...@op...> - 2026-10-24 21:16:15

Author: manx
Date: Sat Oct 24 23:16:06 2026
New Revision: 25801
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=25801

Log:
[Var] Update gitignore.

Modified:
   trunk/OpenMPT/.gitignore

Modified: trunk/OpenMPT/.gitignore
==============================================================================
--- trunk/OpenMPT/.gitignore	Fri Oct 23 19:55:10 2026	(r25800)
+++ trunk/OpenMPT/.gitignore	Sat Oct 24 23:16:06 2026	(r25801)
@@ -286,6 +286,7 @@
 /include/flac/src/share/win_utf8_io/win_utf8_io_static.vcproj
 /include/flac/src/share/win_utf8_io/win_utf8_io_static.vcxproj
 /include/flac/src/share/win_utf8_io/win_utf8_io_static.vcxproj.filters
+/include/lame/ABOUT-NLS
 /include/lame/ACM
 /include/lame/API
 /include/lame/ChangeLog
@@ -313,6 +314,7 @@
 /include/lame/config.rpath
 /include/lame/config.sub
 /include/lame/configure
+/include/lame/configure.ac
 /include/lame/configure.in
 /include/lame/debian
 /include/lame/depcomp
@@ -324,6 +326,7 @@
 /include/lame/lame.spec
 /include/lame/lame.spec.in
 /include/lame/ltmain.sh
+/include/lame/m4
 /include/lame/mac
 /include/lame/macosx
 /include/lame/misc

[OMPT-svn-commit] OpenMPT r25800 - in branches/OpenMPT-1.31: . .github/workflows

From: <sv...@op...> - 2026-10-23 17:55:18

Author: manx
Date: Fri Oct 23 19:55:10 2026
New Revision: 25800
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=25800

Log:
Merged revision(s) 25798 from trunk/OpenMPT:
[Fix] build: CI: GitHub: CPA: OpenBSD: Autotools: Fix version selection for OpenBSD 8.0.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/.github/workflows/OpenBSD-Autotools.yml

Modified: branches/OpenMPT-1.31/.github/workflows/OpenBSD-Autotools.yml
==============================================================================
--- branches/OpenMPT-1.31/.github/workflows/OpenBSD-Autotools.yml	Fri Oct 23 19:54:51 2026	(r25799)
+++ branches/OpenMPT-1.31/.github/workflows/OpenBSD-Autotools.yml	Fri Oct 23 19:55:10 2026	(r25800)
@@ -49,4 +49,4 @@
     - name: Build
       shell: cpa.sh {0} --sync-files none
       run: |
-        export MAKEFLAGS="-j$(sysctl -n hw.ncpu)"; ${{ (matrix.version == '8.0') && 'export AUTOCONF_VERSION=2.73' || (matrix.version == '7.9') && 'export AUTOCONF_VERSION=2.72' || (matrix.version == '7.8') && 'export AUTOCONF_VERSION=2.72' || (matrix.version == '7.7') && 'export AUTOCONF_VERSION=2.72' || (matrix.version == '7.6') && 'export AUTOCONF_VERSION=2.72' || (matrix.version == '7.5') && 'export AUTOCONF_VERSION=2.71' || (matrix.version == '7.4') && 'export AUTOCONF_VERSION=2.71' || '' }} ; ${{ (matrix.version == '7.9') && 'export AUTOMAKE_VERSION=1.18' || (matrix.version == '7.8') && 'export AUTOMAKE_VERSION=1.18' || (matrix.version == '7.7') && 'export AUTOMAKE_VERSION=1.17' || (matrix.version == '7.6') && 'export AUTOMAKE_VERSION=1.16' || (matrix.version == '7.5') && 'export AUTOMAKE_VERSION=1.16' || (matrix.version == '7.4') && 'export AUTOMAKE_VERSION=1.16' || '' }} ;./build/autotools/autoconfiscate.sh
+        export MAKEFLAGS="-j$(sysctl -n hw.ncpu)"; ${{ (matrix.version == '8.0') && 'export AUTOCONF_VERSION=2.73' || (matrix.version == '7.9') && 'export AUTOCONF_VERSION=2.72' || (matrix.version == '7.8') && 'export AUTOCONF_VERSION=2.72' || (matrix.version == '7.7') && 'export AUTOCONF_VERSION=2.72' || (matrix.version == '7.6') && 'export AUTOCONF_VERSION=2.72' || (matrix.version == '7.5') && 'export AUTOCONF_VERSION=2.71' || (matrix.version == '7.4') && 'export AUTOCONF_VERSION=2.71' || '' }} ; ${{ (matrix.version == '8.0') && 'export AUTOMAKE_VERSION=1.19' || (matrix.version == '7.9') && 'export AUTOMAKE_VERSION=1.18' || (matrix.version == '7.8') && 'export AUTOMAKE_VERSION=1.18' || (matrix.version == '7.7') && 'export AUTOMAKE_VERSION=1.17' || (matrix.version == '7.6') && 'export AUTOMAKE_VERSION=1.16' || (matrix.version == '7.5') && 'export AUTOMAKE_VERSION=1.16' || (matrix.version == '7.4') && 'export AUTOMAKE_VERSION=1.16' || '' }} ;./build/autotools/autoconfiscate.sh

[OMPT-svn-commit] OpenMPT r25799 - in branches/OpenMPT-1.32: . .github/workflows

From: <sv...@op...> - 2026-10-23 17:54:58

Author: manx
Date: Fri Oct 23 19:54:51 2026
New Revision: 25799
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=25799

Log:
Merged revision(s) 25798 from trunk/OpenMPT:
[Fix] build: CI: GitHub: CPA: OpenBSD: Autotools: Fix version selection for OpenBSD 8.0.
........

Modified:
   branches/OpenMPT-1.32/   (props changed)
   branches/OpenMPT-1.32/.github/workflows/OpenBSD-Autotools.yml

Modified: branches/OpenMPT-1.32/.github/workflows/OpenBSD-Autotools.yml
==============================================================================
--- branches/OpenMPT-1.32/.github/workflows/OpenBSD-Autotools.yml	Fri Oct 23 19:54:31 2026	(r25798)
+++ branches/OpenMPT-1.32/.github/workflows/OpenBSD-Autotools.yml	Fri Oct 23 19:54:51 2026	(r25799)
@@ -49,4 +49,4 @@
     - name: Build
       shell: cpa.sh {0} --sync-files none
       run: |
-        export MAKEFLAGS="-j$(sysctl -n hw.ncpu)"; ${{ (matrix.version == '8.0') && 'export AUTOCONF_VERSION=2.73' || (matrix.version == '7.9') && 'export AUTOCONF_VERSION=2.72' || (matrix.version == '7.8') && 'export AUTOCONF_VERSION=2.72' || (matrix.version == '7.7') && 'export AUTOCONF_VERSION=2.72' || (matrix.version == '7.6') && 'export AUTOCONF_VERSION=2.72' || (matrix.version == '7.5') && 'export AUTOCONF_VERSION=2.71' || (matrix.version == '7.4') && 'export AUTOCONF_VERSION=2.71' || '' }} ; ${{ (matrix.version == '7.9') && 'export AUTOMAKE_VERSION=1.18' || (matrix.version == '7.8') && 'export AUTOMAKE_VERSION=1.18' || (matrix.version == '7.7') && 'export AUTOMAKE_VERSION=1.17' || (matrix.version == '7.6') && 'export AUTOMAKE_VERSION=1.16' || (matrix.version == '7.5') && 'export AUTOMAKE_VERSION=1.16' || (matrix.version == '7.4') && 'export AUTOMAKE_VERSION=1.16' || '' }} ;./build/autotools/autoconfiscate.sh
+        export MAKEFLAGS="-j$(sysctl -n hw.ncpu)"; ${{ (matrix.version == '8.0') && 'export AUTOCONF_VERSION=2.73' || (matrix.version == '7.9') && 'export AUTOCONF_VERSION=2.72' || (matrix.version == '7.8') && 'export AUTOCONF_VERSION=2.72' || (matrix.version == '7.7') && 'export AUTOCONF_VERSION=2.72' || (matrix.version == '7.6') && 'export AUTOCONF_VERSION=2.72' || (matrix.version == '7.5') && 'export AUTOCONF_VERSION=2.71' || (matrix.version == '7.4') && 'export AUTOCONF_VERSION=2.71' || '' }} ; ${{ (matrix.version == '8.0') && 'export AUTOMAKE_VERSION=1.19' || (matrix.version == '7.9') && 'export AUTOMAKE_VERSION=1.18' || (matrix.version == '7.8') && 'export AUTOMAKE_VERSION=1.18' || (matrix.version == '7.7') && 'export AUTOMAKE_VERSION=1.17' || (matrix.version == '7.6') && 'export AUTOMAKE_VERSION=1.16' || (matrix.version == '7.5') && 'export AUTOMAKE_VERSION=1.16' || (matrix.version == '7.4') && 'export AUTOMAKE_VERSION=1.16' || '' }} ;./build/autotools/autoconfiscate.sh

[OMPT-svn-commit] OpenMPT r25798 - trunk/OpenMPT/.github/workflows

From: <sv...@op...> - 2026-10-23 17:54:39

Author: manx
Date: Fri Oct 23 19:54:31 2026
New Revision: 25798
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=25798

Log:
[Fix] build: CI: GitHub: CPA: OpenBSD: Autotools: Fix version selection for OpenBSD 8.0.

Modified:
   trunk/OpenMPT/.github/workflows/OpenBSD-Autotools.yml

Modified: trunk/OpenMPT/.github/workflows/OpenBSD-Autotools.yml
==============================================================================
--- trunk/OpenMPT/.github/workflows/OpenBSD-Autotools.yml	Fri Oct 23 18:52:56 2026	(r25797)
+++ trunk/OpenMPT/.github/workflows/OpenBSD-Autotools.yml	Fri Oct 23 19:54:31 2026	(r25798)
@@ -51,4 +51,4 @@
     - name: Build
       shell: cpa.sh {0} --sync-files none
       run: |
-        export MAKEFLAGS="-j$(sysctl -n hw.ncpu)"; ${{ (matrix.version == '8.0') && 'export AUTOCONF_VERSION=2.73' || (matrix.version == '7.9') && 'export AUTOCONF_VERSION=2.72' || (matrix.version == '7.8') && 'export AUTOCONF_VERSION=2.72' || (matrix.version == '7.7') && 'export AUTOCONF_VERSION=2.72' || (matrix.version == '7.6') && 'export AUTOCONF_VERSION=2.72' || (matrix.version == '7.5') && 'export AUTOCONF_VERSION=2.71' || (matrix.version == '7.4') && 'export AUTOCONF_VERSION=2.71' || '' }} ; ${{ (matrix.version == '7.9') && 'export AUTOMAKE_VERSION=1.18' || (matrix.version == '7.8') && 'export AUTOMAKE_VERSION=1.18' || (matrix.version == '7.7') && 'export AUTOMAKE_VERSION=1.17' || (matrix.version == '7.6') && 'export AUTOMAKE_VERSION=1.16' || (matrix.version == '7.5') && 'export AUTOMAKE_VERSION=1.16' || (matrix.version == '7.4') && 'export AUTOMAKE_VERSION=1.16' || '' }} ;./build/autotools/autoconfiscate.sh
+        export MAKEFLAGS="-j$(sysctl -n hw.ncpu)"; ${{ (matrix.version == '8.0') && 'export AUTOCONF_VERSION=2.73' || (matrix.version == '7.9') && 'export AUTOCONF_VERSION=2.72' || (matrix.version == '7.8') && 'export AUTOCONF_VERSION=2.72' || (matrix.version == '7.7') && 'export AUTOCONF_VERSION=2.72' || (matrix.version == '7.6') && 'export AUTOCONF_VERSION=2.72' || (matrix.version == '7.5') && 'export AUTOCONF_VERSION=2.71' || (matrix.version == '7.4') && 'export AUTOCONF_VERSION=2.71' || '' }} ; ${{ (matrix.version == '8.0') && 'export AUTOMAKE_VERSION=1.19' || (matrix.version == '7.9') && 'export AUTOMAKE_VERSION=1.18' || (matrix.version == '7.8') && 'export AUTOMAKE_VERSION=1.18' || (matrix.version == '7.7') && 'export AUTOMAKE_VERSION=1.17' || (matrix.version == '7.6') && 'export AUTOMAKE_VERSION=1.16' || (matrix.version == '7.5') && 'export AUTOMAKE_VERSION=1.16' || (matrix.version == '7.4') && 'export AUTOMAKE_VERSION=1.16' || '' }} ;./build/autotools/autoconfiscate.sh

[OMPT-svn-commit] OpenMPT r25797 - in trunk/OpenMPT: mptrack src/openmpt/streamencoder

From: <sv...@op...> - 2026-10-23 16:53:03

Author: manx
Date: Fri Oct 23 18:52:56 2026
New Revision: 25797
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=25797

Log:
[Imp] openmpt/streamencoder/StreamEncoderMP3.cpp: Support writing ID3v2.4 tags with LAME API.
[Imp] Stream Encoder: Add new hidden setting [Export]MP3LameID3v2Version=4 to select ID3v2 version (2.3 or 2.4) when using LAME API.

Modified:
   trunk/OpenMPT/mptrack/StreamEncoderSettings.cpp
   trunk/OpenMPT/mptrack/StreamEncoderSettings.h
   trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoder.hpp
   trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderMP3.cpp

Modified: trunk/OpenMPT/mptrack/StreamEncoderSettings.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/StreamEncoderSettings.cpp	Fri Oct 23 18:48:22 2026	(r25796)
+++ trunk/OpenMPT/mptrack/StreamEncoderSettings.cpp	Fri Oct 23 18:52:56 2026	(r25797)
@@ -76,6 +76,7 @@
 	, MP3ID3v2WriteReplayGainTXXX(conf, section, U_("MP3ID3v2WriteReplayGainTXXX"), Encoder::StreamSettings().MP3ID3v2WriteReplayGainTXXX)
 	, MP3LameQuality(conf, section, U_("MP3LameQuality"), Encoder::StreamSettings().MP3LameQuality)
 	, MP3LameID3v2UseLame(conf, section, U_("MP3LameID3v2UseLame"), Encoder::StreamSettings().MP3LameID3v2UseLame)
+	, MP3LameID3v2Version(conf, section, U_("MP3LameID3v2Version"), Encoder::StreamSettings().MP3LameID3v2Version)
 	, MP3LameCalculateReplayGain(conf, section, U_("MP3LameCalculateReplayGain"), Encoder::StreamSettings().MP3LameCalculateReplayGain)
 	, MP3LameCalculatePeakSample(conf, section, U_("MP3LameCalculatePeakSample"), Encoder::StreamSettings().MP3LameCalculatePeakSample)
 	, OpusComplexity(conf, section, U_("OpusComplexity"), Encoder::StreamSettings().OpusComplexity)
@@ -95,6 +96,7 @@
 	result.MP3ID3v2WriteReplayGainTXXX = MP3ID3v2WriteReplayGainTXXX;
 	result.MP3LameQuality = MP3LameQuality;
 	result.MP3LameID3v2UseLame = MP3LameID3v2UseLame;
+	result.MP3LameID3v2Version = MP3LameID3v2Version;
 	result.MP3LameCalculateReplayGain = MP3LameCalculateReplayGain;
 	result.MP3LameCalculatePeakSample = MP3LameCalculatePeakSample;
 	result.OpusComplexity = OpusComplexity;

Modified: trunk/OpenMPT/mptrack/StreamEncoderSettings.h
==============================================================================
--- trunk/OpenMPT/mptrack/StreamEncoderSettings.h	Fri Oct 23 18:48:22 2026	(r25796)
+++ trunk/OpenMPT/mptrack/StreamEncoderSettings.h	Fri Oct 23 18:52:56 2026	(r25797)
@@ -103,6 +103,7 @@
 	Setting<bool> MP3ID3v2WriteReplayGainTXXX;
 	Setting<int32> MP3LameQuality;
 	Setting<bool> MP3LameID3v2UseLame;
+	Setting<uint8> MP3LameID3v2Version;
 	Setting<bool> MP3LameCalculateReplayGain;
 	Setting<bool> MP3LameCalculatePeakSample;
 	Setting<int32> OpusComplexity;

Modified: trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoder.hpp
==============================================================================
--- trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoder.hpp	Fri Oct 23 18:48:22 2026	(r25796)
+++ trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoder.hpp	Fri Oct 23 18:52:56 2026	(r25797)
@@ -220,6 +220,7 @@
 	bool MP3ID3v2WriteReplayGainTXXX = true;
 	int32 MP3LameQuality = 3;  // 0
 	bool MP3LameID3v2UseLame = false;
+	uint8 MP3LameID3v2Version = 4;
 	bool MP3LameCalculateReplayGain = true;
 	bool MP3LameCalculatePeakSample = true;
 	int32 OpusComplexity = -1;  // 10

Modified: trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderMP3.cpp
==============================================================================
--- trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderMP3.cpp	Fri Oct 23 18:48:22 2026	(r25796)
+++ trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderMP3.cpp	Fri Oct 23 18:52:56 2026	(r25797)
@@ -414,7 +414,8 @@
 	{
 		ID3None,
 		ID3v1,
-		ID3v2Lame,
+		ID3v2Lamev23,
+		ID3v2Lamev24,
 		ID3v2OpenMPT,
 	};
 	ID3Type id3type;
@@ -442,7 +443,7 @@
 		Mode = Encoder::ModeInvalid;
 		gfp_inited = false;
 		gfp = lame_t();
-		id3type = ID3v2Lame;
+		id3type = ID3v2Lamev23;
 		id3v2Size = 0;
 
 		if(!gfp)
@@ -457,9 +458,12 @@
 			if(compatible)
 			{
 				id3type = ID3v1;
-			} else if(settings.Details.MP3LameID3v2UseLame)
+			} else if(settings.Details.MP3LameID3v2UseLame && (settings.Details.MP3LameID3v2Version <= 3))
 			{
-				id3type = ID3v2Lame;
+				id3type = ID3v2Lamev23;
+			} else if(settings.Details.MP3LameID3v2UseLame && (settings.Details.MP3LameID3v2Version >= 4))
+			{
+				id3type = ID3v2Lamev24;
 			} else
 			{
 				id3type = ID3v2OpenMPT;
@@ -549,12 +553,18 @@
 				id3tag_init(gfp);
 				id3tag_v1_only(gfp);
 				break;
-			case ID3v2Lame:
+			case ID3v2Lamev23:
 				id3tag_init(gfp);
 				id3tag_add_v2(gfp);
 				id3tag_v2_only(gfp);
 				id3tag_set_pad(gfp, settings.Details.MP3ID3v2MinPadding);
 				break;
+			case ID3v2Lamev24:
+				id3tag_init(gfp);
+				id3tag_add_v2_4_UTF8(gfp);
+				id3tag_v2_4_UTF8_only(gfp);
+				id3tag_set_pad(gfp, settings.Details.MP3ID3v2MinPadding);
+				break;
 			case ID3v2OpenMPT:
 				lame_set_write_id3tag_automatic(gfp, 0);
 				break;
@@ -574,7 +584,7 @@
 				if(!tags.comments.empty()) id3tag_set_comment(gfp, mpt::transcode<std::string>(mpt::common_encoding::iso8859_1, tags.comments).c_str());
 				if(!tags.trackno.empty()) id3tag_set_track(gfp, mpt::transcode<std::string>(mpt::common_encoding::iso8859_1, tags.trackno).c_str());
 				if(!tags.genre.empty()) id3tag_set_genre(gfp, mpt::transcode<std::string>(mpt::common_encoding::iso8859_1, tags.genre).c_str());
-			} else if(id3type == ID3v2Lame)
+			} else if(id3type == ID3v2Lamev23)
 			{
 				if(!tags.title.empty()) id3tag_set_textinfo_utf16(gfp, "TIT2", ToUTF16BOMvector(mpt::transcode<std::u16string>(tags.title)).data());
 				if(!tags.artist.empty()) id3tag_set_textinfo_utf16(gfp, "TPE1", ToUTF16BOMvector(mpt::transcode<std::u16string>(tags.artist)).data());
@@ -583,6 +593,15 @@
 				if(!tags.comments.empty()) id3tag_set_textinfo_utf16(gfp, "COMM", ToUTF16BOMvector(mpt::transcode<std::u16string>(tags.comments)).data());
 				if(!tags.trackno.empty()) id3tag_set_textinfo_utf16(gfp, "TRCK", ToUTF16BOMvector(mpt::transcode<std::u16string>(tags.trackno)).data());
 				if(!tags.genre.empty()) id3tag_set_textinfo_utf16(gfp, "TCON", ToUTF16BOMvector(mpt::transcode<std::u16string>(tags.genre)).data());
+			} else if(id3type == ID3v2Lamev24)
+			{
+				if(!tags.title.empty()) id3tag_set_textinfo_utf8(gfp, "TIT2", mpt::transcode<std::string>(mpt::common_encoding::utf8, tags.title).c_str());
+				if(!tags.artist.empty()) id3tag_set_textinfo_utf8(gfp, "TPE1", mpt::transcode<std::string>(mpt::common_encoding::utf8, tags.artist).c_str());
+				if(!tags.album.empty()) id3tag_set_textinfo_utf8(gfp, "TALB", mpt::transcode<std::string>(mpt::common_encoding::utf8, tags.album).c_str());
+				if(!tags.year.empty()) id3tag_set_textinfo_utf8(gfp, "TYER", mpt::transcode<std::string>(mpt::common_encoding::utf8, tags.year).c_str());
+				if(!tags.comments.empty()) id3tag_set_textinfo_utf8(gfp, "COMM", mpt::transcode<std::string>(mpt::common_encoding::utf8, tags.comments).c_str());
+				if(!tags.trackno.empty()) id3tag_set_textinfo_utf8(gfp, "TRCK", mpt::transcode<std::string>(mpt::common_encoding::utf8, tags.trackno).c_str());
+				if(!tags.genre.empty()) id3tag_set_textinfo_utf8(gfp, "TCON", mpt::transcode<std::string>(mpt::common_encoding::utf8, tags.genre).c_str());
 			} else if(id3type == ID3v2OpenMPT)
 			{
 				Tags = tags;
@@ -662,7 +681,10 @@
 			tagger.WriteID3v2Tags(f, Tags, replayGain);
 			mpt::IO::SeekAbsolute(f, endPos);
 		}
-		if(id3type == ID3v2Lame)
+		if(id3type == ID3v2Lamev23)
+		{
+			id3v2Size = lame_get_id3v2_tag(gfp, nullptr, 0);
+		} else if(id3type == ID3v2Lamev24)
 		{
 			id3v2Size = lame_get_id3v2_tag(gfp, nullptr, 0);
 		} else if(id3type == ID3v2OpenMPT)

[OMPT-svn-commit] OpenMPT r25796 - in branches/OpenMPT-1.32: . src/openmpt/streamencoder

From: <sv...@op...> - 2026-10-23 16:48:30

Author: manx
Date: Fri Oct 23 18:48:22 2026
New Revision: 25796
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=25796

Log:
Merged revision(s) 25795 from trunk/OpenMPT:
[Fix] openmpt/streamencoder/StreamEncoderMP3.cpp: When writing ID3v2.3 tags using LAME API (this is not the default configuration), write full UTF16 instead of truncating to ISO8859-1.
........

Modified:
   branches/OpenMPT-1.32/   (props changed)
   branches/OpenMPT-1.32/src/openmpt/streamencoder/StreamEncoderMP3.cpp

Modified: branches/OpenMPT-1.32/src/openmpt/streamencoder/StreamEncoderMP3.cpp
==============================================================================
--- branches/OpenMPT-1.32/src/openmpt/streamencoder/StreamEncoderMP3.cpp	Fri Oct 23 18:47:53 2026	(r25795)
+++ branches/OpenMPT-1.32/src/openmpt/streamencoder/StreamEncoderMP3.cpp	Fri Oct 23 18:48:22 2026	(r25796)
@@ -420,6 +420,19 @@
 	ID3Type id3type;
 	mpt::IO::Offset id3v2Size;
 	FileTags Tags;
+private:
+	static std::vector<unsigned short> ToUTF16BOMvector(const std::u16string &str)
+	{
+		std::vector<unsigned short> result;
+		result.reserve(1 + str.length() + 1);
+		result.push_back(0xFEFFu);
+		for(const auto c : str)
+		{
+			result.push_back(static_cast<unsigned short>(c));
+		}
+		result.push_back(0);
+		return result;
+	}
 public:
 	MP3LameStreamWriter(std::ostream &stream, bool compatible, const Encoder::Settings &settings_, const FileTags &tags)
 		: StreamWriterBase(stream)
@@ -551,7 +564,7 @@
 
 		if(settings.Tags)
 		{
-			if(id3type == ID3v2Lame || id3type == ID3v1)
+			if(id3type == ID3v1)
 			{
 				// Lame API expects Latin1, which is sad, but we cannot change that.
 				if(!tags.title.empty()) id3tag_set_title(gfp, mpt::transcode<std::string>(mpt::common_encoding::iso8859_1, tags.title).c_str());
@@ -561,6 +574,15 @@
 				if(!tags.comments.empty()) id3tag_set_comment(gfp, mpt::transcode<std::string>(mpt::common_encoding::iso8859_1, tags.comments).c_str());
 				if(!tags.trackno.empty()) id3tag_set_track(gfp, mpt::transcode<std::string>(mpt::common_encoding::iso8859_1, tags.trackno).c_str());
 				if(!tags.genre.empty()) id3tag_set_genre(gfp, mpt::transcode<std::string>(mpt::common_encoding::iso8859_1, tags.genre).c_str());
+			} else if(id3type == ID3v2Lame)
+			{
+				if(!tags.title.empty()) id3tag_set_textinfo_utf16(gfp, "TIT2", ToUTF16BOMvector(mpt::transcode<std::u16string>(tags.title)).data());
+				if(!tags.artist.empty()) id3tag_set_textinfo_utf16(gfp, "TPE1", ToUTF16BOMvector(mpt::transcode<std::u16string>(tags.artist)).data());
+				if(!tags.album.empty()) id3tag_set_textinfo_utf16(gfp, "TALB", ToUTF16BOMvector(mpt::transcode<std::u16string>(tags.album)).data());
+				if(!tags.year.empty()) id3tag_set_textinfo_utf16(gfp, "TYER", ToUTF16BOMvector(mpt::transcode<std::u16string>(tags.year)).data());
+				if(!tags.comments.empty()) id3tag_set_textinfo_utf16(gfp, "COMM", ToUTF16BOMvector(mpt::transcode<std::u16string>(tags.comments)).data());
+				if(!tags.trackno.empty()) id3tag_set_textinfo_utf16(gfp, "TRCK", ToUTF16BOMvector(mpt::transcode<std::u16string>(tags.trackno)).data());
+				if(!tags.genre.empty()) id3tag_set_textinfo_utf16(gfp, "TCON", ToUTF16BOMvector(mpt::transcode<std::u16string>(tags.genre)).data());
 			} else if(id3type == ID3v2OpenMPT)
 			{
 				Tags = tags;

[OMPT-svn-commit] OpenMPT r25795 - trunk/OpenMPT/src/openmpt/streamencoder

From: <sv...@op...> - 2026-10-23 16:48:01

Author: manx
Date: Fri Oct 23 18:47:53 2026
New Revision: 25795
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=25795

Log:
[Fix] openmpt/streamencoder/StreamEncoderMP3.cpp: When writing ID3v2.3 tags using LAME API (this is not the default configuration), write full UTF16 instead of truncating to ISO8859-1.

Modified:
   trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderMP3.cpp

Modified: trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderMP3.cpp
==============================================================================
--- trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderMP3.cpp	Fri Oct 23 17:53:07 2026	(r25794)
+++ trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderMP3.cpp	Fri Oct 23 18:47:53 2026	(r25795)
@@ -420,6 +420,19 @@
 	ID3Type id3type;
 	mpt::IO::Offset id3v2Size;
 	FileTags Tags;
+private:
+	static std::vector<unsigned short> ToUTF16BOMvector(const std::u16string &str)
+	{
+		std::vector<unsigned short> result;
+		result.reserve(1 + str.length() + 1);
+		result.push_back(0xFEFFu);
+		for(const auto c : str)
+		{
+			result.push_back(static_cast<unsigned short>(c));
+		}
+		result.push_back(0);
+		return result;
+	}
 public:
 	MP3LameStreamWriter(std::ostream &stream, bool compatible, const Encoder::Settings &settings_, const FileTags &tags)
 		: StreamWriterBase(stream)
@@ -551,7 +564,7 @@
 
 		if(settings.Tags)
 		{
-			if(id3type == ID3v2Lame || id3type == ID3v1)
+			if(id3type == ID3v1)
 			{
 				// Lame API expects Latin1, which is sad, but we cannot change that.
 				if(!tags.title.empty()) id3tag_set_title(gfp, mpt::transcode<std::string>(mpt::common_encoding::iso8859_1, tags.title).c_str());
@@ -561,6 +574,15 @@
 				if(!tags.comments.empty()) id3tag_set_comment(gfp, mpt::transcode<std::string>(mpt::common_encoding::iso8859_1, tags.comments).c_str());
 				if(!tags.trackno.empty()) id3tag_set_track(gfp, mpt::transcode<std::string>(mpt::common_encoding::iso8859_1, tags.trackno).c_str());
 				if(!tags.genre.empty()) id3tag_set_genre(gfp, mpt::transcode<std::string>(mpt::common_encoding::iso8859_1, tags.genre).c_str());
+			} else if(id3type == ID3v2Lame)
+			{
+				if(!tags.title.empty()) id3tag_set_textinfo_utf16(gfp, "TIT2", ToUTF16BOMvector(mpt::transcode<std::u16string>(tags.title)).data());
+				if(!tags.artist.empty()) id3tag_set_textinfo_utf16(gfp, "TPE1", ToUTF16BOMvector(mpt::transcode<std::u16string>(tags.artist)).data());
+				if(!tags.album.empty()) id3tag_set_textinfo_utf16(gfp, "TALB", ToUTF16BOMvector(mpt::transcode<std::u16string>(tags.album)).data());
+				if(!tags.year.empty()) id3tag_set_textinfo_utf16(gfp, "TYER", ToUTF16BOMvector(mpt::transcode<std::u16string>(tags.year)).data());
+				if(!tags.comments.empty()) id3tag_set_textinfo_utf16(gfp, "COMM", ToUTF16BOMvector(mpt::transcode<std::u16string>(tags.comments)).data());
+				if(!tags.trackno.empty()) id3tag_set_textinfo_utf16(gfp, "TRCK", ToUTF16BOMvector(mpt::transcode<std::u16string>(tags.trackno)).data());
+				if(!tags.genre.empty()) id3tag_set_textinfo_utf16(gfp, "TCON", ToUTF16BOMvector(mpt::transcode<std::u16string>(tags.genre)).data());
 			} else if(id3type == ID3v2OpenMPT)
 			{
 				Tags = tags;

[OMPT-svn-commit] OpenMPT r25794 - in trunk/OpenMPT/include/lame: . include libmp3lame

From: <sv...@op...> - 2026-10-23 15:53:14

Author: manx
Date: Fri Oct 23 17:53:07 2026
New Revision: 25794
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=25794

Log:
[Var] LAME: Update to 4.0 (2026-07-11). See <https://bugs.openmpt.org/view.php?id=1991>.

Modified:
   trunk/OpenMPT/include/lame/   (props changed)
   trunk/OpenMPT/include/lame/OpenMPT.txt
   trunk/OpenMPT/include/lame/include/lame.h
   trunk/OpenMPT/include/lame/libmp3lame/VbrTag.c
   trunk/OpenMPT/include/lame/libmp3lame/id3tag.c
   trunk/OpenMPT/include/lame/libmp3lame/machine.h
   trunk/OpenMPT/include/lame/libmp3lame/util.c
   trunk/OpenMPT/include/lame/libmp3lame/version.c
   trunk/OpenMPT/include/lame/libmp3lame/version.h

Modified: trunk/OpenMPT/include/lame/OpenMPT.txt
==============================================================================
--- trunk/OpenMPT/include/lame/OpenMPT.txt	Fri Oct 23 17:48:25 2026	(r25793)
+++ trunk/OpenMPT/include/lame/OpenMPT.txt	Fri Oct 23 17:53:07 2026	(r25794)
@@ -1,4 +1,4 @@
-lame library version 3.101.
+lame library version 4.0.
 The following changes have been made:
  *  Obviously, unnecessary folders and files have been removed.
  *  export ordinals in `include/lame.def` have been removed

Modified: trunk/OpenMPT/include/lame/include/lame.h
==============================================================================
--- trunk/OpenMPT/include/lame/include/lame.h	Fri Oct 23 17:48:25 2026	(r25793)
+++ trunk/OpenMPT/include/lame/include/lame.h	Fri Oct 23 17:53:07 2026	(r25794)
@@ -1308,7 +1308,7 @@
 int CDECL id3tag_set_comment_utf16(lame_t gfp, char const *lang, unsigned short const *desc, unsigned short const *text);
 
 /* experimental */
-int CDECL id3tag_set_textinfo_utf8(lame_t gfp, char const *id, unsigned short const *text);
+int CDECL id3tag_set_textinfo_utf8(lame_t gfp, char const *id, char const *text);
 
 /* experimental */
 int CDECL id3tag_set_comment_utf8(lame_t gfp, char const *lang, char const *desc, char const *text);

Modified: trunk/OpenMPT/include/lame/libmp3lame/VbrTag.c
==============================================================================
--- trunk/OpenMPT/include/lame/libmp3lame/VbrTag.c	Fri Oct 23 17:48:25 2026	(r25793)
+++ trunk/OpenMPT/include/lame/libmp3lame/VbrTag.c	Fri Oct 23 17:53:07 2026	(r25794)
@@ -782,6 +782,12 @@
     CreateI4(&pbtStreamBuffer[nBytesWritten], nQuality);
     nBytesWritten += 4;
 
+    /*! \par LAME tag: encoder-version sub-field, fixed 9-byte width.
+     *  \c szVersion (\c get_lame_tag_encoder_short_version()) must fit in
+     *  9 bytes - see the \c \\par blocks in that function's doc comment in
+     *  \c version.c for the exact byte budget, the reason the width can't
+     *  be changed, and the compile-time check that enforces it. `strncpy`
+     *  silently truncates (and skips the NUL terminator) if it doesn't fit. */
     strncpy((char *) &pbtStreamBuffer[nBytesWritten], szVersion, 9);
     nBytesWritten += 9;
 

Modified: trunk/OpenMPT/include/lame/libmp3lame/id3tag.c
==============================================================================
--- trunk/OpenMPT/include/lame/libmp3lame/id3tag.c	Fri Oct 23 17:48:25 2026	(r25793)
+++ trunk/OpenMPT/include/lame/libmp3lame/id3tag.c	Fri Oct 23 17:53:07 2026	(r25794)
@@ -639,17 +639,15 @@
 
 
 static int
-id3tag_set_genre_utf8(lame_t gfp, unsigned short const* text)
+id3tag_set_genre_utf8(lame_t gfp, char const* text)
 {
     lame_internal_flags* gfc = gfp->internal_flags;
     int   ret;
     if (text == 0) {
         return -3;
     }
-    if (maybeLatin1(text)) {
-        char*   latin1 = local_strdup_utf16_to_latin1(text);
-        int     num = lookupGenre(latin1);
-        free(latin1);
+    {
+        int     num = lookupGenre(text);
         if (num == -1) return -1; /* number out of range */
         if (num >= 0) {           /* common genre found  */
             gfc->tag_spec.flags |= CHANGED_FLAG;
@@ -1083,6 +1081,9 @@
     if (a >= 0) {
         char*   dup = 0;
         local_strdup(&dup, fieldvalue);
+        if (dup == 0) {
+            return -254;    /* memory problem */
+        }
         dup[a] = 0;
         rc = id3v2_add_latin1_lng(gfp, id, dup, dup+a+1);
         free(dup);
@@ -1099,6 +1100,9 @@
     if (a >= 0) {
         char*   dup = 0;
         local_strdup(&dup, fieldvalue);
+        if (dup == 0) {
+            return -254;    /* memory problem */
+        }
         dup[a] = 0;
         rc = id3v2_add_utf8_lng(gfp, id, dup, dup+a+1);
         free(dup);
@@ -1125,7 +1129,7 @@
 }
 
 int
-id3tag_set_textinfo_utf8(lame_t gfp, char const *id, unsigned short const *text)
+id3tag_set_textinfo_utf8(lame_t gfp, char const *id, char const *text)
 {
     uint32_t const frame_id = toID3v2TagId(id);
     if (frame_id == 0) {

Modified: trunk/OpenMPT/include/lame/libmp3lame/machine.h
==============================================================================
--- trunk/OpenMPT/include/lame/libmp3lame/machine.h	Fri Oct 23 17:48:25 2026	(r25793)
+++ trunk/OpenMPT/include/lame/libmp3lame/machine.h	Fri Oct 23 17:53:07 2026	(r25794)
@@ -157,7 +157,14 @@
 
 #define dimension_of(array) (sizeof(array)/sizeof(array[0]))
 #define beyond(array) (array+dimension_of(array))
-#define compiletime_assert(expression) enum{static_assert_##FILE##_##LINE = 1/((expression)?1:0)}
+/* ##-pasting does not expand its operands, so pasting __LINE__ directly would
+ * yield the literal token "__LINE__" instead of the current line number,
+ * making every use in a translation unit collide on the same enum tag. The
+ * extra indirection through compiletime_assert_paste() forces __LINE__ to be
+ * expanded to its numeric value before compiletime_assert_paste2() pastes it. */
+#define compiletime_assert_paste2(a,b) a##b
+#define compiletime_assert_paste(a,b) compiletime_assert_paste2(a,b)
+#define compiletime_assert(expression) enum{compiletime_assert_paste(static_assert_line_,__LINE__) = 1/((expression)?1:0)}
 #define lame_calloc(TYPE, COUNT) ((TYPE*)calloc(COUNT, sizeof(TYPE)))
 #define multiple_of(CHUNK, COUNT) (\
   ( (COUNT) < 1 || (CHUNK) < 1 || (COUNT) % (CHUNK) == 0 ) \

Modified: trunk/OpenMPT/include/lame/libmp3lame/util.c
==============================================================================
--- trunk/OpenMPT/include/lame/libmp3lame/util.c	Fri Oct 23 17:48:25 2026	(r25793)
+++ trunk/OpenMPT/include/lame/libmp3lame/util.c	Fri Oct 23 17:53:07 2026	(r25794)
@@ -602,6 +602,15 @@
         /* blackman filter.  by default, window centered at j+.5(filter_l%2) */
         /* but we want a window centered at time0.   */
         offset = (time0 - esv->itime[ch] - (j + .5 * (filter_l % 2)));
+        /* offset is bounded to [-0.5, +0.5) by construction, so joff below
+           always lands within blackfilt[0 .. 2*bpc] and never over-indexes
+           the table: for a non-integer resample ratio filter_l is odd, making
+           offset the fractional part of (time0 - itime) minus 0.5; for a
+           (near-)integer ratio the intratio branch above is only taken when
+           the ratio is an *exact* integer (samplerate_in an exact multiple of
+           samplerate_out), where offset is identically 0.  Sample rates are
+           always integers, so no runtime bounds guard is needed here - the
+           assert is a development-time sanity check, compiled out under NDEBUG. */
         assert(fabs(offset) <= .501);
 
         /* find the closest precomputed window for this offset: */

Modified: trunk/OpenMPT/include/lame/libmp3lame/version.c
==============================================================================
--- trunk/OpenMPT/include/lame/libmp3lame/version.c	Fri Oct 23 17:48:25 2026	(r25793)
+++ trunk/OpenMPT/include/lame/libmp3lame/version.c	Fri Oct 23 17:53:07 2026	(r25794)
@@ -141,7 +141,27 @@
   It's used in the LAME VBR tag only, limited to 9 characters max.
   Due to some 3rd party HW/SW decoders, it has to start with LAME.
 
-  \param void   
+  \par Field width and format (fixed, binary-compatibility critical)
+  This string is copied into a **fixed 9-byte** field of the LAME tag that
+  gets embedded in every encoded MP3 stream (see \c VbrTag.c,
+  \c LAMEHEADERSIZE and the \c strncpy(...,9) call in the tag-writing code).
+  Widening that field would shift every subsequent byte of the tag and break
+  every third-party decoder that parses it at a fixed offset - it is not
+  adjustable. The format itself (`"LAME" major "." minor type`) is likewise
+  fixed for the same reason: some decoders reportedly pattern-match on it.
+
+  \par Byte budget
+  `strlen("LAME")` (4) + `strlen(major)` + `strlen(".")` (1) +
+  `strlen(minor)` + `strlen(type)` (1, always exactly one character:
+  `'a'`/`'b'`/`'r'`/`' '`) must not exceed 9, i.e.
+  \code
+      strlen(major) + strlen(minor) <= 3
+  \endcode
+  This invariant is enforced at compile time right below this function
+  (`compiletime_assert`) - if it ever trips, the version numbers (not this
+  field's width or format) are what needs to change.
+
+  \param void
   \return a pointer to the short version of the LAME version string.
  */
 const char*
@@ -154,6 +174,11 @@
     return str;
 }
 
+/*! Enforces the byte budget documented above at compile time: catches an
+ *  overflow the moment a version bump reintroduces it, instead of letting
+ *  it silently truncate at run time. */
+compiletime_assert(sizeof("LAME" STR(LAME_MAJOR_VERSION) "." STR(LAME_MINOR_VERSION) P) - 1 <= 9);
+
 /*! Get the version string for GPSYCHO. */
 /*!
   \param void

Modified: trunk/OpenMPT/include/lame/libmp3lame/version.h
==============================================================================
--- trunk/OpenMPT/include/lame/libmp3lame/version.h	Fri Oct 23 17:48:25 2026	(r25793)
+++ trunk/OpenMPT/include/lame/libmp3lame/version.h	Fri Oct 23 17:53:07 2026	(r25794)
@@ -34,8 +34,8 @@
 # define LAME_URL              "https://lame.sourceforge.io"
 
 
-# define LAME_MAJOR_VERSION      3 /* Major version number */
-# define LAME_MINOR_VERSION    101 /* Minor version number */
+# define LAME_MAJOR_VERSION      4 /* Major version number */
+# define LAME_MINOR_VERSION      0 /* Minor version number */
 # define LAME_TYPE_VERSION       2 /* 0:alpha 1:beta 2:release */
 # define LAME_PATCH_VERSION      0 /* Patch level */
 # define LAME_ALPHA_VERSION     (LAME_TYPE_VERSION==0)

[OMPT-svn-commit] OpenMPT r25793 - trunk/OpenMPT/common

From: <sv...@op...> - 2026-10-23 15:48:33

Author: manx
Date: Fri Oct 23 17:48:25 2026
New Revision: 25793
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=25793

Log:
[Mod] OpenMPT: Version is now 1.33.00.26

Modified:
   trunk/OpenMPT/common/versionNumber.h

Modified: trunk/OpenMPT/common/versionNumber.h
==============================================================================
--- trunk/OpenMPT/common/versionNumber.h	Fri Oct 23 17:47:48 2026	(r25792)
+++ trunk/OpenMPT/common/versionNumber.h	Fri Oct 23 17:48:25 2026	(r25793)
@@ -16,4 +16,4 @@
 #define VER_MAJORMAJOR  1
 #define VER_MAJOR      33
 #define VER_MINOR      00
-#define VER_MINORMINOR 25
+#define VER_MINORMINOR 26

[OMPT-svn-commit] OpenMPT r25792 - in trunk/OpenMPT: build/premake build/vs2017win7/ext build/vs2017winxp/ext build/vs2017winxpansi/ext build/vs2017winxpx64/ext build/vs2019win7/ext build/vs2022win10/ext build/vs2022win10uwp/ext build/vs2022win11/ext build/vs2022win11clang/ext build/vs2022win11uwp/ext build/vs2022win7/ext build/vs2022win8/ext build/vs2022win81/ext build/vs2026previewwin11/ext build/vs2026win11/ext build/vs2026win11clang/ext build/vs2026win11uwp/ext include/lame include/lame/include include/lame/libmp3lame include/lame/libmp3lame/vector include/lame/mpglib

From: <sv...@op...> - 2026-10-23 15:47:59

Author: manx
Date: Fri Oct 23 17:47:48 2026
New Revision: 25792
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=25792

Log:
[Var] LAME: Update to 3.101 (2026-07-09). See <https://bugs.openmpt.org/view.php?id=1991>.
[Mod] LAME: Build with mpg123 as dependency due to removed internal mpglib.

Added:
   trunk/OpenMPT/include/lame/libmp3lame/VbrTagCrc.h   (contents, props changed)
   trunk/OpenMPT/include/lame/libmp3lame/lame.pc.in   (contents, props changed)
Deleted:
   trunk/OpenMPT/include/lame/mpglib/common.c
   trunk/OpenMPT/include/lame/mpglib/common.h
   trunk/OpenMPT/include/lame/mpglib/dct64_i386.c
   trunk/OpenMPT/include/lame/mpglib/dct64_i386.h
   trunk/OpenMPT/include/lame/mpglib/decode_i386.c
   trunk/OpenMPT/include/lame/mpglib/decode_i386.h
   trunk/OpenMPT/include/lame/mpglib/huffman.h
   trunk/OpenMPT/include/lame/mpglib/interface.c
   trunk/OpenMPT/include/lame/mpglib/interface.h
   trunk/OpenMPT/include/lame/mpglib/l2tables.h
   trunk/OpenMPT/include/lame/mpglib/layer1.c
   trunk/OpenMPT/include/lame/mpglib/layer1.h
   trunk/OpenMPT/include/lame/mpglib/layer2.c
   trunk/OpenMPT/include/lame/mpglib/layer2.h
   trunk/OpenMPT/include/lame/mpglib/layer3.c
   trunk/OpenMPT/include/lame/mpglib/layer3.h
   trunk/OpenMPT/include/lame/mpglib/mpg123.h
   trunk/OpenMPT/include/lame/mpglib/tabinit.c
   trunk/OpenMPT/include/lame/mpglib/tabinit.h
Modified:
   trunk/OpenMPT/build/premake/ext-lame.lua
   trunk/OpenMPT/build/vs2017win7/ext/lame.vcxproj
   trunk/OpenMPT/build/vs2017win7/ext/lame.vcxproj.filters
   trunk/OpenMPT/build/vs2017winxp/ext/lame.vcxproj
   trunk/OpenMPT/build/vs2017winxp/ext/lame.vcxproj.filters
   trunk/OpenMPT/build/vs2017winxpansi/ext/lame.vcxproj
   trunk/OpenMPT/build/vs2017winxpansi/ext/lame.vcxproj.filters
   trunk/OpenMPT/build/vs2017winxpx64/ext/lame.vcxproj
   trunk/OpenMPT/build/vs2017winxpx64/ext/lame.vcxproj.filters
   trunk/OpenMPT/build/vs2019win7/ext/lame.vcxproj
   trunk/OpenMPT/build/vs2019win7/ext/lame.vcxproj.filters
   trunk/OpenMPT/build/vs2022win10/ext/lame.vcxproj
   trunk/OpenMPT/build/vs2022win10/ext/lame.vcxproj.filters
   trunk/OpenMPT/build/vs2022win10uwp/ext/lame.vcxproj
   trunk/OpenMPT/build/vs2022win10uwp/ext/lame.vcxproj.filters
   trunk/OpenMPT/build/vs2022win11/ext/lame.vcxproj
   trunk/OpenMPT/build/vs2022win11/ext/lame.vcxproj.filters
   trunk/OpenMPT/build/vs2022win11clang/ext/lame.vcxproj
   trunk/OpenMPT/build/vs2022win11clang/ext/lame.vcxproj.filters
   trunk/OpenMPT/build/vs2022win11uwp/ext/lame.vcxproj
   trunk/OpenMPT/build/vs2022win11uwp/ext/lame.vcxproj.filters
   trunk/OpenMPT/build/vs2022win7/ext/lame.vcxproj
   trunk/OpenMPT/build/vs2022win7/ext/lame.vcxproj.filters
   trunk/OpenMPT/build/vs2022win8/ext/lame.vcxproj
   trunk/OpenMPT/build/vs2022win8/ext/lame.vcxproj.filters
   trunk/OpenMPT/build/vs2022win81/ext/lame.vcxproj
   trunk/OpenMPT/build/vs2022win81/ext/lame.vcxproj.filters
   trunk/OpenMPT/build/vs2026previewwin11/ext/lame.vcxproj
   trunk/OpenMPT/build/vs2026previewwin11/ext/lame.vcxproj.filters
   trunk/OpenMPT/build/vs2026win11/ext/lame.vcxproj
   trunk/OpenMPT/build/vs2026win11/ext/lame.vcxproj.filters
   trunk/OpenMPT/build/vs2026win11clang/ext/lame.vcxproj
   trunk/OpenMPT/build/vs2026win11clang/ext/lame.vcxproj.filters
   trunk/OpenMPT/build/vs2026win11uwp/ext/lame.vcxproj
   trunk/OpenMPT/build/vs2026win11uwp/ext/lame.vcxproj.filters
   trunk/OpenMPT/include/lame/   (props changed)
   trunk/OpenMPT/include/lame/COPYING
   trunk/OpenMPT/include/lame/OpenMPT.txt
   trunk/OpenMPT/include/lame/include/lame.def
   trunk/OpenMPT/include/lame/include/lame.h
   trunk/OpenMPT/include/lame/libmp3lame/VbrTag.c
   trunk/OpenMPT/include/lame/libmp3lame/bitstream.c
   trunk/OpenMPT/include/lame/libmp3lame/encoder.c
   trunk/OpenMPT/include/lame/libmp3lame/fft.c
   trunk/OpenMPT/include/lame/libmp3lame/id3tag.c
   trunk/OpenMPT/include/lame/libmp3lame/id3tag.h
   trunk/OpenMPT/include/lame/libmp3lame/lame.c
   trunk/OpenMPT/include/lame/libmp3lame/mpglib_interface.c
   trunk/OpenMPT/include/lame/libmp3lame/newmdct.c
   trunk/OpenMPT/include/lame/libmp3lame/psymodel.c
   trunk/OpenMPT/include/lame/libmp3lame/quantize.c
   trunk/OpenMPT/include/lame/libmp3lame/quantize_pvt.c
   trunk/OpenMPT/include/lame/libmp3lame/reservoir.c
   trunk/OpenMPT/include/lame/libmp3lame/reservoir.h
   trunk/OpenMPT/include/lame/libmp3lame/set_get.c
   trunk/OpenMPT/include/lame/libmp3lame/tables.c
   trunk/OpenMPT/include/lame/libmp3lame/takehiro.c
   trunk/OpenMPT/include/lame/libmp3lame/util.c
   trunk/OpenMPT/include/lame/libmp3lame/util.h
   trunk/OpenMPT/include/lame/libmp3lame/vbrquantize.c
   trunk/OpenMPT/include/lame/libmp3lame/vector/xmm_quantize_sub.c
   trunk/OpenMPT/include/lame/libmp3lame/version.c
   trunk/OpenMPT/include/lame/libmp3lame/version.h
   trunk/OpenMPT/include/lame/mpglib/mpglib.h

Modified: trunk/OpenMPT/build/premake/ext-lame.lua
==============================================================================
--- trunk/OpenMPT/build/premake/ext-lame.lua	Fri Oct 23 15:44:06 2026	(r25791)
+++ trunk/OpenMPT/build/premake/ext-lame.lua	Fri Oct 23 17:47:48 2026	(r25792)
@@ -1,57 +1,82 @@
- 
+
+include_dependency "ext-mpg123.lua"
+
  project "lame"
   uuid "b545694a-ce2a-44f8-ba88-147c36369308"
   language "C"
   location ( "%{wks.location}" .. "/ext" )
   mpt_kind "shared"
   targetname "openmpt-lame"
+
+	mpt_use_mpg123()
+
   includedirs { "../../include/lame/include" }
-  includedirs { "../../include/lame/mpglib" }
   includedirs { "../../include/lame/libmp3lame" }
+  includedirs { "../../include/lame" }
   includedirs { "../../build/premake/inc/lame" }
 	filter {}
-  files {
-   "../../include/lame/include/lame.def",
-  }
-  files {
-   "../../include/lame/include/lame.h",
-  }
-  files {
-   "../../include/lame/mpglib/common.c",
-   "../../include/lame/mpglib/dct64_i386.c",
-   "../../include/lame/mpglib/decode_i386.c",
-   "../../include/lame/mpglib/interface.c",
-   "../../include/lame/mpglib/layer1.c",
-   "../../include/lame/mpglib/layer2.c",
-   "../../include/lame/mpglib/layer3.c",
-   "../../include/lame/mpglib/tabinit.c",
-  }
-  files {
-   "../../include/lame/libmp3lame/bitstream.c",
-   "../../include/lame/libmp3lame/encoder.c",
-   "../../include/lame/libmp3lame/fft.c",
-   "../../include/lame/libmp3lame/gain_analysis.c",
-   "../../include/lame/libmp3lame/id3tag.c",
-   "../../include/lame/libmp3lame/lame.c",
-   "../../include/lame/libmp3lame/mpglib_interface.c",
-   "../../include/lame/libmp3lame/newmdct.c",
-   "../../include/lame/libmp3lame/presets.c",
-   "../../include/lame/libmp3lame/psymodel.c",
-   "../../include/lame/libmp3lame/quantize.c",
-   "../../include/lame/libmp3lame/quantize_pvt.c",
-   "../../include/lame/libmp3lame/reservoir.c",
-   "../../include/lame/libmp3lame/set_get.c",
-   "../../include/lame/libmp3lame/tables.c",
-   "../../include/lame/libmp3lame/takehiro.c",
-   "../../include/lame/libmp3lame/util.c",
-   "../../include/lame/libmp3lame/vbrquantize.c",
-   "../../include/lame/libmp3lame/VbrTag.c",
-   "../../include/lame/libmp3lame/version.c",
-  }
-  files {
-   "../../include/lame/libmp3lame/vector/xmm_quantize_sub.c",
-  }
-  defines { "HAVE_CONFIG_H", "HAVE_MPGLIB", "USE_LAYER_2" }
+	files {
+		"../../include/lame/include/lame.def",
+	}
+	files {
+		"../../include/lame/include/lame.h",
+	}
+	files {
+		"../../include/lame/mpglib/mpglib.h",
+	}
+	files {
+		"../../include/lame/libmp3lame/bitstream.c",
+		"../../include/lame/libmp3lame/bitstream.h",
+		"../../include/lame/libmp3lame/encoder.c",
+		"../../include/lame/libmp3lame/encoder.h",
+		"../../include/lame/libmp3lame/fft.c",
+		"../../include/lame/libmp3lame/fft.h",
+		"../../include/lame/libmp3lame/gain_analysis.c",
+		"../../include/lame/libmp3lame/gain_analysis.h",
+		"../../include/lame/libmp3lame/id3tag.c",
+		"../../include/lame/libmp3lame/id3tag.h",
+		"../../include/lame/libmp3lame/l3side.h",
+		"../../include/lame/libmp3lame/lame.c",
+		"../../include/lame/libmp3lame/lame_global_flags.h",
+		"../../include/lame/libmp3lame/lame-analysis.h",
+		"../../include/lame/libmp3lame/lameerror.h",
+		"../../include/lame/libmp3lame/machine.h",
+		"../../include/lame/libmp3lame/mpglib_interface.c",
+		"../../include/lame/libmp3lame/newmdct.c",
+		"../../include/lame/libmp3lame/newmdct.h",
+		"../../include/lame/libmp3lame/presets.c",
+		"../../include/lame/libmp3lame/psymodel.c",
+		"../../include/lame/libmp3lame/psymodel.h",
+		"../../include/lame/libmp3lame/quantize.c",
+		"../../include/lame/libmp3lame/quantize.h",
+		"../../include/lame/libmp3lame/quantize_pvt.c",
+		"../../include/lame/libmp3lame/quantize_pvt.h",
+		"../../include/lame/libmp3lame/reservoir.c",
+		"../../include/lame/libmp3lame/reservoir.h",
+		"../../include/lame/libmp3lame/set_get.c",
+		"../../include/lame/libmp3lame/set_get.h",
+		"../../include/lame/libmp3lame/tables.c",
+		"../../include/lame/libmp3lame/tables.h",
+		"../../include/lame/libmp3lame/takehiro.c",
+		"../../include/lame/libmp3lame/util.c",
+		"../../include/lame/libmp3lame/util.h",
+		"../../include/lame/libmp3lame/vbrquantize.c",
+		"../../include/lame/libmp3lame/vbrquantize.h",
+		"../../include/lame/libmp3lame/VbrTag.c",
+		"../../include/lame/libmp3lame/VbrTag.h",
+		"../../include/lame/libmp3lame/VbrTagCrc.h",
+		"../../include/lame/libmp3lame/version.c",
+		"../../include/lame/libmp3lame/version.h",
+	}
+	files {
+		"../../include/lame/libmp3lame/vector/xmm_quantize_sub.c",
+	}
+	defines {
+		"HAVE_CONFIG_H",
+		"HAVE_MPGLIB",
+		"HAVE_MPG123",
+		"USE_LAYER_2"
+	}
 	filter {}
 	if MPT_COMPILER_MSVC or MPT_COMPILER_CLANGCL then
 		buildoptions { "/wd4305", "/wd4267", "/wd4334" }

Modified: trunk/OpenMPT/build/vs2017win7/ext/lame.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2017win7/ext/lame.vcxproj	Fri Oct 23 15:44:06 2026	(r25791)
+++ trunk/OpenMPT/build/vs2017win7/ext/lame.vcxproj	Fri Oct 23 17:47:48 2026	(r25792)
@@ -276,8 +276,8 @@
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0601;NTDDI_VERSION=0x06010000;HAVE_CONFIG_H;HAVE_MPGLIB;USE_LAYER_2;HAVE_XMMINTRIN_H;MIN_ARCH_SSE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\include\lame\include;..\..\..\include\lame\mpglib;..\..\..\include\lame\libmp3lame;..\..\premake\inc\lame;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0601;NTDDI_VERSION=0x06010000;MPG123_NO_LARGENAME;LINK_MPG123_DLL;HAVE_CONFIG_H;HAVE_MPGLIB;HAVE_MPG123;USE_LAYER_2;HAVE_XMMINTRIN_H;MIN_ARCH_SSE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\include\mpg123\src\include;..\..\..\include\lame\include;..\..\..\include\lame\libmp3lame;..\..\..\include\lame;..\..\premake\inc\lame;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
       <MinimalRebuild>false</MinimalRebuild>
@@ -301,8 +301,8 @@
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0601;NTDDI_VERSION=0x06010000;HAVE_CONFIG_H;HAVE_MPGLIB;USE_LAYER_2;HAVE_XMMINTRIN_H;MIN_ARCH_SSE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\include\lame\include;..\..\..\include\lame\mpglib;..\..\..\include\lame\libmp3lame;..\..\premake\inc\lame;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0601;NTDDI_VERSION=0x06010000;MPG123_NO_LARGENAME;LINK_MPG123_DLL;HAVE_CONFIG_H;HAVE_MPGLIB;HAVE_MPG123;USE_LAYER_2;HAVE_XMMINTRIN_H;MIN_ARCH_SSE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\include\mpg123\src\include;..\..\..\include\lame\include;..\..\..\include\lame\libmp3lame;..\..\..\include\lame;..\..\premake\inc\lame;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
       <MinimalRebuild>false</MinimalRebuild>
@@ -325,8 +325,8 @@
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0601;NTDDI_VERSION=0x06010000;HAVE_CONFIG_H;HAVE_MPGLIB;USE_LAYER_2;HAVE_XMMINTRIN_H;MIN_ARCH_SSE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\include\lame\include;..\..\..\include\lame\mpglib;..\..\..\include\lame\libmp3lame;..\..\premake\inc\lame;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0601;NTDDI_VERSION=0x06010000;MPG123_NO_LARGENAME;LINK_MPG123_DLL;HAVE_CONFIG_H;HAVE_MPGLIB;HAVE_MPG123;USE_LAYER_2;HAVE_XMMINTRIN_H;MIN_ARCH_SSE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\include\mpg123\src\include;..\..\..\include\lame\include;..\..\..\include\lame\libmp3lame;..\..\..\include\lame;..\..\premake\inc\lame;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -355,8 +355,8 @@
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0601;NTDDI_VERSION=0x06010000;HAVE_CONFIG_H;HAVE_MPGLIB;USE_LAYER_2;HAVE_XMMINTRIN_H;MIN_ARCH_SSE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\include\lame\include;..\..\..\include\lame\mpglib;..\..\..\include\lame\libmp3lame;..\..\premake\inc\lame;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0601;NTDDI_VERSION=0x06010000;MPG123_NO_LARGENAME;LINK_MPG123_DLL;HAVE_CONFIG_H;HAVE_MPGLIB;HAVE_MPG123;USE_LAYER_2;HAVE_XMMINTRIN_H;MIN_ARCH_SSE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\include\mpg123\src\include;..\..\..\include\lame\include;..\..\..\include\lame\libmp3lame;..\..\..\include\lame;..\..\premake\inc\lame;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -384,8 +384,8 @@
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0601;NTDDI_VERSION=0x06010000;HAVE_CONFIG_H;HAVE_MPGLIB;USE_LAYER_2;HAVE_XMMINTRIN_H;MIN_ARCH_SSE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\include\lame\include;..\..\..\include\lame\mpglib;..\..\..\include\lame\libmp3lame;..\..\premake\inc\lame;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0601;NTDDI_VERSION=0x06010000;MPG123_NO_LARGENAME;LINK_MPG123_DLL;HAVE_CONFIG_H;HAVE_MPGLIB;HAVE_MPG123;USE_LAYER_2;HAVE_XMMINTRIN_H;MIN_ARCH_SSE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\include\mpg123\src\include;..\..\..\include\lame\include;..\..\..\include\lame\libmp3lame;..\..\..\include\lame;..\..\premake\inc\lame;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <Optimization>Full</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -414,8 +414,8 @@
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0601;NTDDI_VERSION=0x06010000;HAVE_CONFIG_H;HAVE_MPGLIB;USE_LAYER_2;HAVE_XMMINTRIN_H;MIN_ARCH_SSE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\include\lame\include;..\..\..\include\lame\mpglib;..\..\..\include\lame\libmp3lame;..\..\premake\inc\lame;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0601;NTDDI_VERSION=0x06010000;MPG123_NO_LARGENAME;LINK_MPG123_DLL;HAVE_CONFIG_H;HAVE_MPGLIB;HAVE_MPG123;USE_LAYER_2;HAVE_XMMINTRIN_H;MIN_ARCH_SSE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\include\mpg123\src\include;..\..\..\include\lame\include;..\..\..\include\lame\libmp3lame;..\..\..\include\lame;..\..\premake\inc\lame;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <Optimization>Full</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -443,8 +443,8 @@
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0601;NTDDI_VERSION=0x06010000;HAVE_CONFIG_H;HAVE_MPGLIB;USE_LAYER_2;HAVE_XMMINTRIN_H;MIN_ARCH_SSE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\include\lame\include;..\..\..\include\lame\mpglib;..\..\..\include\lame\libmp3lame;..\..\premake\inc\lame;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0601;NTDDI_VERSION=0x06010000;MPG123_NO_LARGENAME;LINK_MPG123_DLL;HAVE_CONFIG_H;HAVE_MPGLIB;HAVE_MPG123;USE_LAYER_2;HAVE_XMMINTRIN_H;MIN_ARCH_SSE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\include\mpg123\src\include;..\..\..\include\lame\include;..\..\..\include\lame\libmp3lame;..\..\..\include\lame;..\..\premake\inc\lame;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
       <MinimalRebuild>false</MinimalRebuild>
@@ -467,8 +467,8 @@
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0601;NTDDI_VERSION=0x06010000;HAVE_CONFIG_H;HAVE_MPGLIB;USE_LAYER_2;HAVE_XMMINTRIN_H;MIN_ARCH_SSE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\include\lame\include;..\..\..\include\lame\mpglib;..\..\..\include\lame\libmp3lame;..\..\premake\inc\lame;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0601;NTDDI_VERSION=0x06010000;MPG123_NO_LARGENAME;LINK_MPG123_DLL;HAVE_CONFIG_H;HAVE_MPGLIB;HAVE_MPG123;USE_LAYER_2;HAVE_XMMINTRIN_H;MIN_ARCH_SSE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\include\mpg123\src\include;..\..\..\include\lame\include;..\..\..\include\lame\libmp3lame;..\..\..\include\lame;..\..\premake\inc\lame;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
       <MinimalRebuild>false</MinimalRebuild>
@@ -490,8 +490,8 @@
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0601;NTDDI_VERSION=0x06010000;HAVE_CONFIG_H;HAVE_MPGLIB;USE_LAYER_2;HAVE_XMMINTRIN_H;MIN_ARCH_SSE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\include\lame\include;..\..\..\include\lame\mpglib;..\..\..\include\lame\libmp3lame;..\..\premake\inc\lame;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0601;NTDDI_VERSION=0x06010000;MPG123_NO_LARGENAME;LINK_MPG123_DLL;HAVE_CONFIG_H;HAVE_MPGLIB;HAVE_MPG123;USE_LAYER_2;HAVE_XMMINTRIN_H;MIN_ARCH_SSE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\include\mpg123\src\include;..\..\..\include\lame\include;..\..\..\include\lame\libmp3lame;..\..\..\include\lame;..\..\premake\inc\lame;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -520,8 +520,8 @@
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0601;NTDDI_VERSION=0x06010000;HAVE_CONFIG_H;HAVE_MPGLIB;USE_LAYER_2;HAVE_XMMINTRIN_H;MIN_ARCH_SSE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\include\lame\include;..\..\..\include\lame\mpglib;..\..\..\include\lame\libmp3lame;..\..\premake\inc\lame;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0601;NTDDI_VERSION=0x06010000;MPG123_NO_LARGENAME;LINK_MPG123_DLL;HAVE_CONFIG_H;HAVE_MPGLIB;HAVE_MPG123;USE_LAYER_2;HAVE_XMMINTRIN_H;MIN_ARCH_SSE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\include\mpg123\src\include;..\..\..\include\lame\include;..\..\..\include\lame\libmp3lame;..\..\..\include\lame;..\..\premake\inc\lame;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -549,8 +549,8 @@
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0601;NTDDI_VERSION=0x06010000;HAVE_CONFIG_H;HAVE_MPGLIB;USE_LAYER_2;HAVE_XMMINTRIN_H;MIN_ARCH_SSE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\include\lame\include;..\..\..\include\lame\mpglib;..\..\..\include\lame\libmp3lame;..\..\premake\inc\lame;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0601;NTDDI_VERSION=0x06010000;MPG123_NO_LARGENAME;LINK_MPG123_DLL;HAVE_CONFIG_H;HAVE_MPGLIB;HAVE_MPG123;USE_LAYER_2;HAVE_XMMINTRIN_H;MIN_ARCH_SSE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\include\mpg123\src\include;..\..\..\include\lame\include;..\..\..\include\lame\libmp3lame;..\..\..\include\lame;..\..\premake\inc\lame;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <Optimization>Full</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -579,8 +579,8 @@
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0601;NTDDI_VERSION=0x06010000;HAVE_CONFIG_H;HAVE_MPGLIB;USE_LAYER_2;HAVE_XMMINTRIN_H;MIN_ARCH_SSE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\include\lame\include;..\..\..\include\lame\mpglib;..\..\..\include\lame\libmp3lame;..\..\premake\inc\lame;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0601;NTDDI_VERSION=0x06010000;MPG123_NO_LARGENAME;LINK_MPG123_DLL;HAVE_CONFIG_H;HAVE_MPGLIB;HAVE_MPG123;USE_LAYER_2;HAVE_XMMINTRIN_H;MIN_ARCH_SSE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\include\mpg123\src\include;..\..\..\include\lame\include;..\..\..\include\lame\libmp3lame;..\..\..\include\lame;..\..\premake\inc\lame;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <Optimization>Full</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -606,6 +606,29 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\include\lame\include\lame.h" />
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\VbrTag.h" />
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\VbrTagCrc.h" />
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\bitstream.h" />
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\encoder.h" />
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\fft.h" />
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\gain_analysis.h" />
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\id3tag.h" />
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\l3side.h" />
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\lame-analysis.h" />
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\lame_global_flags.h" />
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\lameerror.h" />
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\machine.h" />
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\newmdct.h" />
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\psymodel.h" />
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\quantize.h" />
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\quantize_pvt.h" />
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\reservoir.h" />
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\set_get.h" />
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\tables.h" />
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\util.h" />
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\vbrquantize.h" />
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\version.h" />
+    <ClInclude Include="..\..\..\include\lame\mpglib\mpglib.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\include\lame\libmp3lame\VbrTag.c" />
@@ -629,18 +652,15 @@
     <ClCompile Include="..\..\..\include\lame\libmp3lame\vbrquantize.c" />
     <ClCompile Include="..\..\..\include\lame\libmp3lame\vector\xmm_quantize_sub.c" />
     <ClCompile Include="..\..\..\include\lame\libmp3lame\version.c" />
-    <ClCompile Include="..\..\..\include\lame\mpglib\common.c" />
-    <ClCompile Include="..\..\..\include\lame\mpglib\dct64_i386.c" />
-    <ClCompile Include="..\..\..\include\lame\mpglib\decode_i386.c" />
-    <ClCompile Include="..\..\..\include\lame\mpglib\interface.c" />
-    <ClCompile Include="..\..\..\include\lame\mpglib\layer1.c" />
-    <ClCompile Include="..\..\..\include\lame\mpglib\layer2.c" />
-    <ClCompile Include="..\..\..\include\lame\mpglib\layer3.c" />
-    <ClCompile Include="..\..\..\include\lame\mpglib\tabinit.c" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\include\lame\include\lame.def" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="mpg123.vcxproj">
+      <Project>{7ADFAFB9-0A83-4D35-9891-FB24FDF30B53}</Project>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

Modified: trunk/OpenMPT/build/vs2017win7/ext/lame.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2017win7/ext/lame.vcxproj.filters	Fri Oct 23 15:44:06 2026	(r25791)
+++ trunk/OpenMPT/build/vs2017win7/ext/lame.vcxproj.filters	Fri Oct 23 17:47:48 2026	(r25792)
@@ -18,6 +18,75 @@
     <ClInclude Include="..\..\..\include\lame\include\lame.h">
       <Filter>include</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\VbrTag.h">
+      <Filter>libmp3lame</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\VbrTagCrc.h">
+      <Filter>libmp3lame</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\bitstream.h">
+      <Filter>libmp3lame</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\encoder.h">
+      <Filter>libmp3lame</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\fft.h">
+      <Filter>libmp3lame</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\gain_analysis.h">
+      <Filter>libmp3lame</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\id3tag.h">
+      <Filter>libmp3lame</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\l3side.h">
+      <Filter>libmp3lame</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\lame-analysis.h">
+      <Filter>libmp3lame</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\lame_global_flags.h">
+      <Filter>libmp3lame</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\lameerror.h">
+      <Filter>libmp3lame</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\machine.h">
+      <Filter>libmp3lame</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\newmdct.h">
+      <Filter>libmp3lame</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\psymodel.h">
+      <Filter>libmp3lame</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\quantize.h">
+      <Filter>libmp3lame</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\quantize_pvt.h">
+      <Filter>libmp3lame</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\reservoir.h">
+      <Filter>libmp3lame</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\set_get.h">
+      <Filter>libmp3lame</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\tables.h">
+      <Filter>libmp3lame</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\util.h">
+      <Filter>libmp3lame</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\vbrquantize.h">
+      <Filter>libmp3lame</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\version.h">
+      <Filter>libmp3lame</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\lame\mpglib\mpglib.h">
+      <Filter>mpglib</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\include\lame\libmp3lame\VbrTag.c">
@@ -83,30 +152,6 @@
     <ClCompile Include="..\..\..\include\lame\libmp3lame\version.c">
       <Filter>libmp3lame</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\include\lame\mpglib\common.c">
-      <Filter>mpglib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\include\lame\mpglib\dct64_i386.c">
-      <Filter>mpglib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\include\lame\mpglib\decode_i386.c">
-      <Filter>mpglib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\include\lame\mpglib\interface.c">
-      <Filter>mpglib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\include\lame\mpglib\layer1.c">
-      <Filter>mpglib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\include\lame\mpglib\layer2.c">
-      <Filter>mpglib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\include\lame\mpglib\layer3.c">
-      <Filter>mpglib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\include\lame\mpglib\tabinit.c">
-      <Filter>mpglib</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\include\lame\include\lame.def">

Modified: trunk/OpenMPT/build/vs2017winxp/ext/lame.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2017winxp/ext/lame.vcxproj	Fri Oct 23 15:44:06 2026	(r25791)
+++ trunk/OpenMPT/build/vs2017winxp/ext/lame.vcxproj	Fri Oct 23 17:47:48 2026	(r25792)
@@ -160,8 +160,8 @@
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;HAVE_CONFIG_H;HAVE_MPGLIB;USE_LAYER_2;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\include\lame\include;..\..\..\include\lame\mpglib;..\..\..\include\lame\libmp3lame;..\..\premake\inc\lame;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;MPG123_NO_LARGENAME;LINK_MPG123_DLL;HAVE_CONFIG_H;HAVE_MPGLIB;HAVE_MPG123;USE_LAYER_2;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\include\mpg123\src\include;..\..\..\include\lame\include;..\..\..\include\lame\libmp3lame;..\..\..\include\lame;..\..\premake\inc\lame;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
       <MinimalRebuild>false</MinimalRebuild>
@@ -185,8 +185,8 @@
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;HAVE_CONFIG_H;HAVE_MPGLIB;USE_LAYER_2;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\include\lame\include;..\..\..\include\lame\mpglib;..\..\..\include\lame\libmp3lame;..\..\premake\inc\lame;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;MPG123_NO_LARGENAME;LINK_MPG123_DLL;HAVE_CONFIG_H;HAVE_MPGLIB;HAVE_MPG123;USE_LAYER_2;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\include\mpg123\src\include;..\..\..\include\lame\include;..\..\..\include\lame\libmp3lame;..\..\..\include\lame;..\..\premake\inc\lame;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -215,8 +215,8 @@
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;HAVE_CONFIG_H;HAVE_MPGLIB;USE_LAYER_2;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\include\lame\include;..\..\..\include\lame\mpglib;..\..\..\include\lame\libmp3lame;..\..\premake\inc\lame;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;MPG123_NO_LARGENAME;LINK_MPG123_DLL;HAVE_CONFIG_H;HAVE_MPGLIB;HAVE_MPG123;USE_LAYER_2;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\include\mpg123\src\include;..\..\..\include\lame\include;..\..\..\include\lame\libmp3lame;..\..\..\include\lame;..\..\premake\inc\lame;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <Optimization>Full</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -245,8 +245,8 @@
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;HAVE_CONFIG_H;HAVE_MPGLIB;USE_LAYER_2;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\include\lame\include;..\..\..\include\lame\mpglib;..\..\..\include\lame\libmp3lame;..\..\premake\inc\lame;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;MPG123_NO_LARGENAME;LINK_MPG123_DLL;HAVE_CONFIG_H;HAVE_MPGLIB;HAVE_MPG123;USE_LAYER_2;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\include\mpg123\src\include;..\..\..\include\lame\include;..\..\..\include\lame\libmp3lame;..\..\..\include\lame;..\..\premake\inc\lame;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
       <MinimalRebuild>false</MinimalRebuild>
@@ -269,8 +269,8 @@
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;HAVE_CONFIG_H;HAVE_MPGLIB;USE_LAYER_2;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\include\lame\include;..\..\..\include\lame\mpglib;..\..\..\include\lame\libmp3lame;..\..\premake\inc\lame;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;MPG123_NO_LARGENAME;LINK_MPG123_DLL;HAVE_CONFIG_H;HAVE_MPGLIB;HAVE_MPG123;USE_LAYER_2;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\include\mpg123\src\include;..\..\..\include\lame\include;..\..\..\include\lame\libmp3lame;..\..\..\include\lame;..\..\premake\inc\lame;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -299,8 +299,8 @@
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;HAVE_CONFIG_H;HAVE_MPGLIB;USE_LAYER_2;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\include\lame\include;..\..\..\include\lame\mpglib;..\..\..\include\lame\libmp3lame;..\..\premake\inc\lame;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;MPG123_NO_LARGENAME;LINK_MPG123_DLL;HAVE_CONFIG_H;HAVE_MPGLIB;HAVE_MPG123;USE_LAYER_2;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\include\mpg123\src\include;..\..\..\include\lame\include;..\..\..\include\lame\libmp3lame;..\..\..\include\lame;..\..\premake\inc\lame;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <Optimization>Full</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -327,6 +327,29 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\include\lame\include\lame.h" />
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\VbrTag.h" />
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\VbrTagCrc.h" />
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\bitstream.h" />
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\encoder.h" />
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\fft.h" />
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\gain_analysis.h" />
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\id3tag.h" />
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\l3side.h" />
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\lame-analysis.h" />
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\lame_global_flags.h" />
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\lameerror.h" />
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\machine.h" />
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\newmdct.h" />
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\psymodel.h" />
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\quantize.h" />
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\quantize_pvt.h" />
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\reservoir.h" />
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\set_get.h" />
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\tables.h" />
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\util.h" />
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\vbrquantize.h" />
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\version.h" />
+    <ClInclude Include="..\..\..\include\lame\mpglib\mpglib.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\include\lame\libmp3lame\VbrTag.c" />
@@ -350,18 +373,15 @@
     <ClCompile Include="..\..\..\include\lame\libmp3lame\vbrquantize.c" />
     <ClCompile Include="..\..\..\include\lame\libmp3lame\vector\xmm_quantize_sub.c" />
     <ClCompile Include="..\..\..\include\lame\libmp3lame\version.c" />
-    <ClCompile Include="..\..\..\include\lame\mpglib\common.c" />
-    <ClCompile Include="..\..\..\include\lame\mpglib\dct64_i386.c" />
-    <ClCompile Include="..\..\..\include\lame\mpglib\decode_i386.c" />
-    <ClCompile Include="..\..\..\include\lame\mpglib\interface.c" />
-    <ClCompile Include="..\..\..\include\lame\mpglib\layer1.c" />
-    <ClCompile Include="..\..\..\include\lame\mpglib\layer2.c" />
-    <ClCompile Include="..\..\..\include\lame\mpglib\layer3.c" />
-    <ClCompile Include="..\..\..\include\lame\mpglib\tabinit.c" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\include\lame\include\lame.def" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="mpg123.vcxproj">
+      <Project>{7ADFAFB9-0A83-4D35-9891-FB24FDF30B53}</Project>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

Modified: trunk/OpenMPT/build/vs2017winxp/ext/lame.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2017winxp/ext/lame.vcxproj.filters	Fri Oct 23 15:44:06 2026	(r25791)
+++ trunk/OpenMPT/build/vs2017winxp/ext/lame.vcxproj.filters	Fri Oct 23 17:47:48 2026	(r25792)
@@ -18,6 +18,75 @@
     <ClInclude Include="..\..\..\include\lame\include\lame.h">
       <Filter>include</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\VbrTag.h">
+      <Filter>libmp3lame</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\VbrTagCrc.h">
+      <Filter>libmp3lame</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\bitstream.h">
+      <Filter>libmp3lame</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\encoder.h">
+      <Filter>libmp3lame</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\fft.h">
+      <Filter>libmp3lame</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\gain_analysis.h">
+      <Filter>libmp3lame</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\id3tag.h">
+      <Filter>libmp3lame</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\l3side.h">
+      <Filter>libmp3lame</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\lame-analysis.h">
+      <Filter>libmp3lame</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\lame_global_flags.h">
+      <Filter>libmp3lame</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\lameerror.h">
+      <Filter>libmp3lame</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\machine.h">
+      <Filter>libmp3lame</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\newmdct.h">
+      <Filter>libmp3lame</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\psymodel.h">
+      <Filter>libmp3lame</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\quantize.h">
+      <Filter>libmp3lame</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\quantize_pvt.h">
+      <Filter>libmp3lame</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\reservoir.h">
+      <Filter>libmp3lame</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\set_get.h">
+      <Filter>libmp3lame</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\tables.h">
+      <Filter>libmp3lame</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\util.h">
+      <Filter>libmp3lame</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\vbrquantize.h">
+      <Filter>libmp3lame</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\lame\libmp3lame\version.h">
+      <Filter>libmp3lame</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\lame\mpglib\mpglib.h">
+      <Filter>mpglib</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\include\lame\libmp3lame\VbrTag.c">
@@ -83,30 +152,6 @@
     <ClCompile Include="..\..\..\include\lame\libmp3lame\version.c">
       <Filter>libmp3lame</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\include\lame\mpglib\common.c">
-      <Filter>mpglib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\include\lame\mpglib\dct64_i386.c">
-      <Filter>mpglib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\include\lame\mpglib\decode_i386.c">
-      <Filter>mpglib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\include\lame\mpglib\interface.c">
-      <Filter>mpglib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\include\lame\mpglib\layer1.c">
-      <Filter>mpglib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\include\lame\mpglib\layer2.c">
-      <Filter>mpglib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\include\lame\mpglib\layer3.c">
-      <Filter>mpglib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\include\lame\mpglib\tabinit.c">
-      <Filter>mpglib</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\include\lame\include\lame.def">

Modified: trunk/OpenMPT/build/vs2017winxpansi/ext/lame.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2017winxpansi/ext/lame.vcxproj	Fri Oct 23 15:44:06 2026	(r25791)
+++ trunk/OpenMPT/build/vs2017winxpansi/ext/lame.vcxproj	Fri Oct 23 17:47:48 2026	(r25792)
@@ -160,8 +160,8 @@
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;HAVE_CONFIG_H;HAVE_MPGLIB;USE_LAYER_2;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\include\lame\include;..\..\..\include\lame\mpglib;..\..\..\include\lame\libmp3lame;..\..\premake\inc\lame;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;MPG123_NO_LARGENAME;LINK_MPG123_DLL;HAVE_CONFIG_H;HAVE_MPGLIB;HAVE_MPG123;USE_LAYER_2;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\include\mpg123\src\include;..\..\..\include\lame\include;..\..\..\include\lame\libmp3lame;..\..\..\include\lame;..\..\premake\inc\lame;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
       <MinimalRebuild>false</MinimalRebuild>
@@ -185,8 +185,8 @@
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;HAVE_CONFIG_H;HAVE_MPGLIB;USE_LAYER_2;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\include\lame\include;..\..\..\include\lame\mpglib;..\..\..\include\lame\libmp3lame;..\..\premake\inc\lame;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;MPG123_NO_LARGENAME;LINK_MPG123_DLL;HAVE_CONFIG_H;HAVE_MPGLIB;HAVE_MPG123;USE_LAYER_2;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\include\mpg123\src\include;..\..\..\include\lame\include;..\..\..\include\lame\libmp3lame;..\..\..\include\lame;..\..\premake\inc\lame;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -215,8 +215,8 @@
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;HAVE_CONFIG_H;HAVE_MPGLIB;USE_LAYER_2;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\include\lame\include;..\..\..\include\lame\mpglib;..\..\..\include\lame\libmp3lame;..\..\premake\inc\lame;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;MPG123_NO_LARGENAME;LINK_MPG123_DLL;HAVE_CONFIG_H;HAVE_MPGLIB;HAVE_MPG123;USE_LAYER_2;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\include\mpg123\src\include;..\..\..\include\lame\include;..\..\..\include\lame\libmp3lame;..\..\..\include\lame;..\..\premake\inc\lame;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <Optimization>Full</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -245,8 +245,8 @@
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;HAVE_CONFIG_H;HAVE_MPGLIB;USE_LAYER_2;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\include\lame\include;.....
 
[truncated message content]

[OMPT-svn-commit] OpenMPT r25791 - in trunk/OpenMPT/build: vs2022win10 vs2022win10uwp vs2026previewwin11 vs2026win11 vs2026win11clang vs2026win11uwp xcode-ios/ext/mpg123.xcodeproj xcode-ios/ext/ogg.xcodeproj xcode-ios/ext/vorbis.xcodeproj xcode-ios/libopenmpt.xcodeproj xcode-macosx/ext/mpg123.xcodeproj xcode-macosx/ext/ogg.xcodeproj xcode-macosx/ext/vorbis.xcodeproj xcode-macosx/libopenmpt.xcodeproj

From: <sv...@op...> - 2026-10-23 13:44:15

Author: manx
Date: Fri Oct 23 15:44:06 2026
New Revision: 25791
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=25791

Log:
[Var] Regenerate project files.

Modified:
   trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.sln
   trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.sln
   trunk/OpenMPT/build/vs2022win10/OpenMPT.sln
   trunk/OpenMPT/build/vs2022win10/PluginBridge.sln
   trunk/OpenMPT/build/vs2022win10/all.sln
   trunk/OpenMPT/build/vs2022win10/in_openmpt.sln
   trunk/OpenMPT/build/vs2022win10/libopenmpt-small.sln
   trunk/OpenMPT/build/vs2022win10/libopenmpt.sln
   trunk/OpenMPT/build/vs2022win10/libopenmpt_test.sln
   trunk/OpenMPT/build/vs2022win10/openmpt123.sln
   trunk/OpenMPT/build/vs2022win10/xmp-openmpt.sln
   trunk/OpenMPT/build/vs2022win10uwp/all.sln
   trunk/OpenMPT/build/vs2022win10uwp/libopenmpt-small.sln
   trunk/OpenMPT/build/vs2022win10uwp/libopenmpt.sln
   trunk/OpenMPT/build/vs2022win10uwp/openmpt123.sln
   trunk/OpenMPT/build/vs2026previewwin11/OpenMPT-ANSI.slnx
   trunk/OpenMPT/build/vs2026previewwin11/OpenMPT-UTF8.slnx
   trunk/OpenMPT/build/vs2026previewwin11/OpenMPT.slnx
   trunk/OpenMPT/build/vs2026previewwin11/PluginBridge.slnx
   trunk/OpenMPT/build/vs2026previewwin11/all.slnx
   trunk/OpenMPT/build/vs2026previewwin11/in_openmpt.slnx
   trunk/OpenMPT/build/vs2026previewwin11/libopenmpt-small.slnx
   trunk/OpenMPT/build/vs2026previewwin11/libopenmpt.slnx
   trunk/OpenMPT/build/vs2026previewwin11/libopenmpt_test.slnx
   trunk/OpenMPT/build/vs2026previewwin11/openmpt123.slnx
   trunk/OpenMPT/build/vs2026previewwin11/xmp-openmpt.slnx
   trunk/OpenMPT/build/vs2026win11/OpenMPT-ANSI.slnx
   trunk/OpenMPT/build/vs2026win11/OpenMPT-UTF8.slnx
   trunk/OpenMPT/build/vs2026win11/OpenMPT.slnx
   trunk/OpenMPT/build/vs2026win11/PluginBridge.slnx
   trunk/OpenMPT/build/vs2026win11/all.slnx
   trunk/OpenMPT/build/vs2026win11/in_openmpt.slnx
   trunk/OpenMPT/build/vs2026win11/libopenmpt-small.slnx
   trunk/OpenMPT/build/vs2026win11/libopenmpt.slnx
   trunk/OpenMPT/build/vs2026win11/libopenmpt_test.slnx
   trunk/OpenMPT/build/vs2026win11/openmpt123.slnx
   trunk/OpenMPT/build/vs2026win11/xmp-openmpt.slnx
   trunk/OpenMPT/build/vs2026win11clang/OpenMPT-ANSI.slnx
   trunk/OpenMPT/build/vs2026win11clang/OpenMPT-UTF8.slnx
   trunk/OpenMPT/build/vs2026win11clang/OpenMPT.slnx
   trunk/OpenMPT/build/vs2026win11clang/PluginBridge.slnx
   trunk/OpenMPT/build/vs2026win11clang/all.slnx
   trunk/OpenMPT/build/vs2026win11clang/in_openmpt.slnx
   trunk/OpenMPT/build/vs2026win11clang/libopenmpt-small.slnx
   trunk/OpenMPT/build/vs2026win11clang/libopenmpt.slnx
   trunk/OpenMPT/build/vs2026win11clang/libopenmpt_test.slnx
   trunk/OpenMPT/build/vs2026win11clang/openmpt123.slnx
   trunk/OpenMPT/build/vs2026win11clang/xmp-openmpt.slnx
   trunk/OpenMPT/build/vs2026win11uwp/all.slnx
   trunk/OpenMPT/build/vs2026win11uwp/libopenmpt-small.slnx
   trunk/OpenMPT/build/vs2026win11uwp/libopenmpt.slnx
   trunk/OpenMPT/build/vs2026win11uwp/openmpt123.slnx
   trunk/OpenMPT/build/xcode-ios/ext/mpg123.xcodeproj/project.pbxproj
   trunk/OpenMPT/build/xcode-ios/ext/ogg.xcodeproj/project.pbxproj
   trunk/OpenMPT/build/xcode-ios/ext/vorbis.xcodeproj/project.pbxproj
   trunk/OpenMPT/build/xcode-ios/libopenmpt.xcodeproj/project.pbxproj
   trunk/OpenMPT/build/xcode-macosx/ext/mpg123.xcodeproj/project.pbxproj
   trunk/OpenMPT/build/xcode-macosx/ext/ogg.xcodeproj/project.pbxproj
   trunk/OpenMPT/build/xcode-macosx/ext/vorbis.xcodeproj/project.pbxproj
   trunk/OpenMPT/build/xcode-macosx/libopenmpt.xcodeproj/project.pbxproj

Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.sln
==============================================================================
--- trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.sln	Fri Oct 23 15:41:26 2026	(r25790)
+++ trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.sln	Fri Oct 23 15:44:06 2026	(r25791)
@@ -49,8 +49,8 @@
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		CheckedShared|ARM = CheckedShared|ARM
 		CheckedShared|ARM64 = CheckedShared|ARM64
+		CheckedShared|ARM = CheckedShared|ARM
 		CheckedShared|Win32 = CheckedShared|Win32
 		CheckedShared|x64 = CheckedShared|x64
 		Checked|ARM = Checked|ARM
@@ -75,10 +75,10 @@
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{BA66DB50-E2F0-4C9E-B650-0CCA6C66E1C1}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
-		{BA66DB50-E2F0-4C9E-B650-0CCA6C66E1C1}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{BA66DB50-E2F0-4C9E-B650-0CCA6C66E1C1}.CheckedShared|ARM64.ActiveCfg = CheckedShared|ARM64
 		{BA66DB50-E2F0-4C9E-B650-0CCA6C66E1C1}.CheckedShared|ARM64.Build.0 = CheckedShared|ARM64
+		{BA66DB50-E2F0-4C9E-B650-0CCA6C66E1C1}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
+		{BA66DB50-E2F0-4C9E-B650-0CCA6C66E1C1}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{BA66DB50-E2F0-4C9E-B650-0CCA6C66E1C1}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32
 		{BA66DB50-E2F0-4C9E-B650-0CCA6C66E1C1}.CheckedShared|Win32.Build.0 = CheckedShared|Win32
 		{BA66DB50-E2F0-4C9E-B650-0CCA6C66E1C1}.CheckedShared|x64.ActiveCfg = CheckedShared|x64
@@ -123,10 +123,10 @@
 		{BA66DB50-E2F0-4C9E-B650-0CCA6C66E1C1}.Release|Win32.Build.0 = Release|Win32
 		{BA66DB50-E2F0-4C9E-B650-0CCA6C66E1C1}.Release|x64.ActiveCfg = Release|x64
 		{BA66DB50-E2F0-4C9E-B650-0CCA6C66E1C1}.Release|x64.Build.0 = Release|x64
-		{563A631D-FE07-47BC-A98F-9FE5B3EBABFA}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
-		{563A631D-FE07-47BC-A98F-9FE5B3EBABFA}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{563A631D-FE07-47BC-A98F-9FE5B3EBABFA}.CheckedShared|ARM64.ActiveCfg = CheckedShared|ARM64
 		{563A631D-FE07-47BC-A98F-9FE5B3EBABFA}.CheckedShared|ARM64.Build.0 = CheckedShared|ARM64
+		{563A631D-FE07-47BC-A98F-9FE5B3EBABFA}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
+		{563A631D-FE07-47BC-A98F-9FE5B3EBABFA}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{563A631D-FE07-47BC-A98F-9FE5B3EBABFA}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32
 		{563A631D-FE07-47BC-A98F-9FE5B3EBABFA}.CheckedShared|Win32.Build.0 = CheckedShared|Win32
 		{563A631D-FE07-47BC-A98F-9FE5B3EBABFA}.CheckedShared|x64.ActiveCfg = CheckedShared|x64
@@ -171,10 +171,10 @@
 		{563A631D-FE07-47BC-A98F-9FE5B3EBABFA}.Release|Win32.Build.0 = Release|Win32
 		{563A631D-FE07-47BC-A98F-9FE5B3EBABFA}.Release|x64.ActiveCfg = Release|x64
 		{563A631D-FE07-47BC-A98F-9FE5B3EBABFA}.Release|x64.Build.0 = Release|x64
-		{F3DA2BF5-E84A-4F71-80AB-884594863D3A}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
-		{F3DA2BF5-E84A-4F71-80AB-884594863D3A}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{F3DA2BF5-E84A-4F71-80AB-884594863D3A}.CheckedShared|ARM64.ActiveCfg = CheckedShared|ARM64
 		{F3DA2BF5-E84A-4F71-80AB-884594863D3A}.CheckedShared|ARM64.Build.0 = CheckedShared|ARM64
+		{F3DA2BF5-E84A-4F71-80AB-884594863D3A}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
+		{F3DA2BF5-E84A-4F71-80AB-884594863D3A}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{F3DA2BF5-E84A-4F71-80AB-884594863D3A}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32
 		{F3DA2BF5-E84A-4F71-80AB-884594863D3A}.CheckedShared|Win32.Build.0 = CheckedShared|Win32
 		{F3DA2BF5-E84A-4F71-80AB-884594863D3A}.CheckedShared|x64.ActiveCfg = CheckedShared|x64
@@ -219,10 +219,10 @@
 		{F3DA2BF5-E84A-4F71-80AB-884594863D3A}.Release|Win32.Build.0 = Release|Win32
 		{F3DA2BF5-E84A-4F71-80AB-884594863D3A}.Release|x64.ActiveCfg = Release|x64
 		{F3DA2BF5-E84A-4F71-80AB-884594863D3A}.Release|x64.Build.0 = Release|x64
-		{1A147336-891E-49AC-9EAD-A750599A224C}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
-		{1A147336-891E-49AC-9EAD-A750599A224C}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{1A147336-891E-49AC-9EAD-A750599A224C}.CheckedShared|ARM64.ActiveCfg = CheckedShared|ARM64
 		{1A147336-891E-49AC-9EAD-A750599A224C}.CheckedShared|ARM64.Build.0 = CheckedShared|ARM64
+		{1A147336-891E-49AC-9EAD-A750599A224C}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
+		{1A147336-891E-49AC-9EAD-A750599A224C}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{1A147336-891E-49AC-9EAD-A750599A224C}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32
 		{1A147336-891E-49AC-9EAD-A750599A224C}.CheckedShared|Win32.Build.0 = CheckedShared|Win32
 		{1A147336-891E-49AC-9EAD-A750599A224C}.CheckedShared|x64.ActiveCfg = CheckedShared|x64
@@ -267,10 +267,10 @@
 		{1A147336-891E-49AC-9EAD-A750599A224C}.Release|Win32.Build.0 = Release|Win32
 		{1A147336-891E-49AC-9EAD-A750599A224C}.Release|x64.ActiveCfg = Release|x64
 		{1A147336-891E-49AC-9EAD-A750599A224C}.Release|x64.Build.0 = Release|x64
-		{BDEC2D44-C957-4940-A32B-02824AF6E21D}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
-		{BDEC2D44-C957-4940-A32B-02824AF6E21D}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{BDEC2D44-C957-4940-A32B-02824AF6E21D}.CheckedShared|ARM64.ActiveCfg = CheckedShared|ARM64
 		{BDEC2D44-C957-4940-A32B-02824AF6E21D}.CheckedShared|ARM64.Build.0 = CheckedShared|ARM64
+		{BDEC2D44-C957-4940-A32B-02824AF6E21D}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
+		{BDEC2D44-C957-4940-A32B-02824AF6E21D}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{BDEC2D44-C957-4940-A32B-02824AF6E21D}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32
 		{BDEC2D44-C957-4940-A32B-02824AF6E21D}.CheckedShared|Win32.Build.0 = CheckedShared|Win32
 		{BDEC2D44-C957-4940-A32B-02824AF6E21D}.CheckedShared|x64.ActiveCfg = CheckedShared|x64
@@ -315,10 +315,10 @@
 		{BDEC2D44-C957-4940-A32B-02824AF6E21D}.Release|Win32.Build.0 = Release|Win32
 		{BDEC2D44-C957-4940-A32B-02824AF6E21D}.Release|x64.ActiveCfg = Release|x64
 		{BDEC2D44-C957-4940-A32B-02824AF6E21D}.Release|x64.Build.0 = Release|x64
-		{95CC809B-03FC-4EDB-BB20-FD07A698C05F}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
-		{95CC809B-03FC-4EDB-BB20-FD07A698C05F}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{95CC809B-03FC-4EDB-BB20-FD07A698C05F}.CheckedShared|ARM64.ActiveCfg = CheckedShared|ARM64
 		{95CC809B-03FC-4EDB-BB20-FD07A698C05F}.CheckedShared|ARM64.Build.0 = CheckedShared|ARM64
+		{95CC809B-03FC-4EDB-BB20-FD07A698C05F}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
+		{95CC809B-03FC-4EDB-BB20-FD07A698C05F}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{95CC809B-03FC-4EDB-BB20-FD07A698C05F}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32
 		{95CC809B-03FC-4EDB-BB20-FD07A698C05F}.CheckedShared|Win32.Build.0 = CheckedShared|Win32
 		{95CC809B-03FC-4EDB-BB20-FD07A698C05F}.CheckedShared|x64.ActiveCfg = CheckedShared|x64
@@ -363,10 +363,10 @@
 		{95CC809B-03FC-4EDB-BB20-FD07A698C05F}.Release|Win32.Build.0 = Release|Win32
 		{95CC809B-03FC-4EDB-BB20-FD07A698C05F}.Release|x64.ActiveCfg = Release|x64
 		{95CC809B-03FC-4EDB-BB20-FD07A698C05F}.Release|x64.Build.0 = Release|x64
-		{E1184509-74F7-421D-A8C8-FEEC2C28ECC2}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
-		{E1184509-74F7-421D-A8C8-FEEC2C28ECC2}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{E1184509-74F7-421D-A8C8-FEEC2C28ECC2}.CheckedShared|ARM64.ActiveCfg = CheckedShared|ARM64
 		{E1184509-74F7-421D-A8C8-FEEC2C28ECC2}.CheckedShared|ARM64.Build.0 = CheckedShared|ARM64
+		{E1184509-74F7-421D-A8C8-FEEC2C28ECC2}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
+		{E1184509-74F7-421D-A8C8-FEEC2C28ECC2}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{E1184509-74F7-421D-A8C8-FEEC2C28ECC2}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32
 		{E1184509-74F7-421D-A8C8-FEEC2C28ECC2}.CheckedShared|Win32.Build.0 = CheckedShared|Win32
 		{E1184509-74F7-421D-A8C8-FEEC2C28ECC2}.CheckedShared|x64.ActiveCfg = CheckedShared|x64
@@ -411,10 +411,10 @@
 		{E1184509-74F7-421D-A8C8-FEEC2C28ECC2}.Release|Win32.Build.0 = Release|Win32
 		{E1184509-74F7-421D-A8C8-FEEC2C28ECC2}.Release|x64.ActiveCfg = Release|x64
 		{E1184509-74F7-421D-A8C8-FEEC2C28ECC2}.Release|x64.Build.0 = Release|x64
-		{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
-		{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.CheckedShared|ARM64.ActiveCfg = CheckedShared|ARM64
 		{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.CheckedShared|ARM64.Build.0 = CheckedShared|ARM64
+		{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
+		{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32
 		{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.CheckedShared|Win32.Build.0 = CheckedShared|Win32
 		{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.CheckedShared|x64.ActiveCfg = CheckedShared|x64
@@ -459,10 +459,10 @@
 		{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.Release|Win32.Build.0 = Release|Win32
 		{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.Release|x64.ActiveCfg = Release|x64
 		{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.Release|x64.Build.0 = Release|x64
-		{B545694A-CE2A-44F8-BA88-147C36369308}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
-		{B545694A-CE2A-44F8-BA88-147C36369308}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{B545694A-CE2A-44F8-BA88-147C36369308}.CheckedShared|ARM64.ActiveCfg = CheckedShared|ARM64
 		{B545694A-CE2A-44F8-BA88-147C36369308}.CheckedShared|ARM64.Build.0 = CheckedShared|ARM64
+		{B545694A-CE2A-44F8-BA88-147C36369308}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
+		{B545694A-CE2A-44F8-BA88-147C36369308}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{B545694A-CE2A-44F8-BA88-147C36369308}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32
 		{B545694A-CE2A-44F8-BA88-147C36369308}.CheckedShared|Win32.Build.0 = CheckedShared|Win32
 		{B545694A-CE2A-44F8-BA88-147C36369308}.CheckedShared|x64.ActiveCfg = CheckedShared|x64
@@ -507,10 +507,10 @@
 		{B545694A-CE2A-44F8-BA88-147C36369308}.Release|Win32.Build.0 = Release|Win32
 		{B545694A-CE2A-44F8-BA88-147C36369308}.Release|x64.ActiveCfg = Release|x64
 		{B545694A-CE2A-44F8-BA88-147C36369308}.Release|x64.Build.0 = Release|x64
-		{6B11F6A8-B131-4D2B-80EF-5731A9016436}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
-		{6B11F6A8-B131-4D2B-80EF-5731A9016436}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{6B11F6A8-B131-4D2B-80EF-5731A9016436}.CheckedShared|ARM64.ActiveCfg = CheckedShared|ARM64
 		{6B11F6A8-B131-4D2B-80EF-5731A9016436}.CheckedShared|ARM64.Build.0 = CheckedShared|ARM64
+		{6B11F6A8-B131-4D2B-80EF-5731A9016436}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
+		{6B11F6A8-B131-4D2B-80EF-5731A9016436}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{6B11F6A8-B131-4D2B-80EF-5731A9016436}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32
 		{6B11F6A8-B131-4D2B-80EF-5731A9016436}.CheckedShared|Win32.Build.0 = CheckedShared|Win32
 		{6B11F6A8-B131-4D2B-80EF-5731A9016436}.CheckedShared|x64.ActiveCfg = CheckedShared|x64
@@ -555,10 +555,10 @@
 		{6B11F6A8-B131-4D2B-80EF-5731A9016436}.Release|Win32.Build.0 = Release|Win32
 		{6B11F6A8-B131-4D2B-80EF-5731A9016436}.Release|x64.ActiveCfg = Release|x64
 		{6B11F6A8-B131-4D2B-80EF-5731A9016436}.Release|x64.Build.0 = Release|x64
-		{63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
-		{63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.CheckedShared|ARM64.ActiveCfg = CheckedShared|ARM64
 		{63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.CheckedShared|ARM64.Build.0 = CheckedShared|ARM64
+		{63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
+		{63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32
 		{63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.CheckedShared|Win32.Build.0 = CheckedShared|Win32
 		{63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.CheckedShared|x64.ActiveCfg = CheckedShared|x64
@@ -603,10 +603,10 @@
 		{63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.Release|Win32.Build.0 = Release|Win32
 		{63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.Release|x64.ActiveCfg = Release|x64
 		{63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.Release|x64.Build.0 = Release|x64
-		{7ADFAFB9-0A83-4D35-9891-FB24FDF30B53}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
-		{7ADFAFB9-0A83-4D35-9891-FB24FDF30B53}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{7ADFAFB9-0A83-4D35-9891-FB24FDF30B53}.CheckedShared|ARM64.ActiveCfg = CheckedShared|ARM64
 		{7ADFAFB9-0A83-4D35-9891-FB24FDF30B53}.CheckedShared|ARM64.Build.0 = CheckedShared|ARM64
+		{7ADFAFB9-0A83-4D35-9891-FB24FDF30B53}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
+		{7ADFAFB9-0A83-4D35-9891-FB24FDF30B53}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{7ADFAFB9-0A83-4D35-9891-FB24FDF30B53}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32
 		{7ADFAFB9-0A83-4D35-9891-FB24FDF30B53}.CheckedShared|Win32.Build.0 = CheckedShared|Win32
 		{7ADFAFB9-0A83-4D35-9891-FB24FDF30B53}.CheckedShared|x64.ActiveCfg = CheckedShared|x64
@@ -651,10 +651,10 @@
 		{7ADFAFB9-0A83-4D35-9891-FB24FDF30B53}.Release|Win32.Build.0 = Release|Win32
 		{7ADFAFB9-0A83-4D35-9891-FB24FDF30B53}.Release|x64.ActiveCfg = Release|x64
 		{7ADFAFB9-0A83-4D35-9891-FB24FDF30B53}.Release|x64.Build.0 = Release|x64
-		{D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
-		{D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.CheckedShared|ARM64.ActiveCfg = CheckedShared|ARM64
 		{D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.CheckedShared|ARM64.Build.0 = CheckedShared|ARM64
+		{D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
+		{D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32
 		{D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.CheckedShared|Win32.Build.0 = CheckedShared|Win32
 		{D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.CheckedShared|x64.ActiveCfg = CheckedShared|x64
@@ -699,10 +699,10 @@
 		{D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Release|Win32.Build.0 = Release|Win32
 		{D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Release|x64.ActiveCfg = Release|x64
 		{D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Release|x64.Build.0 = Release|x64
-		{9A2D9099-E1A2-4287-B845-E3598AD24D70}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
-		{9A2D9099-E1A2-4287-B845-E3598AD24D70}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{9A2D9099-E1A2-4287-B845-E3598AD24D70}.CheckedShared|ARM64.ActiveCfg = CheckedShared|ARM64
 		{9A2D9099-E1A2-4287-B845-E3598AD24D70}.CheckedShared|ARM64.Build.0 = CheckedShared|ARM64
+		{9A2D9099-E1A2-4287-B845-E3598AD24D70}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
+		{9A2D9099-E1A2-4287-B845-E3598AD24D70}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{9A2D9099-E1A2-4287-B845-E3598AD24D70}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32
 		{9A2D9099-E1A2-4287-B845-E3598AD24D70}.CheckedShared|Win32.Build.0 = CheckedShared|Win32
 		{9A2D9099-E1A2-4287-B845-E3598AD24D70}.CheckedShared|x64.ActiveCfg = CheckedShared|x64
@@ -747,10 +747,10 @@
 		{9A2D9099-E1A2-4287-B845-E3598AD24D70}.Release|Win32.Build.0 = Release|Win32
 		{9A2D9099-E1A2-4287-B845-E3598AD24D70}.Release|x64.ActiveCfg = Release|x64
 		{9A2D9099-E1A2-4287-B845-E3598AD24D70}.Release|x64.Build.0 = Release|x64
-		{290BBF89-2572-4291-9D9C-FF021D4FD313}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
-		{290BBF89-2572-4291-9D9C-FF021D4FD313}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{290BBF89-2572-4291-9D9C-FF021D4FD313}.CheckedShared|ARM64.ActiveCfg = CheckedShared|ARM64
 		{290BBF89-2572-4291-9D9C-FF021D4FD313}.CheckedShared|ARM64.Build.0 = CheckedShared|ARM64
+		{290BBF89-2572-4291-9D9C-FF021D4FD313}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
+		{290BBF89-2572-4291-9D9C-FF021D4FD313}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{290BBF89-2572-4291-9D9C-FF021D4FD313}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32
 		{290BBF89-2572-4291-9D9C-FF021D4FD313}.CheckedShared|Win32.Build.0 = CheckedShared|Win32
 		{290BBF89-2572-4291-9D9C-FF021D4FD313}.CheckedShared|x64.ActiveCfg = CheckedShared|x64
@@ -795,10 +795,10 @@
 		{290BBF89-2572-4291-9D9C-FF021D4FD313}.Release|Win32.Build.0 = Release|Win32
 		{290BBF89-2572-4291-9D9C-FF021D4FD313}.Release|x64.ActiveCfg = Release|x64
 		{290BBF89-2572-4291-9D9C-FF021D4FD313}.Release|x64.Build.0 = Release|x64
-		{F8517509-9317-4A46-B5ED-06AE5A399E6C}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
-		{F8517509-9317-4A46-B5ED-06AE5A399E6C}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{F8517509-9317-4A46-B5ED-06AE5A399E6C}.CheckedShared|ARM64.ActiveCfg = CheckedShared|ARM64
 		{F8517509-9317-4A46-B5ED-06AE5A399E6C}.CheckedShared|ARM64.Build.0 = CheckedShared|ARM64
+		{F8517509-9317-4A46-B5ED-06AE5A399E6C}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
+		{F8517509-9317-4A46-B5ED-06AE5A399E6C}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{F8517509-9317-4A46-B5ED-06AE5A399E6C}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32
 		{F8517509-9317-4A46-B5ED-06AE5A399E6C}.CheckedShared|Win32.Build.0 = CheckedShared|Win32
 		{F8517509-9317-4A46-B5ED-06AE5A399E6C}.CheckedShared|x64.ActiveCfg = CheckedShared|x64
@@ -843,10 +843,10 @@
 		{F8517509-9317-4A46-B5ED-06AE5A399E6C}.Release|Win32.Build.0 = Release|Win32
 		{F8517509-9317-4A46-B5ED-06AE5A399E6C}.Release|x64.ActiveCfg = Release|x64
 		{F8517509-9317-4A46-B5ED-06AE5A399E6C}.Release|x64.Build.0 = Release|x64
-		{189B867F-FF4B-45A1-B741-A97492EE69AF}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
-		{189B867F-FF4B-45A1-B741-A97492EE69AF}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{189B867F-FF4B-45A1-B741-A97492EE69AF}.CheckedShared|ARM64.ActiveCfg = CheckedShared|ARM64
 		{189B867F-FF4B-45A1-B741-A97492EE69AF}.CheckedShared|ARM64.Build.0 = CheckedShared|ARM64
+		{189B867F-FF4B-45A1-B741-A97492EE69AF}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
+		{189B867F-FF4B-45A1-B741-A97492EE69AF}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{189B867F-FF4B-45A1-B741-A97492EE69AF}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32
 		{189B867F-FF4B-45A1-B741-A97492EE69AF}.CheckedShared|Win32.Build.0 = CheckedShared|Win32
 		{189B867F-FF4B-45A1-B741-A97492EE69AF}.CheckedShared|x64.ActiveCfg = CheckedShared|x64
@@ -891,10 +891,10 @@
 		{189B867F-FF4B-45A1-B741-A97492EE69AF}.Release|Win32.Build.0 = Release|Win32
 		{189B867F-FF4B-45A1-B741-A97492EE69AF}.Release|x64.ActiveCfg = Release|x64
 		{189B867F-FF4B-45A1-B741-A97492EE69AF}.Release|x64.Build.0 = Release|x64
-		{BC116B29-9958-4389-B294-7529BB7C7D37}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
-		{BC116B29-9958-4389-B294-7529BB7C7D37}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{BC116B29-9958-4389-B294-7529BB7C7D37}.CheckedShared|ARM64.ActiveCfg = CheckedShared|ARM64
 		{BC116B29-9958-4389-B294-7529BB7C7D37}.CheckedShared|ARM64.Build.0 = CheckedShared|ARM64
+		{BC116B29-9958-4389-B294-7529BB7C7D37}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
+		{BC116B29-9958-4389-B294-7529BB7C7D37}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{BC116B29-9958-4389-B294-7529BB7C7D37}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32
 		{BC116B29-9958-4389-B294-7529BB7C7D37}.CheckedShared|Win32.Build.0 = CheckedShared|Win32
 		{BC116B29-9958-4389-B294-7529BB7C7D37}.CheckedShared|x64.ActiveCfg = CheckedShared|x64
@@ -939,10 +939,10 @@
 		{BC116B29-9958-4389-B294-7529BB7C7D37}.Release|Win32.Build.0 = Release|Win32
 		{BC116B29-9958-4389-B294-7529BB7C7D37}.Release|x64.ActiveCfg = Release|x64
 		{BC116B29-9958-4389-B294-7529BB7C7D37}.Release|x64.Build.0 = Release|x64
-		{4886456B-1342-4EC8-AD3F-D92AEB8C1097}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
-		{4886456B-1342-4EC8-AD3F-D92AEB8C1097}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{4886456B-1342-4EC8-AD3F-D92AEB8C1097}.CheckedShared|ARM64.ActiveCfg = CheckedShared|ARM64
 		{4886456B-1342-4EC8-AD3F-D92AEB8C1097}.CheckedShared|ARM64.Build.0 = CheckedShared|ARM64
+		{4886456B-1342-4EC8-AD3F-D92AEB8C1097}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
+		{4886456B-1342-4EC8-AD3F-D92AEB8C1097}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{4886456B-1342-4EC8-AD3F-D92AEB8C1097}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32
 		{4886456B-1342-4EC8-AD3F-D92AEB8C1097}.CheckedShared|Win32.Build.0 = CheckedShared|Win32
 		{4886456B-1342-4EC8-AD3F-D92AEB8C1097}.CheckedShared|x64.ActiveCfg = CheckedShared|x64
@@ -987,10 +987,10 @@
 		{4886456B-1342-4EC8-AD3F-D92AEB8C1097}.Release|Win32.Build.0 = Release|Win32
 		{4886456B-1342-4EC8-AD3F-D92AEB8C1097}.Release|x64.ActiveCfg = Release|x64
 		{4886456B-1342-4EC8-AD3F-D92AEB8C1097}.Release|x64.Build.0 = Release|x64
-		{05BBD03D-0985-4D76-8DDD-534DA631C3A8}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
-		{05BBD03D-0985-4D76-8DDD-534DA631C3A8}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{05BBD03D-0985-4D76-8DDD-534DA631C3A8}.CheckedShared|ARM64.ActiveCfg = CheckedShared|ARM64
 		{05BBD03D-0985-4D76-8DDD-534DA631C3A8}.CheckedShared|ARM64.Build.0 = CheckedShared|ARM64
+		{05BBD03D-0985-4D76-8DDD-534DA631C3A8}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
+		{05BBD03D-0985-4D76-8DDD-534DA631C3A8}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{05BBD03D-0985-4D76-8DDD-534DA631C3A8}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32
 		{05BBD03D-0985-4D76-8DDD-534DA631C3A8}.CheckedShared|Win32.Build.0 = CheckedShared|Win32
 		{05BBD03D-0985-4D76-8DDD-534DA631C3A8}.CheckedShared|x64.ActiveCfg = CheckedShared|x64
@@ -1035,10 +1035,10 @@
 		{05BBD03D-0985-4D76-8DDD-534DA631C3A8}.Release|Win32.Build.0 = Release|Win32
 		{05BBD03D-0985-4D76-8DDD-534DA631C3A8}.Release|x64.ActiveCfg = Release|x64
 		{05BBD03D-0985-4D76-8DDD-534DA631C3A8}.Release|x64.Build.0 = Release|x64
-		{89B3630F-5728-4902-8258-D4DBC532E185}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
-		{89B3630F-5728-4902-8258-D4DBC532E185}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{89B3630F-5728-4902-8258-D4DBC532E185}.CheckedShared|ARM64.ActiveCfg = CheckedShared|ARM64
 		{89B3630F-5728-4902-8258-D4DBC532E185}.CheckedShared|ARM64.Build.0 = CheckedShared|ARM64
+		{89B3630F-5728-4902-8258-D4DBC532E185}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
+		{89B3630F-5728-4902-8258-D4DBC532E185}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{89B3630F-5728-4902-8258-D4DBC532E185}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32
 		{89B3630F-5728-4902-8258-D4DBC532E185}.CheckedShared|Win32.Build.0 = CheckedShared|Win32
 		{89B3630F-5728-4902-8258-D4DBC532E185}.CheckedShared|x64.ActiveCfg = CheckedShared|x64
@@ -1083,10 +1083,10 @@
 		{89B3630F-5728-4902-8258-D4DBC532E185}.Release|Win32.Build.0 = Release|Win32
 		{89B3630F-5728-4902-8258-D4DBC532E185}.Release|x64.ActiveCfg = Release|x64
 		{89B3630F-5728-4902-8258-D4DBC532E185}.Release|x64.Build.0 = Release|x64
-		{B544DCB7-16E5-41BC-B51B-7EAD8CFDFA05}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
-		{B544DCB7-16E5-41BC-B51B-7EAD8CFDFA05}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{B544DCB7-16E5-41BC-B51B-7EAD8CFDFA05}.CheckedShared|ARM64.ActiveCfg = CheckedShared|ARM64
 		{B544DCB7-16E5-41BC-B51B-7EAD8CFDFA05}.CheckedShared|ARM64.Build.0 = CheckedShared|ARM64
+		{B544DCB7-16E5-41BC-B51B-7EAD8CFDFA05}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
+		{B544DCB7-16E5-41BC-B51B-7EAD8CFDFA05}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{B544DCB7-16E5-41BC-B51B-7EAD8CFDFA05}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32
 		{B544DCB7-16E5-41BC-B51B-7EAD8CFDFA05}.CheckedShared|Win32.Build.0 = CheckedShared|Win32
 		{B544DCB7-16E5-41BC-B51B-7EAD8CFDFA05}.CheckedShared|x64.ActiveCfg = CheckedShared|x64
@@ -1131,10 +1131,10 @@
 		{B544DCB7-16E5-41BC-B51B-7EAD8CFDFA05}.Release|Win32.Build.0 = Release|Win32
 		{B544DCB7-16E5-41BC-B51B-7EAD8CFDFA05}.Release|x64.ActiveCfg = Release|x64
 		{B544DCB7-16E5-41BC-B51B-7EAD8CFDFA05}.Release|x64.Build.0 = Release|x64
-		{1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
-		{1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.CheckedShared|ARM64.ActiveCfg = CheckedShared|ARM64
 		{1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.CheckedShared|ARM64.Build.0 = CheckedShared|ARM64
+		{1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
+		{1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32
 		{1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.CheckedShared|Win32.Build.0 = CheckedShared|Win32
 		{1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.CheckedShared|x64.ActiveCfg = CheckedShared|x64

Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.sln
==============================================================================
--- trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.sln	Fri Oct 23 15:41:26 2026	(r25790)
+++ trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.sln	Fri Oct 23 15:44:06 2026	(r25791)
@@ -49,8 +49,8 @@
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		CheckedShared|ARM = CheckedShared|ARM
 		CheckedShared|ARM64 = CheckedShared|ARM64
+		CheckedShared|ARM = CheckedShared|ARM
 		CheckedShared|Win32 = CheckedShared|Win32
 		CheckedShared|x64 = CheckedShared|x64
 		Checked|ARM = Checked|ARM
@@ -75,10 +75,10 @@
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{E89507FA-A251-457E-9957-F6B453C77DAF}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
-		{E89507FA-A251-457E-9957-F6B453C77DAF}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{E89507FA-A251-457E-9957-F6B453C77DAF}.CheckedShared|ARM64.ActiveCfg = CheckedShared|ARM64
 		{E89507FA-A251-457E-9957-F6B453C77DAF}.CheckedShared|ARM64.Build.0 = CheckedShared|ARM64
+		{E89507FA-A251-457E-9957-F6B453C77DAF}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
+		{E89507FA-A251-457E-9957-F6B453C77DAF}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{E89507FA-A251-457E-9957-F6B453C77DAF}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32
 		{E89507FA-A251-457E-9957-F6B453C77DAF}.CheckedShared|Win32.Build.0 = CheckedShared|Win32
 		{E89507FA-A251-457E-9957-F6B453C77DAF}.CheckedShared|x64.ActiveCfg = CheckedShared|x64
@@ -123,10 +123,10 @@
 		{E89507FA-A251-457E-9957-F6B453C77DAF}.Release|Win32.Build.0 = Release|Win32
 		{E89507FA-A251-457E-9957-F6B453C77DAF}.Release|x64.ActiveCfg = Release|x64
 		{E89507FA-A251-457E-9957-F6B453C77DAF}.Release|x64.Build.0 = Release|x64
-		{563A631D-FE07-47BC-A98F-9FE5B3EBABFA}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
-		{563A631D-FE07-47BC-A98F-9FE5B3EBABFA}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{563A631D-FE07-47BC-A98F-9FE5B3EBABFA}.CheckedShared|ARM64.ActiveCfg = CheckedShared|ARM64
 		{563A631D-FE07-47BC-A98F-9FE5B3EBABFA}.CheckedShared|ARM64.Build.0 = CheckedShared|ARM64
+		{563A631D-FE07-47BC-A98F-9FE5B3EBABFA}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
+		{563A631D-FE07-47BC-A98F-9FE5B3EBABFA}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{563A631D-FE07-47BC-A98F-9FE5B3EBABFA}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32
 		{563A631D-FE07-47BC-A98F-9FE5B3EBABFA}.CheckedShared|Win32.Build.0 = CheckedShared|Win32
 		{563A631D-FE07-47BC-A98F-9FE5B3EBABFA}.CheckedShared|x64.ActiveCfg = CheckedShared|x64
@@ -171,10 +171,10 @@
 		{563A631D-FE07-47BC-A98F-9FE5B3EBABFA}.Release|Win32.Build.0 = Release|Win32
 		{563A631D-FE07-47BC-A98F-9FE5B3EBABFA}.Release|x64.ActiveCfg = Release|x64
 		{563A631D-FE07-47BC-A98F-9FE5B3EBABFA}.Release|x64.Build.0 = Release|x64
-		{F3DA2BF5-E84A-4F71-80AB-884594863D3A}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
-		{F3DA2BF5-E84A-4F71-80AB-884594863D3A}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{F3DA2BF5-E84A-4F71-80AB-884594863D3A}.CheckedShared|ARM64.ActiveCfg = CheckedShared|ARM64
 		{F3DA2BF5-E84A-4F71-80AB-884594863D3A}.CheckedShared|ARM64.Build.0 = CheckedShared|ARM64
+		{F3DA2BF5-E84A-4F71-80AB-884594863D3A}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
+		{F3DA2BF5-E84A-4F71-80AB-884594863D3A}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{F3DA2BF5-E84A-4F71-80AB-884594863D3A}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32
 		{F3DA2BF5-E84A-4F71-80AB-884594863D3A}.CheckedShared|Win32.Build.0 = CheckedShared|Win32
 		{F3DA2BF5-E84A-4F71-80AB-884594863D3A}.CheckedShared|x64.ActiveCfg = CheckedShared|x64
@@ -219,10 +219,10 @@
 		{F3DA2BF5-E84A-4F71-80AB-884594863D3A}.Release|Win32.Build.0 = Release|Win32
 		{F3DA2BF5-E84A-4F71-80AB-884594863D3A}.Release|x64.ActiveCfg = Release|x64
 		{F3DA2BF5-E84A-4F71-80AB-884594863D3A}.Release|x64.Build.0 = Release|x64
-		{1A147336-891E-49AC-9EAD-A750599A224C}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
-		{1A147336-891E-49AC-9EAD-A750599A224C}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{1A147336-891E-49AC-9EAD-A750599A224C}.CheckedShared|ARM64.ActiveCfg = CheckedShared|ARM64
 		{1A147336-891E-49AC-9EAD-A750599A224C}.CheckedShared|ARM64.Build.0 = CheckedShared|ARM64
+		{1A147336-891E-49AC-9EAD-A750599A224C}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
+		{1A147336-891E-49AC-9EAD-A750599A224C}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{1A147336-891E-49AC-9EAD-A750599A224C}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32
 		{1A147336-891E-49AC-9EAD-A750599A224C}.CheckedShared|Win32.Build.0 = CheckedShared|Win32
 		{1A147336-891E-49AC-9EAD-A750599A224C}.CheckedShared|x64.ActiveCfg = CheckedShared|x64
@@ -267,10 +267,10 @@
 		{1A147336-891E-49AC-9EAD-A750599A224C}.Release|Win32.Build.0 = Release|Win32
 		{1A147336-891E-49AC-9EAD-A750599A224C}.Release|x64.ActiveCfg = Release|x64
 		{1A147336-891E-49AC-9EAD-A750599A224C}.Release|x64.Build.0 = Release|x64
-		{BDEC2D44-C957-4940-A32B-02824AF6E21D}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
-		{BDEC2D44-C957-4940-A32B-02824AF6E21D}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{BDEC2D44-C957-4940-A32B-02824AF6E21D}.CheckedShared|ARM64.ActiveCfg = CheckedShared|ARM64
 		{BDEC2D44-C957-4940-A32B-02824AF6E21D}.CheckedShared|ARM64.Build.0 = CheckedShared|ARM64
+		{BDEC2D44-C957-4940-A32B-02824AF6E21D}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
+		{BDEC2D44-C957-4940-A32B-02824AF6E21D}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{BDEC2D44-C957-4940-A32B-02824AF6E21D}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32
 		{BDEC2D44-C957-4940-A32B-02824AF6E21D}.CheckedShared|Win32.Build.0 = CheckedShared|Win32
 		{BDEC2D44-C957-4940-A32B-02824AF6E21D}.CheckedShared|x64.ActiveCfg = CheckedShared|x64
@@ -315,10 +315,10 @@
 		{BDEC2D44-C957-4940-A32B-02824AF6E21D}.Release|Win32.Build.0 = Release|Win32
 		{BDEC2D44-C957-4940-A32B-02824AF6E21D}.Release|x64.ActiveCfg = Release|x64
 		{BDEC2D44-C957-4940-A32B-02824AF6E21D}.Release|x64.Build.0 = Release|x64
-		{95CC809B-03FC-4EDB-BB20-FD07A698C05F}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
-		{95CC809B-03FC-4EDB-BB20-FD07A698C05F}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{95CC809B-03FC-4EDB-BB20-FD07A698C05F}.CheckedShared|ARM64.ActiveCfg = CheckedShared|ARM64
 		{95CC809B-03FC-4EDB-BB20-FD07A698C05F}.CheckedShared|ARM64.Build.0 = CheckedShared|ARM64
+		{95CC809B-03FC-4EDB-BB20-FD07A698C05F}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
+		{95CC809B-03FC-4EDB-BB20-FD07A698C05F}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{95CC809B-03FC-4EDB-BB20-FD07A698C05F}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32
 		{95CC809B-03FC-4EDB-BB20-FD07A698C05F}.CheckedShared|Win32.Build.0 = CheckedShared|Win32
 		{95CC809B-03FC-4EDB-BB20-FD07A698C05F}.CheckedShared|x64.ActiveCfg = CheckedShared|x64
@@ -363,10 +363,10 @@
 		{95CC809B-03FC-4EDB-BB20-FD07A698C05F}.Release|Win32.Build.0 = Release|Win32
 		{95CC809B-03FC-4EDB-BB20-FD07A698C05F}.Release|x64.ActiveCfg = Release|x64
 		{95CC809B-03FC-4EDB-BB20-FD07A698C05F}.Release|x64.Build.0 = Release|x64
-		{E1184509-74F7-421D-A8C8-FEEC2C28ECC2}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
-		{E1184509-74F7-421D-A8C8-FEEC2C28ECC2}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{E1184509-74F7-421D-A8C8-FEEC2C28ECC2}.CheckedShared|ARM64.ActiveCfg = CheckedShared|ARM64
 		{E1184509-74F7-421D-A8C8-FEEC2C28ECC2}.CheckedShared|ARM64.Build.0 = CheckedShared|ARM64
+		{E1184509-74F7-421D-A8C8-FEEC2C28ECC2}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
+		{E1184509-74F7-421D-A8C8-FEEC2C28ECC2}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{E1184509-74F7-421D-A8C8-FEEC2C28ECC2}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32
 		{E1184509-74F7-421D-A8C8-FEEC2C28ECC2}.CheckedShared|Win32.Build.0 = CheckedShared|Win32
 		{E1184509-74F7-421D-A8C8-FEEC2C28ECC2}.CheckedShared|x64.ActiveCfg = CheckedShared|x64
@@ -411,10 +411,10 @@
 		{E1184509-74F7-421D-A8C8-FEEC2C28ECC2}.Release|Win32.Build.0 = Release|Win32
 		{E1184509-74F7-421D-A8C8-FEEC2C28ECC2}.Release|x64.ActiveCfg = Release|x64
 		{E1184509-74F7-421D-A8C8-FEEC2C28ECC2}.Release|x64.Build.0 = Release|x64
-		{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
-		{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.CheckedShared|ARM64.ActiveCfg = CheckedShared|ARM64
 		{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.CheckedShared|ARM64.Build.0 = CheckedShared|ARM64
+		{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
+		{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32
 		{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.CheckedShared|Win32.Build.0 = CheckedShared|Win32
 		{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.CheckedShared|x64.ActiveCfg = CheckedShared|x64
@@ -459,10 +459,10 @@
 		{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.Release|Win32.Build.0 = Release|Win32
 		{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.Release|x64.ActiveCfg = Release|x64
 		{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.Release|x64.Build.0 = Release|x64
-		{B545694A-CE2A-44F8-BA88-147C36369308}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
-		{B545694A-CE2A-44F8-BA88-147C36369308}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{B545694A-CE2A-44F8-BA88-147C36369308}.CheckedShared|ARM64.ActiveCfg = CheckedShared|ARM64
 		{B545694A-CE2A-44F8-BA88-147C36369308}.CheckedShared|ARM64.Build.0 = CheckedShared|ARM64
+		{B545694A-CE2A-44F8-BA88-147C36369308}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
+		{B545694A-CE2A-44F8-BA88-147C36369308}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{B545694A-CE2A-44F8-BA88-147C36369308}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32
 		{B545694A-CE2A-44F8-BA88-147C36369308}.CheckedShared|Win32.Build.0 = CheckedShared|Win32
 		{B545694A-CE2A-44F8-BA88-147C36369308}.CheckedShared|x64.ActiveCfg = CheckedShared|x64
@@ -507,10 +507,10 @@
 		{B545694A-CE2A-44F8-BA88-147C36369308}.Release|Win32.Build.0 = Release|Win32
 		{B545694A-CE2A-44F8-BA88-147C36369308}.Release|x64.ActiveCfg = Release|x64
 		{B545694A-CE2A-44F8-BA88-147C36369308}.Release|x64.Build.0 = Release|x64
-		{6B11F6A8-B131-4D2B-80EF-5731A9016436}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
-		{6B11F6A8-B131-4D2B-80EF-5731A9016436}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{6B11F6A8-B131-4D2B-80EF-5731A9016436}.CheckedShared|ARM64.ActiveCfg = CheckedShared|ARM64
 		{6B11F6A8-B131-4D2B-80EF-5731A9016436}.CheckedShared|ARM64.Build.0 = CheckedShared|ARM64
+		{6B11F6A8-B131-4D2B-80EF-5731A9016436}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
+		{6B11F6A8-B131-4D2B-80EF-5731A9016436}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{6B11F6A8-B131-4D2B-80EF-5731A9016436}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32
 		{6B11F6A8-B131-4D2B-80EF-5731A9016436}.CheckedShared|Win32.Build.0 = CheckedShared|Win32
 		{6B11F6A8-B131-4D2B-80EF-5731A9016436}.CheckedShared|x64.ActiveCfg = CheckedShared|x64
@@ -555,10 +555,10 @@
 		{6B11F6A8-B131-4D2B-80EF-5731A9016436}.Release|Win32.Build.0 = Release|Win32
 		{6B11F6A8-B131-4D2B-80EF-5731A9016436}.Release|x64.ActiveCfg = Release|x64
 		{6B11F6A8-B131-4D2B-80EF-5731A9016436}.Release|x64.Build.0 = Release|x64
-		{63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
-		{63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.CheckedShared|ARM64.ActiveCfg = CheckedShared|ARM64
 		{63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.CheckedShared|ARM64.Build.0 = CheckedShared|ARM64
+		{63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
+		{63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32
 		{63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.CheckedShared|Win32.Build.0 = CheckedShared|Win32
 		{63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.CheckedShared|x64.ActiveCfg = CheckedShared|x64
@@ -603,10 +603,10 @@
 		{63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.Release|Win32.Build.0 = Release|Win32
 		{63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.Release|x64.ActiveCfg = Release|x64
 		{63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}.Release|x64.Build.0 = Release|x64
-		{7ADFAFB9-0A83-4D35-9891-FB24FDF30B53}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
-		{7ADFAFB9-0A83-4D35-9891-FB24FDF30B53}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{7ADFAFB9-0A83-4D35-9891-FB24FDF30B53}.CheckedShared|ARM64.ActiveCfg = CheckedShared|ARM64
 		{7ADFAFB9-0A83-4D35-9891-FB24FDF30B53}.CheckedShared|ARM64.Build.0 = CheckedShared|ARM64
+		{7ADFAFB9-0A83-4D35-9891-FB24FDF30B53}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
+		{7ADFAFB9-0A83-4D35-9891-FB24FDF30B53}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{7ADFAFB9-0A83-4D35-9891-FB24FDF30B53}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32
 		{7ADFAFB9-0A83-4D35-9891-FB24FDF30B53}.CheckedShared|Win32.Build.0 = CheckedShared|Win32
 		{7ADFAFB9-0A83-4D35-9891-FB24FDF30B53}.CheckedShared|x64.ActiveCfg = CheckedShared|x64
@@ -651,10 +651,10 @@
 		{7ADFAFB9-0A83-4D35-9891-FB24FDF30B53}.Release|Win32.Build.0 = Release|Win32
 		{7ADFAFB9-0A83-4D35-9891-FB24FDF30B53}.Release|x64.ActiveCfg = Release|x64
 		{7ADFAFB9-0A83-4D35-9891-FB24FDF30B53}.Release|x64.Build.0 = Release|x64
-		{D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
-		{D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.CheckedShared|ARM64.ActiveCfg = CheckedShared|ARM64
 		{D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.CheckedShared|ARM64.Build.0 = CheckedShared|ARM64
+		{D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
+		{D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32
 		{D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.CheckedShared|Win32.Build.0 = CheckedShared|Win32
 		{D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.CheckedShared|x64.ActiveCfg = CheckedShared|x64
@@ -699,10 +699,10 @@
 		{D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Release|Win32.Build.0 = Release|Win32
 		{D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Release|x64.ActiveCfg = Release|x64
 		{D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Release|x64.Build.0 = Release|x64
-		{9A2D9099-E1A2-4287-B845-E3598AD24D70}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
-		{9A2D9099-E1A2-4287-B845-E3598AD24D70}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{9A2D9099-E1A2-4287-B845-E3598AD24D70}.CheckedShared|ARM64.ActiveCfg = CheckedShared|ARM64
 		{9A2D9099-E1A2-4287-B845-E3598AD24D70}.CheckedShared|ARM64.Build.0 = CheckedShared|ARM64
+		{9A2D9099-E1A2-4287-B845-E3598AD24D70}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
+		{9A2D9099-E1A2-4287-B845-E3598AD24D70}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{9A2D9099-E1A2-4287-B845-E3598AD24D70}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32
 		{9A2D9099-E1A2-4287-B845-E3598AD24D70}.CheckedShared|Win32.Build.0 = CheckedShared|Win32
 		{9A2D9099-E1A2-4287-B845-E3598AD24D70}.CheckedShared|x64.ActiveCfg = CheckedShared|x64
@@ -747,10 +747,10 @@
 		{9A2D9099-E1A2-4287-B845-E3598AD24D70}.Release|Win32.Build.0 = Release|Win32
 		{9A2D9099-E1A2-4287-B845-E3598AD24D70}.Release|x64.ActiveCfg = Release|x64
 		{9A2D9099-E1A2-4287-B845-E3598AD24D70}.Release|x64.Build.0 = Release|x64
-		{290BBF89-2572-4291-9D9C-FF021D4FD313}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
-		{290BBF89-2572-4291-9D9C-FF021D4FD313}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{290BBF89-2572-4291-9D9C-FF021D4FD313}.CheckedShared|ARM64.ActiveCfg = CheckedShared|ARM64
 		{290BBF89-2572-4291-9D9C-FF021D4FD313}.CheckedShared|ARM64.Build.0 = CheckedShared|ARM64
+		{290BBF89-2572-4291-9D9C-FF021D4FD313}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
+		{290BBF89-2572-4291-9D9C-FF021D4FD313}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{290BBF89-2572-4291-9D9C-FF021D4FD313}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32
 		{290BBF89-2572-4291-9D9C-FF021D4FD313}.CheckedShared|Win32.Build.0 = CheckedShared|Win32
 		{290BBF89-2572-4291-9D9C-FF021D4FD313}.CheckedShared|x64.ActiveCfg = CheckedShared|x64
@@ -795,10 +795,10 @@
 		{290BBF89-2572-4291-9D9C-FF021D4FD313}.Release|Win32.Build.0 = Release|Win32
 		{290BBF89-2572-4291-9D9C-FF021D4FD313}.Release|x64.ActiveCfg = Release|x64
 		{290BBF89-2572-4291-9D9C-FF021D4FD313}.Release|x64.Build.0 = Release|x64
-		{F8517509-9317-4A46-B5ED-06AE5A399E6C}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
-		{F8517509-9317-4A46-B5ED-06AE5A399E6C}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{F8517509-9317-4A46-B5ED-06AE5A399E6C}.CheckedShared|ARM64.ActiveCfg = CheckedShared|ARM64
 		{F8517509-9317-4A46-B5ED-06AE5A399E6C}.CheckedShared|ARM64.Build.0 = CheckedShared|ARM64
+		{F8517509-9317-4A46-B5ED-06AE5A399E6C}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
+		{F8517509-9317-4A46-B5ED-06AE5A399E6C}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{F8517509-9317-4A46-B5ED-06AE5A399E6C}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32
 		{F8517509-9317-4A46-B5ED-06AE5A399E6C}.CheckedShared|Win32.Build.0 = CheckedShared|Win32
 		{F8517509-9317-4A46-B5ED-06AE5A399E6C}.CheckedShared|x64.ActiveCfg = CheckedShared|x64
@@ -843,10 +843,10 @@
 		{F8517509-9317-4A46-B5ED-06AE5A399E6C}.Release|Win32.Build.0 = Release|Win32
 		{F8517509-9317-4A46-B5ED-06AE5A399E6C}.Release|x64.ActiveCfg = Release|x64
 		{F8517509-9317-4A46-B5ED-06AE5A399E6C}.Release|x64.Build.0 = Release|x64
-		{189B867F-FF4B-45A1-B741-A97492EE69AF}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
-		{189B867F-FF4B-45A1-B741-A97492EE69AF}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{189B867F-FF4B-45A1-B741-A97492EE69AF}.CheckedShared|ARM64.ActiveCfg = CheckedShared|ARM64
 		{189B867F-FF4B-45A1-B741-A97492EE69AF}.CheckedShared|ARM64.Build.0 = CheckedShared|ARM64
+		{189B867F-FF4B-45A1-B741-A97492EE69AF}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
+		{189B867F-FF4B-45A1-B741-A97492EE69AF}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{189B867F-FF4B-45A1-B741-A97492EE69AF}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32
 		{189B867F-FF4B-45A1-B741-A97492EE69AF}.CheckedShared|Win32.Build.0 = CheckedShared|Win32
 		{189B867F-FF4B-45A1-B741-A97492EE69AF}.CheckedShared|x64.ActiveCfg = CheckedShared|x64
@@ -891,10 +891,10 @@
 		{189B867F-FF4B-45A1-B741-A97492EE69AF}.Release|Win32.Build.0 = Release|Win32
 		{189B867F-FF4B-45A1-B741-A97492EE69AF}.Release|x64.ActiveCfg = Release|x64
 		{189B867F-FF4B-45A1-B741-A97492EE69AF}.Release|x64.Build.0 = Release|x64
-		{BC116B29-9958-4389-B294-7529BB7C7D37}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
-		{BC116B29-9958-4389-B294-7529BB7C7D37}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{BC116B29-9958-4389-B294-7529BB7C7D37}.CheckedShared|ARM64.ActiveCfg = CheckedShared|ARM64
 		{BC116B29-9958-4389-B294-7529BB7C7D37}.CheckedShared|ARM64.Build.0 = CheckedShared|ARM64
+		{BC116B29-9958-4389-B294-7529BB7C7D37}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
+		{BC116B29-9958-4389-B294-7529BB7C7D37}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{BC116B29-9958-4389-B294-7529BB7C7D37}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32
 		{BC116B29-9958-4389-B294-7529BB7C7D37}.CheckedShared|Win32.Build.0 = CheckedShared|Win32
 		{BC116B29-9958-4389-B294-7529BB7C7D37}.CheckedShared|x64.ActiveCfg = CheckedShared|x64
@@ -939,10 +939,10 @@
 		{BC116B29-9958-4389-B294-7529BB7C7D37}.Release|Win32.Build.0 = Release|Win32
 		{BC116B29-9958-4389-B294-7529BB7C7D37}.Release|x64.ActiveCfg = Release|x64
 		{BC116B29-9958-4389-B294-7529BB7C7D37}.Release|x64.Build.0 = Release|x64
-		{4886456B-1342-4EC8-AD3F-D92AEB8C1097}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
-		{4886456B-1342-4EC8-AD3F-D92AEB8C1097}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{4886456B-1342-4EC8-AD3F-D92AEB8C1097}.CheckedShared|ARM64.ActiveCfg = CheckedShared|ARM64
 		{4886456B-1342-4EC8-AD3F-D92AEB8C1097}.CheckedShared|ARM64.Build.0 = CheckedShared|ARM64
+		{4886456B-1342-4EC8-AD3F-D92AEB8C1097}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
+		{4886456B-1342-4EC8-AD3F-D92AEB8C1097}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{4886456B-1342-4EC8-AD3F-D92AEB8C1097}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32
 		{4886456B-1342-4EC8-AD3F-D92AEB8C1097}.CheckedShared|Win32.Build.0 = CheckedShared|Win32
 		{4886456B-1342-4EC8-AD3F-D92AEB8C1097}.CheckedShared|x64.ActiveCfg = CheckedShared|x64
@@ -987,10 +987,10 @@
 		{4886456B-1342-4EC8-AD3F-D92AEB8C1097}.Release|Win32.Build.0 = Release|Win32
 		{4886456B-1342-4EC8-AD3F-D92AEB8C1097}.Release|x64.ActiveCfg = Release|x64
 		{4886456B-1342-4EC8-AD3F-D92AEB8C1097}.Release|x64.Build.0 = Release|x64
-		{05BBD03D-0985-4D76-8DDD-534DA631C3A8}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
-		{05BBD03D-0985-4D76-8DDD-534DA631C3A8}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{05BBD03D-0985-4D76-8DDD-534DA631C3A8}.CheckedShared|ARM64.ActiveCfg = CheckedShared|ARM64
 		{05BBD03D-0985-4D76-8DDD-534DA631C3A8}.CheckedShared|ARM64.Build.0 = CheckedShared|ARM64
+		{05BBD03D-0985-4D76-8DDD-534DA631C3A8}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
+		{05BBD03D-0985-4D76-8DDD-534DA631C3A8}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{05BBD03D-0985-4D76-8DDD-534DA631C3A8}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32
 		{05BBD03D-0985-4D76-8DDD-534DA631C3A8}.CheckedShared|Win32.Build.0 = CheckedShared|Win32
 		{05BBD03D-0985-4D76-8DDD-534DA631C3A8}.CheckedShared|x64.ActiveCfg = CheckedShared|x64
@@ -1035,10 +1035,10 @@
 		{05BBD03D-0985-4D76-8DDD-534DA631C3A8}.Release|Win32.Build.0 = Release|Win32
 		{05BBD03D-0985-4D76-8DDD-534DA631C3A8}.Release|x64.ActiveCfg = Release|x64
 		{05BBD03D-0985-4D76-8DDD-534DA631C3A8}.Release|x64.Build.0 = Release|x64
-		{89B3630F-5728-4902-8258-D4DBC532E185}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
-		{89B3630F-5728-4902-8258-D4DBC532E185}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{89B3630F-5728-4902-8258-D4DBC532E185}.CheckedShared|ARM64.ActiveCfg = CheckedShared|ARM64
 		{89B3630F-5728-4902-8258-D4DBC532E185}.CheckedShared|ARM64.Build.0 = CheckedShared|ARM64
+		{89B3630F-5728-4902-8258-D4DBC532E185}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
+		{89B3630F-5728-4902-8258-D4DBC532E185}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{89B3630F-5728-4902-8258-D4DBC532E185}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32
 		{89B3630F-5728-4902-8258-D4DBC532E185}.CheckedShared|Win32.Build.0 = CheckedShared|Win32
 		{89B3630F-5728-4902-8258-D4DBC532E185}.CheckedShared|x64.ActiveCfg = CheckedShared|x64
@@ -1083,10 +1083,10 @@
 		{89B3630F-5728-4902-8258-D4DBC532E185}.Release|Win32.Build.0 = Release|Win32
 		{89B3630F-5728-4902-8258-D4DBC532E185}.Release|x64.ActiveCfg = Release|x64
 		{89B3630F-5728-4902-8258-D4DBC532E185}.Release|x64.Build.0 = Release|x64
-		{B544DCB7-16E5-41BC-B51B-7EAD8CFDFA05}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
-		{B544DCB7-16E5-41BC-B51B-7EAD8CFDFA05}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{B544DCB7-16E5-41BC-B51B-7EAD8CFDFA05}.CheckedShared|ARM64.ActiveCfg = CheckedShared|ARM64
 		{B544DCB7-16E5-41BC-B51B-7EAD8CFDFA05}.CheckedShared|ARM64.Build.0 = CheckedShared|ARM64
+		{B544DCB7-16E5-41BC-B51B-7EAD8CFDFA05}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
+		{B544DCB7-16E5-41BC-B51B-7EAD8CFDFA05}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{B544DCB7-16E5-41BC-B51B-7EAD8CFDFA05}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32
 		{B544DCB7-16E5-41BC-B51B-7EAD8CFDFA05}.CheckedShared|Win32.Build.0 = CheckedShared|Win32
 		{B544DCB7-16E5-41BC-B51B-7EAD8CFDFA05}.CheckedShared|x64.ActiveCfg = CheckedShared|x64
@@ -1131,10 +1131,10 @@
 		{B544DCB7-16E5-41BC-B51B-7EAD8CFDFA05}.Release|Win32.Build.0 = Release|Win32
 		{B544DCB7-16E5-41BC-B51B-7EAD8CFDFA05}.Release|x64.ActiveCfg = Release|x64
 		{B544DCB7-16E5-41BC-B51B-7EAD8CFDFA05}.Release|x64.Build.0 = Release|x64
-		{1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
-		{1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.CheckedShared|ARM64.ActiveCfg = CheckedShared|ARM64
 		{1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.CheckedShared|ARM64.Build.0 = CheckedShared|ARM64
+		{1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
+		{1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32
 		{1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.CheckedShared|Win32.Build.0 = CheckedShared|Win32
 		{1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.CheckedShared|x64.ActiveCfg = CheckedShared|x64

Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT.sln
==============================================================================
--- trunk/OpenMPT/build/vs2022win10/OpenMPT.sln	Fri Oct 23 15:41:26 2026	(r25790)
+++ trunk/OpenMPT/build/vs2022win10/OpenMPT.sln	Fri Oct 23 15:44:06 2026	(r25791)
@@ -49,8 +49,8 @@
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		CheckedShared|ARM = CheckedShared|ARM
 		CheckedShared|ARM64 = CheckedShared|ARM64
+		CheckedShared|ARM = CheckedShared|ARM
 		CheckedShared|Win32 = CheckedShared|Win32
 		CheckedShared|x64 = CheckedShared|x64
 		Checked|ARM = Checked|ARM
@@ -75,10 +75,10 @@
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{37FC32A4-8DDC-4A9C-A30C-62989DD8ACE9}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
-		{37FC32A4-8DDC-4A9C-A30C-62989DD8ACE9}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{37FC32A4-8DDC-4A9C-A30C-62989DD8ACE9}.CheckedShared|ARM64.ActiveCfg = CheckedShared|ARM64
 		{37FC32A4-8DDC-4A9C-A30C-62989DD8ACE9}.CheckedShared|ARM64.Build.0 = CheckedShared|ARM64
+		{37FC32A4-8DDC-4A9C-A30C-62989DD8ACE9}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
+		{37FC32A4-8DDC-4A9C-A30C-62989DD8ACE9}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{37FC32A4-8DDC-4A9C-A30C-62989DD8ACE9}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32
 		{37FC32A4-8DDC-4A9C-A30C-62989DD8ACE9}.CheckedShared|Win32.Build.0 = CheckedShared|Win32
 		{37FC32A4-8DDC-4A9C-A30C-62989DD8ACE9}.CheckedShared|x64.ActiveCfg = CheckedShared|x64
@@ -123,10 +123,10 @@
 		{37FC32A4-8DDC-4A9C-A30C-62989DD8ACE9}.Release|Win32.Build.0 = Release|Win32
 		{37FC32A4-8DDC-4A9C-A30C-62989DD8ACE9}.Release|x64.ActiveCfg = Release|x64
 		{37FC32A4-8DDC-4A9C-A30C-62989DD8ACE9}.Release|x64.Build.0 = Release|x64
-		{563A631D-FE07-47BC-A98F-9FE5B3EBABFA}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
-		{563A631D-FE07-47BC-A98F-9FE5B3EBABFA}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{563A631D-FE07-47BC-A98F-9FE5B3EBABFA}.CheckedShared|ARM64.ActiveCfg = CheckedShared|ARM64
 		{563A631D-FE07-47BC-A98F-9FE5B3EBABFA}.CheckedShared|ARM64.Build.0 = CheckedShared|ARM64
+		{563A631D-FE07-47BC-A98F-9FE5B3EBABFA}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
+		{563A631D-FE07-47BC-A98F-9FE5B3EBABFA}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{563A631D-FE07-47BC-A98F-9FE5B3EBABFA}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32
 		{563A631D-FE07-47BC-A98F-9FE5B3EBABFA}.CheckedShared|Win32.Build.0 = CheckedShared|Win32
 		{563A631D-FE07-47BC-A98F-9FE5B3EBABFA}.CheckedShared|x64.ActiveCfg = CheckedShared|x64
@@ -171,10 +171,10 @@
 		{563A631D-FE07-47BC-A98F-9FE5B3EBABFA}.Release|Win32.Build.0 = Release|Win32
 		{563A631D-FE07-47BC-A98F-9FE5B3EBABFA}.Release|x64.ActiveCfg = Release|x64
 		{563A631D-FE07-47BC-A98F-9FE5B3EBABFA}.Release|x64.Build.0 = Release|x64
-		{F3DA2BF5-E84A-4F71-80AB-884594863D3A}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
-		{F3DA2BF5-E84A-4F71-80AB-884594863D3A}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{F3DA2BF5-E84A-4F71-80AB-884594863D3A}.CheckedShared|ARM64.ActiveCfg = CheckedShared|ARM64
 		{F3DA2BF5-E84A-4F71-80AB-884594863D3A}.CheckedShared|ARM64.Build.0 = CheckedShared|ARM64
+		{F3DA2BF5-E84A-4F71-80AB-884594863D3A}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
+		{F3DA2BF5-E84A-4F71-80AB-884594863D3A}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{F3DA2BF5-E84A-4F71-80AB-884594863D3A}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32
 		{F3DA2BF5-E84A-4F71-80AB-884594863D3A}.CheckedShared|Win32.Build.0 = CheckedShared|Win32
 		{F3DA2BF5-E84A-4F71-80AB-884594863D3A}.CheckedShared|x64.ActiveCfg = CheckedShared|x64
@@ -219,10 +219,10 @@
 		{F3DA2BF5-E84A-4F71-80AB-884594863D3A}.Release|Win32.Build.0 = Release|Win32
 		{F3DA2BF5-E84A-4F71-80AB-884594863D3A}.Release|x64.ActiveCfg = Release|x64
 		{F3DA2BF5-E84A-4F71-80AB-884594863D3A}.Release|x64.Build.0 = Release|x64
-		{1A147336-891E-49AC-9EAD-A750599A224C}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
-		{1A147336-891E-49AC-9EAD-A750599A224C}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{1A147336-891E-49AC-9EAD-A750599A224C}.CheckedShared|ARM64.ActiveCfg = CheckedShared|ARM64
 		{1A147336-891E-49AC-9EAD-A750599A224C}.CheckedShared|ARM64.Build.0 = CheckedShared|ARM64
+		{1A147336-891E-49AC-9EAD-A750599A224C}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
+		{1A147336-891E-49AC-9EAD-A750599A224C}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{1A147336-891E-49AC-9EAD-A750599A224C}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32
 		{1A147336-891E-49AC-9EAD-A750599A224C}.CheckedShared|Win32.Build.0 = CheckedShared|Win32
 		{1A147336-891E-49AC-9EAD-A750599A224C}.CheckedShared|x64.ActiveCfg = CheckedShared|x64
@@ -267,10 +267,10 @@
 		{1A147336-891E-49AC-9EAD-A750599A224C}.Release|Win32.Build.0 = Release|Win32
 		{1A147336-891E-49AC-9EAD-A750599A224C}.Release|x64.ActiveCfg = Release|x64
 		{1A147336-891E-49AC-9EAD-A750599A224C}.Release|x64.Build.0 = Release|x64
-		{BDEC2D44-C957-4940-A32B-02824AF6E21D}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
-		{BDEC2D44-C957-4940-A32B-02824AF6E21D}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{BDEC2D44-C957-4940-A32B-02824AF6E21D}.CheckedShared|ARM64.ActiveCfg = CheckedShared|ARM64
 		{BDEC2D44-C957-4940-A32B-02824AF6E21D}.CheckedShared|ARM64.Build.0 = CheckedShared|ARM64
+		{BDEC2D44-C957-4940-A32B-02824AF6E21D}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
+		{BDEC2D44-C957-4940-A32B-02824AF6E21D}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{BDEC2D44-C957-4940-A32B-02824AF6E21D}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32
 		{BDEC2D44-C957-4940-A32B-02824AF6E21D}.CheckedShared|Win32.Build.0 = CheckedShared|Win32
 		{BDEC2D44-C957-4940-A32B-02824AF6E21D}.CheckedShared|x64.ActiveCfg = CheckedShared|x64
@@ -315,10 +315,10 @@
 		{BDEC2D44-C957-4940-A32B-02824AF6E21D}.Release|Win32.Build.0 = Release|Win32
 		{BDEC2D44-C957-4940-A32B-02824AF6E21D}.Release|x64.ActiveCfg = Release|x64
 		{BDEC2D44-C957-4940-A32B-02824AF6E21D}.Release|x64.Build.0 = Release|x64
-		{95CC809B-03FC-4EDB-BB20-FD07A698C05F}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
-		{95CC809B-03FC-4EDB-BB20-FD07A698C05F}.CheckedShared|ARM.Build.0 = CheckedShared|ARM
 		{95CC809B-03FC-4EDB-BB20-FD07A698C05F}.CheckedShared|ARM64.ActiveCfg = CheckedShared|ARM64
 		{95CC809B-03FC-4EDB-BB20-FD07A698C05F}.CheckedShared|ARM64.Build.0 = CheckedShared|ARM64
+		{95CC809B-03FC-4EDB-BB20-FD07A698C05F}.CheckedShared|ARM.ActiveCfg = CheckedShared|ARM
+		{95CC809B-03FC-4EDB-BB20-FD07A698C05F}.CheckedShared|ARM.Build.0 = CheckedSha...
 
[truncated message content]

[OMPT-svn-commit] OpenMPT r25789 - in branches/OpenMPT-1.28: . .github/workflows

From: <sv...@op...> - 2026-10-23 12:45:45

Author: manx
Date: Fri Oct 23 14:45:36 2026
New Revision: 25789
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=25789

Log:
Merged revision(s) 25787 from branches/OpenMPT-1.30:
Merged revision(s) 25784 from trunk/OpenMPT:
[Reg] build: CI: GitHub: CPA: FreeBSD: FreeBSD 13 is EOL. Remove FreeBSD 13.5.
........
........

Modified:
   branches/OpenMPT-1.28/   (props changed)
   branches/OpenMPT-1.28/.github/workflows/FreeBSD-Makefile.yml

Modified: branches/OpenMPT-1.28/.github/workflows/FreeBSD-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.28/.github/workflows/FreeBSD-Makefile.yml	Fri Oct 23 14:45:06 2026	(r25788)
+++ branches/OpenMPT-1.28/.github/workflows/FreeBSD-Makefile.yml	Fri Oct 23 14:45:36 2026	(r25789)
@@ -15,8 +15,6 @@
           - { version: '15.1', deps: small }
           - { version: '14.5', deps: sys   }
           - { version: '14.5', deps: small }
-          - { version: '13.5', deps: sys   }
-          - { version: '13.5', deps: small }
 
     concurrency:
       group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-${{matrix.deps}}

[OMPT-svn-commit] OpenMPT r25788 - in branches/OpenMPT-1.29: . .github/workflows

From: <sv...@op...> - 2026-10-23 12:45:13

Author: manx
Date: Fri Oct 23 14:45:06 2026
New Revision: 25788
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=25788

Log:
Merged revision(s) 25787 from branches/OpenMPT-1.30:
Merged revision(s) 25784 from trunk/OpenMPT:
[Reg] build: CI: GitHub: CPA: FreeBSD: FreeBSD 13 is EOL. Remove FreeBSD 13.5.
........
........

Modified:
   branches/OpenMPT-1.29/   (props changed)
   branches/OpenMPT-1.29/.github/workflows/FreeBSD-Makefile.yml

Modified: branches/OpenMPT-1.29/.github/workflows/FreeBSD-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.29/.github/workflows/FreeBSD-Makefile.yml	Fri Oct 23 14:44:41 2026	(r25787)
+++ branches/OpenMPT-1.29/.github/workflows/FreeBSD-Makefile.yml	Fri Oct 23 14:45:06 2026	(r25788)
@@ -15,8 +15,6 @@
           - { version: '15.1', deps: small }
           - { version: '14.5', deps: sys   }
           - { version: '14.5', deps: small }
-          - { version: '13.5', deps: sys   }
-          - { version: '13.5', deps: small }
 
     concurrency:
       group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-${{matrix.deps}}

[OMPT-svn-commit] OpenMPT r25787 - in branches/OpenMPT-1.30: . .github/workflows

From: <sv...@op...> - 2026-10-23 12:44:50

Author: manx
Date: Fri Oct 23 14:44:41 2026
New Revision: 25787
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=25787

Log:
Merged revision(s) 25784 from trunk/OpenMPT:
[Reg] build: CI: GitHub: CPA: FreeBSD: FreeBSD 13 is EOL. Remove FreeBSD 13.5.
........

Modified:
   branches/OpenMPT-1.30/   (props changed)
   branches/OpenMPT-1.30/.github/workflows/FreeBSD-Makefile.yml

Modified: branches/OpenMPT-1.30/.github/workflows/FreeBSD-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.30/.github/workflows/FreeBSD-Makefile.yml	Fri Oct 23 14:43:55 2026	(r25786)
+++ branches/OpenMPT-1.30/.github/workflows/FreeBSD-Makefile.yml	Fri Oct 23 14:44:41 2026	(r25787)
@@ -15,8 +15,6 @@
           - { version: '15.1', deps: small }
           - { version: '14.5', deps: sys   }
           - { version: '14.5', deps: small }
-          - { version: '13.5', deps: sys   }
-          - { version: '13.5', deps: small }
 
     concurrency:
       group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-${{matrix.deps}}

[OMPT-svn-commit] OpenMPT r25786 - in branches/OpenMPT-1.31: . .github/workflows

From: <sv...@op...> - 2026-10-23 12:44:03

Author: manx
Date: Fri Oct 23 14:43:55 2026
New Revision: 25786
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=25786

Log:
Merged revision(s) 25784 from trunk/OpenMPT:
[Reg] build: CI: GitHub: CPA: FreeBSD: FreeBSD 13 is EOL. Remove FreeBSD 13.5.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/.github/workflows/FreeBSD-Autotools.yml
   branches/OpenMPT-1.31/.github/workflows/FreeBSD-Makefile.yml

Modified: branches/OpenMPT-1.31/.github/workflows/FreeBSD-Autotools.yml
==============================================================================
--- branches/OpenMPT-1.31/.github/workflows/FreeBSD-Autotools.yml	Fri Oct 23 14:43:37 2026	(r25785)
+++ branches/OpenMPT-1.31/.github/workflows/FreeBSD-Autotools.yml	Fri Oct 23 14:43:55 2026	(r25786)
@@ -13,7 +13,6 @@
         include:
           - { version: '15.1' }
           - { version: '14.5' }
-          - { version: '13.5' }
 
     concurrency:
       group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-autotools

Modified: branches/OpenMPT-1.31/.github/workflows/FreeBSD-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.31/.github/workflows/FreeBSD-Makefile.yml	Fri Oct 23 14:43:37 2026	(r25785)
+++ branches/OpenMPT-1.31/.github/workflows/FreeBSD-Makefile.yml	Fri Oct 23 14:43:55 2026	(r25786)
@@ -17,9 +17,6 @@
           - { version: '14.5', deps: sys   }
           - { version: '14.5', deps: local }
           - { version: '14.5', deps: small }
-          - { version: '13.5', deps: sys   }
-          - { version: '13.5', deps: local }
-          - { version: '13.5', deps: small }
 
     concurrency:
       group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-${{matrix.deps}}

[OMPT-svn-commit] OpenMPT r25785 - in branches/OpenMPT-1.32: . .github/workflows

From: <sv...@op...> - 2026-10-23 12:43:44

Author: manx
Date: Fri Oct 23 14:43:37 2026
New Revision: 25785
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=25785

Log:
Merged revision(s) 25784 from trunk/OpenMPT:
[Reg] build: CI: GitHub: CPA: FreeBSD: FreeBSD 13 is EOL. Remove FreeBSD 13.5.
........

Modified:
   branches/OpenMPT-1.32/   (props changed)
   branches/OpenMPT-1.32/.github/workflows/FreeBSD-Autotools.yml
   branches/OpenMPT-1.32/.github/workflows/FreeBSD-Makefile.yml

Modified: branches/OpenMPT-1.32/.github/workflows/FreeBSD-Autotools.yml
==============================================================================
--- branches/OpenMPT-1.32/.github/workflows/FreeBSD-Autotools.yml	Fri Oct 23 14:43:13 2026	(r25784)
+++ branches/OpenMPT-1.32/.github/workflows/FreeBSD-Autotools.yml	Fri Oct 23 14:43:37 2026	(r25785)
@@ -13,7 +13,6 @@
         include:
           - { version: '15.1' }
           - { version: '14.5' }
-          - { version: '13.5' }
 
     concurrency:
       group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-autotools

Modified: branches/OpenMPT-1.32/.github/workflows/FreeBSD-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.32/.github/workflows/FreeBSD-Makefile.yml	Fri Oct 23 14:43:13 2026	(r25784)
+++ branches/OpenMPT-1.32/.github/workflows/FreeBSD-Makefile.yml	Fri Oct 23 14:43:37 2026	(r25785)
@@ -17,9 +17,6 @@
           - { version: '14.5', deps: sys   }
           - { version: '14.5', deps: local }
           - { version: '14.5', deps: small }
-          - { version: '13.5', deps: sys   }
-          - { version: '13.5', deps: local }
-          - { version: '13.5', deps: small }
 
     concurrency:
       group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-${{matrix.deps}}

[OMPT-svn-commit] OpenMPT r25784 - trunk/OpenMPT/.github/workflows

From: <sv...@op...> - 2026-10-23 12:43:21

Author: manx
Date: Fri Oct 23 14:43:13 2026
New Revision: 25784
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=25784

Log:
[Reg] build: CI: GitHub: CPA: FreeBSD: FreeBSD 13 is EOL. Remove FreeBSD 13.5.

Modified:
   trunk/OpenMPT/.github/workflows/FreeBSD-Autotools.yml
   trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml

Modified: trunk/OpenMPT/.github/workflows/FreeBSD-Autotools.yml
==============================================================================
--- trunk/OpenMPT/.github/workflows/FreeBSD-Autotools.yml	Fri Oct 23 14:38:25 2026	(r25783)
+++ trunk/OpenMPT/.github/workflows/FreeBSD-Autotools.yml	Fri Oct 23 14:43:13 2026	(r25784)
@@ -15,7 +15,6 @@
         include:
           - { version: '15.1' }
           - { version: '14.5' }
-          - { version: '13.5' }
 
     concurrency:
       group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-autotools

Modified: trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml
==============================================================================
--- trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml	Fri Oct 23 14:38:25 2026	(r25783)
+++ trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml	Fri Oct 23 14:43:13 2026	(r25784)
@@ -19,9 +19,6 @@
           - { version: '14.5', deps: sys   }
           - { version: '14.5', deps: local }
           - { version: '14.5', deps: small }
-          - { version: '13.5', deps: sys   }
-          - { version: '13.5', deps: local }
-          - { version: '13.5', deps: small }
 
     concurrency:
       group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-${{matrix.deps}}

[OMPT-svn-commit] OpenMPT r25783 - in branches/OpenMPT-1.32: . src/mpt/base

From: <sv...@op...> - 2026-10-23 12:38:33

Author: manx
Date: Fri Oct 23 14:38:25 2026
New Revision: 25783
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=25783

Log:
Merged revision(s) 25772 from trunk/OpenMPT:
[Fix] mpt/base/secure.hpp: Use mpt::full_barrier(), just to be extra safe.
........

Modified:
   branches/OpenMPT-1.32/   (props changed)
   branches/OpenMPT-1.32/src/mpt/base/secure.hpp

Modified: branches/OpenMPT-1.32/src/mpt/base/secure.hpp
==============================================================================
--- branches/OpenMPT-1.32/src/mpt/base/secure.hpp	Fri Oct 23 14:38:01 2026	(r25782)
+++ branches/OpenMPT-1.32/src/mpt/base/secure.hpp	Fri Oct 23 14:38:25 2026	(r25783)
@@ -8,8 +8,8 @@
 #include "mpt/base/integer.hpp"
 #include "mpt/base/macros.hpp"
 #include "mpt/base/namespace.hpp"
+#include "mpt/base/utility.hpp"
 
-#include <atomic>
 #include <utility>
 #include <vector>
 
@@ -24,13 +24,13 @@
 
 // C23 memset_explicit
 inline MPT_NOINLINE void * memset_explicit(void * const dst, int const value, std::size_t const len) noexcept {
-	std::atomic_thread_fence(std::memory_order_seq_cst);
+	mpt::full_barrier();
 	volatile unsigned char * volatile p = static_cast<volatile unsigned char *>(dst);
-	std::atomic_thread_fence(std::memory_order_seq_cst);
+	mpt::full_barrier();
 	for (volatile std::size_t i = 0; i < len; ++i) {
 		p[i] = static_cast<unsigned char>(value);
 	}
-	std::atomic_thread_fence(std::memory_order_seq_cst);
+	mpt::full_barrier();
 	return dst;
 }
 
@@ -41,54 +41,54 @@
 
 
 inline MPT_NOINLINE void memzero(std::byte * const dst, std::size_t const len) noexcept {
-	std::atomic_thread_fence(std::memory_order_seq_cst);
+	mpt::full_barrier();
 	volatile std::byte * volatile p = static_cast<volatile std::byte *>(dst);
-	std::atomic_thread_fence(std::memory_order_seq_cst);
+	mpt::full_barrier();
 	for (volatile std::size_t i = 0; i < len; ++i) {
 		p[i] = std::byte{0};
 	}
-	std::atomic_thread_fence(std::memory_order_seq_cst);
+	mpt::full_barrier();
 }
 
 inline MPT_NOINLINE void memzero(void * const dst, std::size_t const len) noexcept {
-	std::atomic_thread_fence(std::memory_order_seq_cst);
+	mpt::full_barrier();
 	volatile std::byte * volatile p = static_cast<volatile std::byte *>(dst);
-	std::atomic_thread_fence(std::memory_order_seq_cst);
+	mpt::full_barrier();
 	for (volatile std::size_t i = 0; i < len; ++i) {
 		p[i] = std::byte{0};
 	}
-	std::atomic_thread_fence(std::memory_order_seq_cst);
+	mpt::full_barrier();
 }
 
 inline MPT_NOINLINE void memzero(char * const dst, std::size_t const len) noexcept {
-	std::atomic_thread_fence(std::memory_order_seq_cst);
+	mpt::full_barrier();
 	volatile std::byte * volatile p = reinterpret_cast<volatile std::byte *>(dst);
-	std::atomic_thread_fence(std::memory_order_seq_cst);
+	mpt::full_barrier();
 	for (volatile std::size_t i = 0; i < len; ++i) {
 		p[i] = std::byte{0};
 	}
-	std::atomic_thread_fence(std::memory_order_seq_cst);
+	mpt::full_barrier();
 }
 
 inline MPT_NOINLINE void memzero(uint8 * const dst, std::size_t const len) noexcept {
-	std::atomic_thread_fence(std::memory_order_seq_cst);
+	mpt::full_barrier();
 	volatile std::byte * volatile p = reinterpret_cast<volatile std::byte *>(dst);
-	std::atomic_thread_fence(std::memory_order_seq_cst);
+	mpt::full_barrier();
 	for (volatile std::size_t i = 0; i < len; ++i) {
 		p[i] = std::byte{0};
 	}
-	std::atomic_thread_fence(std::memory_order_seq_cst);
+	mpt::full_barrier();
 }
 
 
 
 template <typename T>
 inline MPT_NOINLINE void clear(T & val) {
-	std::atomic_signal_fence(std::memory_order_seq_cst);
+	mpt::full_barrier();
 	volatile T * volatile v = &val;
-	std::atomic_thread_fence(std::memory_order_seq_cst);
+	mpt::full_barrier();
 	*v = T{};
-	std::atomic_signal_fence(std::memory_order_seq_cst);
+	mpt::full_barrier();
 }

[OMPT-svn-commit] OpenMPT r25782 - in branches/OpenMPT-1.32: . src/mpt/arch

From: <sv...@op...> - 2026-10-23 12:38:11

Author: manx
Date: Fri Oct 23 14:38:01 2026
New Revision: 25782
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=25782

Log:
Merged revision(s) 25770 from trunk/OpenMPT:
[Fix] mpt/arch/feature_fence.hpp: Use mpt::compiler_barrier(). Clang can otherwise reorder instructions.
........

Modified:
   branches/OpenMPT-1.32/   (props changed)
   branches/OpenMPT-1.32/src/mpt/arch/feature_fence.hpp

Modified: branches/OpenMPT-1.32/src/mpt/arch/feature_fence.hpp
==============================================================================
--- branches/OpenMPT-1.32/src/mpt/arch/feature_fence.hpp	Fri Oct 23 14:37:37 2026	(r25781)
+++ branches/OpenMPT-1.32/src/mpt/arch/feature_fence.hpp	Fri Oct 23 14:38:01 2026	(r25782)
@@ -7,6 +7,7 @@
 #include "mpt/base/detect.hpp"
 #include "mpt/base/macros.hpp"
 #include "mpt/base/namespace.hpp"
+#include "mpt/base/utility.hpp"
 
 #include <atomic>
 
@@ -22,11 +23,11 @@
 
 
 MPT_FORCEINLINE void feature_fence_aquire() noexcept {
-	std::atomic_signal_fence(std::memory_order_acquire);
+	mpt::compiler_barrier(std::memory_order_acquire);
 }
 
 MPT_FORCEINLINE void feature_fence_release() noexcept {
-	std::atomic_signal_fence(std::memory_order_release);
+	mpt::compiler_barrier(std::memory_order_release);
 }
 
 class feature_fence_guard {

[OMPT-svn-commit] OpenMPT r25781 - in branches/OpenMPT-1.32: . src/mpt/base

From: <sv...@op...> - 2026-10-23 12:37:46

Author: manx
Date: Fri Oct 23 14:37:37 2026
New Revision: 25781
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=25781

Log:
Merged revision(s) 25769, 25771 from trunk/OpenMPT:
[Imp] mpt/base/utility.hpp: Add mpt::observable_checkpoint(), like C++26 std::observable_checkpoint().
[Imp] mpt/base/utility.hpp: Add mpt::compiler_barrier(std::memory_order), mpt::cpu_barrier(std::memory_order), mpt::full_barrier().
........
[Var] Run clang-format.
........

Modified:
   branches/OpenMPT-1.32/   (props changed)
   branches/OpenMPT-1.32/src/mpt/base/utility.hpp

Modified: branches/OpenMPT-1.32/src/mpt/base/utility.hpp
==============================================================================
--- branches/OpenMPT-1.32/src/mpt/base/utility.hpp	Fri Oct 23 14:32:00 2026	(r25780)
+++ branches/OpenMPT-1.32/src/mpt/base/utility.hpp	Fri Oct 23 14:37:37 2026	(r25781)
@@ -13,6 +13,9 @@
 #include "mpt/base/saturate_round.hpp"
 #endif
 
+#if MPT_CXX_BEFORE(26)
+#include <atomic>
+#endif
 #if MPT_CXX_BEFORE(23) && !MPT_COMPILER_MSVC && !MPT_COMPILER_GCC && !MPT_COMPILER_CLANG
 #include <exception>
 #endif
@@ -257,6 +260,70 @@
 
 
 
+#if MPT_CXX_AT_LEAST(26)
+
+using std::observable_checkpoint;
+
+#else // !C++26
+
+#if MPT_COMPILER_MSVC
+inline void observable_checkpoint() {
+	_ReadWriteBarrier();
+}
+#elif MPT_COMPILER_GCC || MPT_COMPILER_CLANG
+inline void observable_checkpoint() {
+	// clang-format off
+	__asm__ __volatile__("" ::: "memory");
+	// clang-format on
+}
+#else
+inline void observable_checkpoint() {
+	std::atomic_signal_fence(std::memory_order_release);
+}
+#endif
+
+#endif // C++26
+
+
+
+inline void compiler_barrier(std::memory_order order) {
+#if MPT_COMPILER_CLANG
+	// clang-format off
+	__asm__ __volatile__("" ::: "memory");
+	// clang-format on
+#endif
+	std::atomic_signal_fence(order);
+#if MPT_COMPILER_CLANG
+	// clang-format off
+	__asm__ __volatile__("" ::: "memory");
+	// clang-format on
+#endif
+}
+
+
+
+inline void cpu_barrier(std::memory_order order) {
+	std::atomic_thread_fence(order);
+}
+
+
+
+inline void full_barrier() {
+#if MPT_COMPILER_CLANG
+	// clang-format off
+	__asm__ __volatile__("" ::: "memory");
+	// clang-format on
+	std::atomic_thread_fence(std::memory_order_seq_cst);
+	// clang-format off
+	__asm__ __volatile__("" ::: "memory");
+	// clang-format on
+#else
+	std::atomic_thread_fence(std::memory_order_seq_cst);
+#endif
+}
+
+
+
 } // namespace MPT_INLINE_NS
 } // namespace mpt

[OMPT-svn-commit] OpenMPT r25780 - branches/OpenMPT-1.32/build

From: <sv...@op...> - 2026-10-23 12:32:11

Author: manx
Date: Fri Oct 23 14:32:00 2026
New Revision: 25780
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=25780

Log:
[Var] Update 7-zip to 26.05 (2026-10-21). See r25779.

Modified:
   branches/OpenMPT-1.32/build/download_externals.cmd
   branches/OpenMPT-1.32/build/download_externals.txt

Modified: branches/OpenMPT-1.32/build/download_externals.cmd
==============================================================================
--- branches/OpenMPT-1.32/build/download_externals.cmd	Fri Oct 23 14:23:28 2026	(r25779)
+++ branches/OpenMPT-1.32/build/download_externals.cmd	Fri Oct 23 14:32:00 2026	(r25780)
@@ -39,8 +39,8 @@
 rem Get 7zip installer and unpack it with current commandline 7zip
 rem This is a mess for automation. Oh well.
 cscript build\scriptlib\unpack-zip.vbs "build\externals\7za920.zip" "build\tools\7zipold" || goto error
-build\tools\7zipold\7za.exe x -y -obuild\tools\7zipa "build\externals\7z2604-extra.7z" || goto error
-build\tools\7zipa\7za.exe x -y -obuild\tools\7zip "build\externals\7z2604-x64.exe" || goto error
+build\tools\7zipold\7za.exe x -y -obuild\tools\7zipa "build\externals\7z2605-extra.7z" || goto error
+build\tools\7zipa\7za.exe x -y -obuild\tools\7zip "build\externals\7z2605-x64.exe" || goto error
 
 call build\scriptlib\unpack.cmd "build\tools\htmlhelp" "build\externals\htmlhelp.exe" "." || goto error
 

Modified: branches/OpenMPT-1.32/build/download_externals.txt
==============================================================================
--- branches/OpenMPT-1.32/build/download_externals.txt	Fri Oct 23 14:23:28 2026	(r25779)
+++ branches/OpenMPT-1.32/build/download_externals.txt	Fri Oct 23 14:32:00 2026	(r25780)
@@ -1,6 +1,6 @@
 "build/externals/7za920.zip"                      384846 84e830c91a0e8ae499cc4814080da6569d8a6acbddc585c8b62abc86c809793aeb669b0a741063a379fd281ade85f120bc27efeb67d63bf961be893eec8bc3b3 "https://7-zip.org/a/7za920.zip" "https://deac-fra.dl.sourceforge.net/project/sevenzip/7-Zip/9.20/7za920.zip" "https://sf-eu-introserv-1.dl.sourceforge.net/project/sevenzip/7-Zip/9.20/7za920.zip" "https://sf-west-interserver-1.dl.sourceforge.net/project/sevenzip/7-Zip/9.20/7za920.zip" "https://sf-west-interserver-2.dl.sourceforge.net/project/sevenzip/7-Zip/9.20/7za920.zip"
-"build/externals/7z2604-extra.7z"                1764616 41555bc899a29f303dd91e28a1813369dca8ca8fcedc636c4e2129280c1ea2337c4662bf99ec09bf161d7fbded90a82903d2892e90a4c901f1cb27529e872db4 "https://7-zip.org/a/7z2604-extra.7z" "https://deac-fra.dl.sourceforge.net/project/sevenzip/7-Zip/26.04/7z2604-extra.7z" "https://sf-eu-introserv-1.dl.sourceforge.net/project/sevenzip/7-Zip/26.04/7z2604-extra.7z" "https://sf-west-interserver-1.dl.sourceforge.net/project/sevenzip/7-Zip/26.04/7z2604-extra.7z" "https://sf-west-interserver-2.dl.sourceforge.net/project/sevenzip/7-Zip/26.04/7z2604-extra.7z"
-"build/externals/7z2604-x64.exe"                 1664082 ffcc354499e4121735cd4e1bb08725b01cfea758eef2d8681e4782abb53d27cd3f33bbb06de08d4f77f52e2516a9aeefe6c3d3605b8258a65a2405ea49f29b03 "https://7-zip.org/a/7z2604-x64.exe" "https://deac-fra.dl.sourceforge.net/project/sevenzip/7-Zip/26.04/7z2604-x64.exe" "https://sf-eu-introserv-1.dl.sourceforge.net/project/sevenzip/7-Zip/26.04/7z2604-x64.exe" "https://sf-west-interserver-1.dl.sourceforge.net/project/sevenzip/7-Zip/26.04/7z2604-x64.exe" "https://sf-west-interserver-2.dl.sourceforge.net/project/sevenzip/7-Zip/26.04/7z2604-x64.exe"
+"build/externals/7z2605-extra.7z"                1763900 e41fe948c0b5e94382c2a573d1694bec21760465ce86f700850d45365dc40b033b97a34e4151f37857a8eee4fa96ae9ea214d5e18250d56a526d317ee0f50594 "https://7-zip.org/a/7z2605-extra.7z" "https://deac-fra.dl.sourceforge.net/project/sevenzip/7-Zip/26.05/7z2605-extra.7z" "https://sf-eu-introserv-1.dl.sourceforge.net/project/sevenzip/7-Zip/26.05/7z2605-extra.7z" "https://sf-west-interserver-1.dl.sourceforge.net/project/sevenzip/7-Zip/26.05/7z2605-extra.7z" "https://sf-west-interserver-2.dl.sourceforge.net/project/sevenzip/7-Zip/26.05/7z2605-extra.7z"
+"build/externals/7z2605-x64.exe"                 1663506 1fc7519fde5d29a45cb0082ee310802e40d74507c25b90ed82c2f954fce962b4afeb1821ac497542fca453a5b5ef5c11e4e75d70026924c5a78ce0f76c9c20d5 "https://7-zip.org/a/7z2605-x64.exe" "https://deac-fra.dl.sourceforge.net/project/sevenzip/7-Zip/26.05/7z2605-x64.exe" "https://sf-eu-introserv-1.dl.sourceforge.net/project/sevenzip/7-Zip/26.05/7z2605-x64.exe" "https://sf-west-interserver-1.dl.sourceforge.net/project/sevenzip/7-Zip/26.05/7z2605-x64.exe" "https://sf-west-interserver-2.dl.sourceforge.net/project/sevenzip/7-Zip/26.05/7z2605-x64.exe"
 "build/externals/WA5.55_SDK.exe"                  336166 394375db8a16bf155b5de9376f6290488ab339e503dbdfdc4e2f5bede967799e625c559cca363bc988324f1a8e86e5fd28a9f697422abd7bb3dcde4a766607b5 "https://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" "http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" "https://web.archive.org/web/20131217072017id_/http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe"
 "build/externals/xmp-sdk.zip"                     326626 8310230e678a73228c0d647c21db13030a88cab65a24ce890f22e3d730482325325d0a8b96c6ddf721be26f77f02f0c80b9d5e3d3db818f2cb7c1444e6b329ba "https://www.un4seen.com/files/xmp-sdk.zip"
 "build/externals/htmlhelp.exe"                   3509072 d91371244ea98c691b4674ee266c4a2496a296800c176adae069d21f5c52c0763b21cc7859cfffa865b89e50171a2c99a6d14620c32f7d72c0ef04045348f856 "https://web.archive.org/web/20200918004813id_/https://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe" "https://web.archive.org/web/20200918004813id_/http://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe"

[OMPT-svn-commit] OpenMPT r25779 - trunk/OpenMPT/build

From: <sv...@op...> - 2026-10-23 12:23:37

Author: manx
Date: Fri Oct 23 14:23:28 2026
New Revision: 25779
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=25779

Log:
[Var] Update 7-zip to 26.05 (2026-10-21).

Modified:
   trunk/OpenMPT/build/download_externals.cmd
   trunk/OpenMPT/build/download_externals.meta4

Modified: trunk/OpenMPT/build/download_externals.cmd
==============================================================================
--- trunk/OpenMPT/build/download_externals.cmd	Fri Oct 23 14:12:00 2026	(r25778)
+++ trunk/OpenMPT/build/download_externals.cmd	Fri Oct 23 14:23:28 2026	(r25779)
@@ -37,7 +37,7 @@
 rem Get 7zip installer and unpack it with current commandline 7zip
 if not exist "build\tools\7zipr" mkdir "build\tools\7zipr"
 copy /y "build\externals\7zr.exe" "build\tools\7zipr\7zr.exe"
-build\tools\7zipr\7zr.exe x -y -obuild\tools\7zip "build\externals\7z2604-x64.exe" || goto error
+build\tools\7zipr\7zr.exe x -y -obuild\tools\7zip "build\externals\7z2605-x64.exe" || goto error
 
 call build\scriptlib\unpack.cmd "build\tools\htmlhelp" "build\externals\htmlhelp.exe" "." || goto error
 

Modified: trunk/OpenMPT/build/download_externals.meta4
==============================================================================
--- trunk/OpenMPT/build/download_externals.meta4	Fri Oct 23 14:12:00 2026	(r25778)
+++ trunk/OpenMPT/build/download_externals.meta4	Fri Oct 23 14:23:28 2026	(r25779)
@@ -2,21 +2,21 @@
 <metalink xmlns="urn:ietf:params:xml:ns:metalink">
  <file name="build/externals/7zr.exe">
   <size>602624</size>
-  <hash type="sha-512">cc2e3b46c50ac576f913dfa9f39079a9b5e7e39cd164bd968556da0b3779c23e6506f93f11fc2eb3681f9371e3d6256ae95de40da6c4ee4c96d8a58063a3d25a</hash>
+  <hash type="sha-512">d6de9c64d41ae3a99e92e3085be010fa25ddb39d77875084afd3ee77907754e0f37da9a8abfa9ede6f7f717be3eac945421a849ea3865cb8ac613518e182120d</hash>
   <url>https://7-zip.org/a/7zr.exe</url>
-  <url>https://deac-fra.dl.sourceforge.net/project/sevenzip/7-Zip/26.04/7zr.exe</url>
-  <url>https://sf-eu-introserv-1.dl.sourceforge.net/project/sevenzip/7-Zip/26.04/7zr.exe</url>
-  <url>https://sf-west-interserver-1.dl.sourceforge.net/project/sevenzip/7-Zip/26.04/7zr.exe</url>
-  <url>https://sf-west-interserver-2.dl.sourceforge.net/project/sevenzip/7-Zip/26.04/7zr.exe</url>
+  <url>https://deac-fra.dl.sourceforge.net/project/sevenzip/7-Zip/26.05/7zr.exe</url>
+  <url>https://sf-eu-introserv-1.dl.sourceforge.net/project/sevenzip/7-Zip/26.05/7zr.exe</url>
+  <url>https://sf-west-interserver-1.dl.sourceforge.net/project/sevenzip/7-Zip/26.05/7zr.exe</url>
+  <url>https://sf-west-interserver-2.dl.sourceforge.net/project/sevenzip/7-Zip/26.05/7zr.exe</url>
  </file>
- <file name="build/externals/7z2604-x64.exe">
-  <size>1664082</size>
-  <hash type="sha-512">ffcc354499e4121735cd4e1bb08725b01cfea758eef2d8681e4782abb53d27cd3f33bbb06de08d4f77f52e2516a9aeefe6c3d3605b8258a65a2405ea49f29b03</hash>
-  <url>https://7-zip.org/a/7z2604-x64.exe</url>
-  <url>https://deac-fra.dl.sourceforge.net/project/sevenzip/7-Zip/26.04/7z2604-x64.exe</url>
-  <url>https://sf-eu-introserv-1.dl.sourceforge.net/project/sevenzip/7-Zip/26.04/7z2604-x64.exe</url>
-  <url>https://sf-west-interserver-1.dl.sourceforge.net/project/sevenzip/7-Zip/26.04/7z2604-x64.exe</url>
-  <url>https://sf-west-interserver-2.dl.sourceforge.net/project/sevenzip/7-Zip/26.04/7z2604-x64.exe</url>
+ <file name="build/externals/7z2605-x64.exe">
+  <size>1663506</size>
+  <hash type="sha-512">1fc7519fde5d29a45cb0082ee310802e40d74507c25b90ed82c2f954fce962b4afeb1821ac497542fca453a5b5ef5c11e4e75d70026924c5a78ce0f76c9c20d5</hash>
+  <url>https://7-zip.org/a/7z2605-x64.exe</url>
+  <url>https://deac-fra.dl.sourceforge.net/project/sevenzip/7-Zip/26.05/7z2605-x64.exe</url>
+  <url>https://sf-eu-introserv-1.dl.sourceforge.net/project/sevenzip/7-Zip/26.05/7z2605-x64.exe</url>
+  <url>https://sf-west-interserver-1.dl.sourceforge.net/project/sevenzip/7-Zip/26.05/7z2605-x64.exe</url>
+  <url>https://sf-west-interserver-2.dl.sourceforge.net/project/sevenzip/7-Zip/26.05/7z2605-x64.exe</url>
  </file>
  <file name="build/externals/WA5.55_SDK.exe">
   <size>336166</size>

[OMPT-svn-commit] OpenMPT r25778 - branches/OpenMPT-1.32/build

From: <sv...@op...> - 2026-10-23 12:12:10

Author: manx
Date: Fri Oct 23 14:12:00 2026
New Revision: 25778
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=25778

Log:
[Var] python: Update to v3.14.9 (2026-10-21).

Modified:
   branches/OpenMPT-1.32/build/download_externals.cmd
   branches/OpenMPT-1.32/build/download_externals.txt

Modified: branches/OpenMPT-1.32/build/download_externals.cmd
==============================================================================
--- branches/OpenMPT-1.32/build/download_externals.cmd	Fri Oct 23 14:08:14 2026	(r25777)
+++ branches/OpenMPT-1.32/build/download_externals.cmd	Fri Oct 23 14:12:00 2026	(r25778)
@@ -47,7 +47,7 @@
 call build\scriptlib\unpack.cmd "include\winamp"   "build\externals\WA5.55_SDK.exe" "."          || goto error
 call build\scriptlib\unpack.cmd "include\xmplay"   "build\externals\xmp-sdk.zip"    "."          || goto error
 
-call build\scriptlib\unpack.cmd "build\tools\python3" "build\externals\python-3.14.8-embed-amd64.zip" "." || goto error
+call build\scriptlib\unpack.cmd "build\tools\python3" "build\externals\python-3.14.9-embed-amd64.zip" "." || goto error
 
 
 call :killdir "build\tools\innosetup" || goto error

Modified: branches/OpenMPT-1.32/build/download_externals.txt
==============================================================================
--- branches/OpenMPT-1.32/build/download_externals.txt	Fri Oct 23 14:08:14 2026	(r25777)
+++ branches/OpenMPT-1.32/build/download_externals.txt	Fri Oct 23 14:12:00 2026	(r25778)
@@ -4,7 +4,7 @@
 "build/externals/WA5.55_SDK.exe"                  336166 394375db8a16bf155b5de9376f6290488ab339e503dbdfdc4e2f5bede967799e625c559cca363bc988324f1a8e86e5fd28a9f697422abd7bb3dcde4a766607b5 "https://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" "http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" "https://web.archive.org/web/20131217072017id_/http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe"
 "build/externals/xmp-sdk.zip"                     326626 8310230e678a73228c0d647c21db13030a88cab65a24ce890f22e3d730482325325d0a8b96c6ddf721be26f77f02f0c80b9d5e3d3db818f2cb7c1444e6b329ba "https://www.un4seen.com/files/xmp-sdk.zip"
 "build/externals/htmlhelp.exe"                   3509072 d91371244ea98c691b4674ee266c4a2496a296800c176adae069d21f5c52c0763b21cc7859cfffa865b89e50171a2c99a6d14620c32f7d72c0ef04045348f856 "https://web.archive.org/web/20200918004813id_/https://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe" "https://web.archive.org/web/20200918004813id_/http://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe"
-"build/externals/python-3.14.8-embed-amd64.zip" 12601679 5b7ee0ec40fd2a3f5fc74d527daa20e523f0524596eea16b289dc4e6c1c44d2c9bcdda3e65ef6b136737d8bd1f2f3cabcb905330911e4a8a43c573fe0e9fe876 "https://www.python.org/ftp/python/3.14.8/python-3.14.8-embed-amd64.zip"
+"build/externals/python-3.14.9-embed-amd64.zip" 12609248 1b3652f9f2476bc4f74930e8a3570d781fcbce53197fadd015fae681cd5ada3663e7cfd5b97fe79356c2c133feec14073431f75aba584800a2bd0ccdd04e93b8 "https://www.python.org/ftp/python/3.14.9/python-3.14.9-embed-amd64.zip"
 "build/externals/innounp050.rar"                  141621 dbbc809308267a866db9d6b751fdeda6d179e1a65d8ddb14bb51984431ae91493f9a76105e1789b245732043a2c696c869ed10964b48cf59f81e55bd52f85330 "https://deac-fra.dl.sourceforge.net/project/innounp/innounp/innounp 0.50/innounp050.rar" "https://sf-eu-introserv-1.dl.sourceforge.net/project/innounp/innounp/innounp 0.50/innounp050.rar" "https://sf-west-interserver-1.dl.sourceforge.net/project/innounp/innounp/innounp 0.50/innounp050.rar" "https://sf-west-interserver-2.dl.sourceforge.net/project/innounp/innounp/innounp 0.50/innounp050.rar"
 "build/externals/innosetup-6.5.4.exe"            7770392 9df3ac44328f31b47fae88626a282daeae36c14c24df78dd7c7cea7072f6f3aca82dc4b1a68e0943acef45d6350b8a02883795531ecb8f59ffdf80291d862b23 "https://github.com/jrsoftware/issrc/releases/download/is-6_5_4/innosetup-6.5.4.exe" "https://web.archive.org/web/20260106174707id_/https://files.jrsoftware.org/is/6/innosetup-6.5.4.exe" "https://web.archive.org/web/20251013202926id_/https://files.innosetup.nl/innosetup-6.5.4.exe"
 "build/externals/isetup-5.5.8-unicode.exe"       2342456 da7e27d85caec85b4194c7b1412c5a64c0ae12f22d903b94f2f4ee9ea0cb99c91b2d1dbb49262eefae8129e6b91f5c46f26f353011076e77e75f9c955fc5e1cb "https://files.jrsoftware.org/is/5/isetup-5.5.8-unicode.exe" "https://web.archive.org/web/20230523165634id_/https://files.jrsoftware.org/is/5/isetup-5.5.8-unicode.exe"

[OMPT-svn-commit] OpenMPT r25777 - trunk/OpenMPT/build

From: <sv...@op...> - 2026-10-23 12:08:22

Author: manx
Date: Fri Oct 23 14:08:14 2026
New Revision: 25777
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=25777

Log:
[Var] python: Update to v3.15.1 (2026-10-21)

Modified:
   trunk/OpenMPT/build/download_externals.cmd
   trunk/OpenMPT/build/download_externals.meta4

Modified: trunk/OpenMPT/build/download_externals.cmd
==============================================================================
--- trunk/OpenMPT/build/download_externals.cmd	Fri Oct 23 14:02:37 2026	(r25776)
+++ trunk/OpenMPT/build/download_externals.cmd	Fri Oct 23 14:08:14 2026	(r25777)
@@ -44,7 +44,7 @@
 call build\scriptlib\unpack.cmd "include\winamp"   "build\externals\WA5.55_SDK.exe" "."          || goto error
 call build\scriptlib\unpack.cmd "include\xmplay"   "build\externals\xmp-sdk.zip"    "."          || goto error
 
-call build\scriptlib\unpack.cmd "build\tools\python3" "build\externals\python-3.15.0-embed-amd64.zip" "." || goto error
+call build\scriptlib\unpack.cmd "build\tools\python3" "build\externals\python-3.15.1-embed-amd64.zip" "." || goto error
 
 
 call :killdir "build\tools\innosetup" || goto error

Modified: trunk/OpenMPT/build/download_externals.meta4
==============================================================================
--- trunk/OpenMPT/build/download_externals.meta4	Fri Oct 23 14:02:37 2026	(r25776)
+++ trunk/OpenMPT/build/download_externals.meta4	Fri Oct 23 14:08:14 2026	(r25777)
@@ -40,10 +40,10 @@
   <url>https://web.archive.org/web/20160423015142id_/http://download.microsoft.com/download/0/a/9/0a939ef6-e31c-430f-a3df-dfae7960d564/htmlhelp.exe</url>
   <url>https://web.archive.org/web/20160301111642id_/http://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe</url>
  </file>
- <file name="build/externals/python-3.15.0-embed-amd64.zip">
-  <size>13728261</size>
-  <hash type="sha-512">9732fc79dcb923924bcdfca4e95913df377a2ec167afe890b9eb67ca6ded22bcf230a2af1376f3ffb8a5b333f3ac47de4ea355733c27a280b46fae8af73ef7ee</hash>
-  <url>https://www.python.org/ftp/python/3.15.0/python-3.15.0-embed-amd64.zip</url>
+ <file name="build/externals/python-3.15.1-embed-amd64.zip">
+  <size>13729922</size>
+  <hash type="sha-512">3b24dd39fbff5daa76b1e1cd553e5337007aecf06455cc8a8340e7eb54115fa956900134f3ca456e78f13cda3be8ff8444299672bcb5b87ba276164518493b00</hash>
+  <url>https://www.python.org/ftp/python/3.15.1/python-3.15.1-embed-amd64.zip</url>
  </file>
  <file name="build/externals/innounp050.rar">
   <size>141621</size>

[OMPT-svn-commit] OpenMPT r25776 - in branches/OpenMPT-1.30: . .github/workflows

From: <sv...@op...> - 2026-10-23 12:02:45

Author: manx
Date: Fri Oct 23 14:02:37 2026
New Revision: 25776
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=25776

Log:
Merged revision(s) 25773 from trunk/OpenMPT:
[Imp] build: CI: GitHub: CPA: Add OpenBSD 8.0.
[Ref] build: CI: GitHub: CPA: Update to commit 34f739a0cfabfdb4df184dad9f5a2462e604ecaf (2026-10-22).
........

Modified:
   branches/OpenMPT-1.30/   (props changed)
   branches/OpenMPT-1.30/.github/workflows/OpenBSD-Makefile.yml

Modified: branches/OpenMPT-1.30/.github/workflows/OpenBSD-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.30/.github/workflows/OpenBSD-Makefile.yml	Fri Oct 23 14:01:27 2026	(r25775)
+++ branches/OpenMPT-1.30/.github/workflows/OpenBSD-Makefile.yml	Fri Oct 23 14:02:37 2026	(r25776)
@@ -11,6 +11,8 @@
       fail-fast: false
       matrix:
         include:
+          - { version: '8.0', deps: sys   }
+          - { version: '8.0', deps: small }
           - { version: '7.9', deps: sys   }
           - { version: '7.9', deps: small }
           - { version: '7.8', deps: sys   }
@@ -32,7 +34,7 @@
     - name: Checkout
       uses: actions/checkout@v7
     - name: Startup VM
-      uses: cross-platform-actions/action@v1.6.0
+      uses: cross-platform-actions/action@34f739a0cfabfdb4df184dad9f5a2462e604ecaf
       with:
         architecture: x86_64
         memory: 4G
@@ -47,8 +49,8 @@
       shell: cpa.sh {0} --sync-files none
       run: |
         sudo pkg_add -u
-        sudo pkg_add -I ${{ (matrix.version == '7.9') && 'ghostscript-10.07.0' || (matrix.version == '7.8') && 'ghostscript-10.06.0' || (matrix.version == '7.7') && 'ghostscript-10.05.0' || (matrix.version == '7.6') && 'ghostscript-10.03.1p2' || (matrix.version == '7.5') && 'ghostscript-10.03.1' || (matrix.version == '7.4') && 'ghostscript-10.02.0' || 'ghostscript' }}
-        sudo pkg_add -I ${{ (matrix.version == '7.9') && 'autoconf-2.72p0 automake-1.18.1' || (matrix.version == '7.8') && 'autoconf-2.72p0 automake-1.18' || (matrix.version == '7.7') && 'autoconf-2.72p0 automake-1.17 pkgconf' || (matrix.version == '7.6') && 'autoconf-2.72p0 automake-1.16.5 pkgconf' || (matrix.version == '7.5') && 'autoconf-2.71 automake-1.16.5 pkgconf' || (matrix.version == '7.4') && 'autoconf-2.71 automake-1.16.5 pkgconf' || 'autoconf automake pkgconf' }}
+        sudo pkg_add -I ${{ (matrix.version == '8.0') && 'ghostscript-10.08.0' || (matrix.version == '7.9') && 'ghostscript-10.07.0' || (matrix.version == '7.8') && 'ghostscript-10.06.0' || (matrix.version == '7.7') && 'ghostscript-10.05.0' || (matrix.version == '7.6') && 'ghostscript-10.03.1p2' || (matrix.version == '7.5') && 'ghostscript-10.03.1' || (matrix.version == '7.4') && 'ghostscript-10.02.0' || 'ghostscript' }}
+        sudo pkg_add -I ${{ (matrix.version == '8.0') && 'autoconf-2.73 automake-1.19' || (matrix.version == '7.9') && 'autoconf-2.72p0 automake-1.18.1' || (matrix.version == '7.8') && 'autoconf-2.72p0 automake-1.18' || (matrix.version == '7.7') && 'autoconf-2.72p0 automake-1.17 pkgconf' || (matrix.version == '7.6') && 'autoconf-2.72p0 automake-1.16.5 pkgconf' || (matrix.version == '7.5') && 'autoconf-2.71 automake-1.16.5 pkgconf' || (matrix.version == '7.4') && 'autoconf-2.71 automake-1.16.5 pkgconf' || 'autoconf automake pkgconf' }}
         sudo pkg_add -I subversion p5-XML-XPath git mawk gmake autoconf-archive libtool libltdl help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio-svn sdl2
     - name: Build
       shell: cpa.sh {0} --sync-files none

3 messages has been excluded from this view by a project administrator.

Flat | Threaded

1 2 3 .. 1034 > >> (Page 1 of 1034)