Menu
▾
▴
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
(399) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <sv...@op...> - 2025-06-09 16:58:06
|
Author: manx Date: Mon Jun 9 18:57:54 2025 New Revision: 23447 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23447 Log: Merged revision(s) 23444 from branches/OpenMPT-1.30: Merged revision(s) 23436 from trunk/OpenMPT: [Fix] openmpt123: We need to also consider file extensions of subformats. This is necessary because MP3 is a subformat and the major format lists only .m1a as file extension. ........ ........ Modified: branches/OpenMPT-1.29/ (props changed) branches/OpenMPT-1.29/openmpt123/openmpt123_sndfile.hpp Modified: branches/OpenMPT-1.29/openmpt123/openmpt123_sndfile.hpp ============================================================================== --- branches/OpenMPT-1.29/openmpt123/openmpt123_sndfile.hpp Mon Jun 9 18:57:32 2025 (r23446) +++ branches/OpenMPT-1.29/openmpt123/openmpt123_sndfile.hpp Mon Jun 9 18:57:54 2025 (r23447) @@ -104,7 +104,7 @@ switch ( match_mode ) { case match_print: log << "sndfile: " - << ( format_info.name ? format_info.name : "" ) << " (" << ( format_info.extension ? format_info.extension : "" ) << ")" + << ( format_info.name ? format_info.name : "" ) << " (" << ( subformat_info.extension ? subformat_info.extension : format_info.extension ? format_info.extension : "" ) << ")" << " / " << ( subformat_info.name ? subformat_info.name : "" ) << " [" @@ -117,6 +117,13 @@ case match_recurse: break; case match_exact: + if ( subformat_info.extension && ( extension == subformat_info.extension ) ) { + if ( flags.use_float && ( subformat_info.format == SF_FORMAT_FLOAT ) ) { + return matched_result( format_info, subformat_info, match_mode ); + } else if ( !flags.use_float && ( subformat_info.format == SF_FORMAT_PCM_16 ) ) { + return matched_result( format_info, subformat_info, match_mode ); + } + } if ( format_info.extension && ( extension == format_info.extension ) ) { if ( flags.use_float && ( subformat_info.format == SF_FORMAT_FLOAT ) ) { return matched_result( format_info, subformat_info, match_mode ); @@ -126,6 +133,13 @@ } break; case match_better: + if ( subformat_info.extension && ( extension == subformat_info.extension ) ) { + if ( flags.use_float && ( subformat_info.format == SF_FORMAT_FLOAT || subformat_info.format == SF_FORMAT_DOUBLE ) ) { + return matched_result( format_info, subformat_info, match_mode ); + } else if ( !flags.use_float && ( subformat_info.format & ( subformat_info.format == SF_FORMAT_PCM_16 || subformat_info.format == SF_FORMAT_PCM_24 || subformat_info.format == SF_FORMAT_PCM_32 ) ) ) { + return matched_result( format_info, subformat_info, match_mode ); + } + } if ( format_info.extension && ( extension == format_info.extension ) ) { if ( flags.use_float && ( subformat_info.format == SF_FORMAT_FLOAT || subformat_info.format == SF_FORMAT_DOUBLE ) ) { return matched_result( format_info, subformat_info, match_mode ); @@ -135,6 +149,9 @@ } break; case match_any: + if ( subformat_info.extension && ( extension == subformat_info.extension ) ) { + return matched_result( format_info, subformat_info, match_mode ); + } if ( format_info.extension && ( extension == format_info.extension ) ) { return matched_result( format_info, subformat_info, match_mode ); } |
|
From: <sv...@op...> - 2025-06-09 16:57:39
|
Author: manx Date: Mon Jun 9 18:57:32 2025 New Revision: 23446 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23446 Log: Merged revision(s) 23443 from branches/OpenMPT-1.30: Merged revision(s) 23435 from trunk/OpenMPT: [Fix] openmpt123: Guard against libsndfile returning nullptr as file extension when matching the file format. ........ ........ Modified: branches/OpenMPT-1.29/ (props changed) branches/OpenMPT-1.29/openmpt123/openmpt123_sndfile.hpp Modified: branches/OpenMPT-1.29/openmpt123/openmpt123_sndfile.hpp ============================================================================== --- branches/OpenMPT-1.29/openmpt123/openmpt123_sndfile.hpp Mon Jun 9 18:57:06 2025 (r23445) +++ branches/OpenMPT-1.29/openmpt123/openmpt123_sndfile.hpp Mon Jun 9 18:57:32 2025 (r23446) @@ -117,7 +117,7 @@ case match_recurse: break; case match_exact: - if ( extension == format_info.extension ) { + if ( format_info.extension && ( extension == format_info.extension ) ) { if ( flags.use_float && ( subformat_info.format == SF_FORMAT_FLOAT ) ) { return matched_result( format_info, subformat_info, match_mode ); } else if ( !flags.use_float && ( subformat_info.format == SF_FORMAT_PCM_16 ) ) { @@ -126,7 +126,7 @@ } break; case match_better: - if ( extension == format_info.extension ) { + if ( format_info.extension && ( extension == format_info.extension ) ) { if ( flags.use_float && ( subformat_info.format == SF_FORMAT_FLOAT || subformat_info.format == SF_FORMAT_DOUBLE ) ) { return matched_result( format_info, subformat_info, match_mode ); } else if ( !flags.use_float && ( subformat_info.format & ( subformat_info.format == SF_FORMAT_PCM_16 || subformat_info.format == SF_FORMAT_PCM_24 || subformat_info.format == SF_FORMAT_PCM_32 ) ) ) { @@ -135,7 +135,7 @@ } break; case match_any: - if ( extension == format_info.extension ) { + if ( format_info.extension && ( extension == format_info.extension ) ) { return matched_result( format_info, subformat_info, match_mode ); } break; |
|
From: <sv...@op...> - 2025-06-09 16:57:17
|
Author: manx Date: Mon Jun 9 18:57:06 2025 New Revision: 23445 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23445 Log: [Doc] libopenmpt: Update changelog. Modified: branches/OpenMPT-1.30/libopenmpt/dox/changelog.md Modified: branches/OpenMPT-1.30/libopenmpt/dox/changelog.md ============================================================================== --- branches/OpenMPT-1.30/libopenmpt/dox/changelog.md Mon Jun 9 18:56:42 2025 (r23444) +++ branches/OpenMPT-1.30/libopenmpt/dox/changelog.md Mon Jun 9 18:57:06 2025 (r23445) @@ -12,6 +12,8 @@ string. * [**Bug**] Work-around broken user locale support on Haiku by always assuming UTF8. + * [**Bug**] openmpt123: Allow for converting to formats which list the file + extension only in the subformat (i.e. MP3 with libsndfile 1.1.0 or later). * mpg123: Update to v1.33.0 (2025-06-07). * miniz: Update to v3.0.2 (2023-01-15). |
|
From: <sv...@op...> - 2025-06-09 16:56:54
|
Author: manx Date: Mon Jun 9 18:56:42 2025 New Revision: 23444 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23444 Log: Merged revision(s) 23436 from trunk/OpenMPT: [Fix] openmpt123: We need to also consider file extensions of subformats. This is necessary because MP3 is a subformat and the major format lists only .m1a as file extension. ........ Modified: branches/OpenMPT-1.30/ (props changed) branches/OpenMPT-1.30/openmpt123/openmpt123_sndfile.hpp Modified: branches/OpenMPT-1.30/openmpt123/openmpt123_sndfile.hpp ============================================================================== --- branches/OpenMPT-1.30/openmpt123/openmpt123_sndfile.hpp Mon Jun 9 18:48:08 2025 (r23443) +++ branches/OpenMPT-1.30/openmpt123/openmpt123_sndfile.hpp Mon Jun 9 18:56:42 2025 (r23444) @@ -104,7 +104,7 @@ switch ( match_mode ) { case match_print: log << "sndfile: " - << ( format_info.name ? format_info.name : "" ) << " (" << ( format_info.extension ? format_info.extension : "" ) << ")" + << ( format_info.name ? format_info.name : "" ) << " (" << ( subformat_info.extension ? subformat_info.extension : format_info.extension ? format_info.extension : "" ) << ")" << " / " << ( subformat_info.name ? subformat_info.name : "" ) << " [" @@ -117,6 +117,13 @@ case match_recurse: break; case match_exact: + if ( subformat_info.extension && ( extension == subformat_info.extension ) ) { + if ( flags.use_float && ( subformat_info.format == SF_FORMAT_FLOAT ) ) { + return matched_result( format_info, subformat_info, match_mode ); + } else if ( !flags.use_float && ( subformat_info.format == SF_FORMAT_PCM_16 ) ) { + return matched_result( format_info, subformat_info, match_mode ); + } + } if ( format_info.extension && ( extension == format_info.extension ) ) { if ( flags.use_float && ( subformat_info.format == SF_FORMAT_FLOAT ) ) { return matched_result( format_info, subformat_info, match_mode ); @@ -126,6 +133,13 @@ } break; case match_better: + if ( subformat_info.extension && ( extension == subformat_info.extension ) ) { + if ( flags.use_float && ( subformat_info.format == SF_FORMAT_FLOAT || subformat_info.format == SF_FORMAT_DOUBLE ) ) { + return matched_result( format_info, subformat_info, match_mode ); + } else if ( !flags.use_float && ( subformat_info.format & ( subformat_info.format == SF_FORMAT_PCM_16 || subformat_info.format == SF_FORMAT_PCM_24 || subformat_info.format == SF_FORMAT_PCM_32 ) ) ) { + return matched_result( format_info, subformat_info, match_mode ); + } + } if ( format_info.extension && ( extension == format_info.extension ) ) { if ( flags.use_float && ( subformat_info.format == SF_FORMAT_FLOAT || subformat_info.format == SF_FORMAT_DOUBLE ) ) { return matched_result( format_info, subformat_info, match_mode ); @@ -135,6 +149,9 @@ } break; case match_any: + if ( subformat_info.extension && ( extension == subformat_info.extension ) ) { + return matched_result( format_info, subformat_info, match_mode ); + } if ( format_info.extension && ( extension == format_info.extension ) ) { return matched_result( format_info, subformat_info, match_mode ); } |
|
From: <sv...@op...> - 2025-06-09 16:48:14
|
Author: manx Date: Mon Jun 9 18:48:08 2025 New Revision: 23443 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23443 Log: Merged revision(s) 23435 from trunk/OpenMPT: [Fix] openmpt123: Guard against libsndfile returning nullptr as file extension when matching the file format. ........ Modified: branches/OpenMPT-1.30/ (props changed) branches/OpenMPT-1.30/openmpt123/openmpt123_sndfile.hpp Modified: branches/OpenMPT-1.30/openmpt123/openmpt123_sndfile.hpp ============================================================================== --- branches/OpenMPT-1.30/openmpt123/openmpt123_sndfile.hpp Mon Jun 9 18:45:54 2025 (r23442) +++ branches/OpenMPT-1.30/openmpt123/openmpt123_sndfile.hpp Mon Jun 9 18:48:08 2025 (r23443) @@ -117,7 +117,7 @@ case match_recurse: break; case match_exact: - if ( extension == format_info.extension ) { + if ( format_info.extension && ( extension == format_info.extension ) ) { if ( flags.use_float && ( subformat_info.format == SF_FORMAT_FLOAT ) ) { return matched_result( format_info, subformat_info, match_mode ); } else if ( !flags.use_float && ( subformat_info.format == SF_FORMAT_PCM_16 ) ) { @@ -126,7 +126,7 @@ } break; case match_better: - if ( extension == format_info.extension ) { + if ( format_info.extension && ( extension == format_info.extension ) ) { if ( flags.use_float && ( subformat_info.format == SF_FORMAT_FLOAT || subformat_info.format == SF_FORMAT_DOUBLE ) ) { return matched_result( format_info, subformat_info, match_mode ); } else if ( !flags.use_float && ( subformat_info.format & ( subformat_info.format == SF_FORMAT_PCM_16 || subformat_info.format == SF_FORMAT_PCM_24 || subformat_info.format == SF_FORMAT_PCM_32 ) ) ) { @@ -135,7 +135,7 @@ } break; case match_any: - if ( extension == format_info.extension ) { + if ( format_info.extension && ( extension == format_info.extension ) ) { return matched_result( format_info, subformat_info, match_mode ); } break; |
|
From: <sv...@op...> - 2025-06-09 16:46:00
|
Author: manx Date: Mon Jun 9 18:45:54 2025 New Revision: 23442 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23442 Log: [Doc] libopenmpt: Update changelog. Modified: branches/OpenMPT-1.31/doc/libopenmpt/changelog.md Modified: branches/OpenMPT-1.31/doc/libopenmpt/changelog.md ============================================================================== --- branches/OpenMPT-1.31/doc/libopenmpt/changelog.md Mon Jun 9 18:45:32 2025 (r23441) +++ branches/OpenMPT-1.31/doc/libopenmpt/changelog.md Mon Jun 9 18:45:54 2025 (r23442) @@ -12,6 +12,8 @@ string. * [**Bug**] Work-around broken user locale support on Haiku by always assuming UTF8. + * [**Bug**] openmpt123: Allow for converting to formats which list the file + extension only in the subformat (i.e. MP3 with libsndfile 1.1.0 or later). * mpg123: Update to v1.33.0 (2025-06-07). * miniz: Update to v3.0.2 (2023-01-15). |
|
From: <sv...@op...> - 2025-06-09 16:45:44
|
Author: manx Date: Mon Jun 9 18:45:32 2025 New Revision: 23441 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23441 Log: Merged revision(s) 23436 from trunk/OpenMPT: [Fix] openmpt123: We need to also consider file extensions of subformats. This is necessary because MP3 is a subformat and the major format lists only .m1a as file extension. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/openmpt123/openmpt123_sndfile.hpp Modified: branches/OpenMPT-1.31/openmpt123/openmpt123_sndfile.hpp ============================================================================== --- branches/OpenMPT-1.31/openmpt123/openmpt123_sndfile.hpp Mon Jun 9 18:45:10 2025 (r23440) +++ branches/OpenMPT-1.31/openmpt123/openmpt123_sndfile.hpp Mon Jun 9 18:45:32 2025 (r23441) @@ -106,7 +106,7 @@ switch ( match_mode ) { case match_print: log << MPT_USTRING("sndfile: ") - << mpt::transcode<mpt::ustring>( sndfile_encoding, ( format_info.name ? format_info.name : "" ) ) << MPT_USTRING(" (.") << mpt::transcode<mpt::ustring>( sndfile_encoding, ( format_info.extension ? format_info.extension : "" ) ) << MPT_USTRING(")") + << mpt::transcode<mpt::ustring>( sndfile_encoding, ( format_info.name ? format_info.name : "" ) ) << MPT_USTRING(" (.") << mpt::transcode<mpt::ustring>( sndfile_encoding, ( subformat_info.extension ? subformat_info.extension : format_info.extension ? format_info.extension : "" ) ) << MPT_USTRING(")") << MPT_USTRING(" / ") << mpt::transcode<mpt::ustring>( sndfile_encoding, ( subformat_info.name ? subformat_info.name : "" ) ) << MPT_USTRING(" [") @@ -117,6 +117,14 @@ case match_recurse: break; case match_exact: + if ( subformat_info.extension && ( mpt::transcode<std::string>( sndfile_encoding, extension ) == subformat_info.extension ) ) { + if ( flags.use_float && ( subformat_info.format == SF_FORMAT_FLOAT ) ) { + return matched_result( format, format_info, subformat_info, match_mode ); + } else if ( !flags.use_float && ( subformat_info.format == SF_FORMAT_PCM_16 ) ) { + return matched_result( format, format_info, subformat_info, match_mode ); + } + } + break; if ( format_info.extension && ( mpt::transcode<std::string>( sndfile_encoding, extension ) == format_info.extension ) ) { if ( flags.use_float && ( subformat_info.format == SF_FORMAT_FLOAT ) ) { return matched_result( format, format_info, subformat_info, match_mode ); @@ -126,6 +134,14 @@ } break; case match_better: + if ( subformat_info.extension && ( mpt::transcode<std::string>( sndfile_encoding, extension ) == subformat_info.extension ) ) { + if ( flags.use_float && ( subformat_info.format == SF_FORMAT_FLOAT || subformat_info.format == SF_FORMAT_DOUBLE ) ) { + return matched_result( format, format_info, subformat_info, match_mode ); + } else if ( !flags.use_float && ( subformat_info.format & ( subformat_info.format == SF_FORMAT_PCM_16 || subformat_info.format == SF_FORMAT_PCM_24 || subformat_info.format == SF_FORMAT_PCM_32 ) ) ) { + return matched_result( format, format_info, subformat_info, match_mode ); + } + } + break; if ( format_info.extension && ( mpt::transcode<std::string>( sndfile_encoding, extension ) == format_info.extension ) ) { if ( flags.use_float && ( subformat_info.format == SF_FORMAT_FLOAT || subformat_info.format == SF_FORMAT_DOUBLE ) ) { return matched_result( format, format_info, subformat_info, match_mode ); @@ -135,6 +151,9 @@ } break; case match_any: + if ( subformat_info.extension && ( mpt::transcode<std::string>( sndfile_encoding, extension ) == subformat_info.extension ) ) { + return matched_result( format, format_info, subformat_info, match_mode ); + } if ( format_info.extension && ( mpt::transcode<std::string>( sndfile_encoding, extension ) == format_info.extension ) ) { return matched_result( format, format_info, subformat_info, match_mode ); } |
|
From: <sv...@op...> - 2025-06-09 16:45:16
|
Author: manx Date: Mon Jun 9 18:45:10 2025 New Revision: 23440 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23440 Log: Merged revision(s) 23435 from trunk/OpenMPT: [Fix] openmpt123: Guard against libsndfile returning nullptr as file extension when matching the file format. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/openmpt123/openmpt123_sndfile.hpp Modified: branches/OpenMPT-1.31/openmpt123/openmpt123_sndfile.hpp ============================================================================== --- branches/OpenMPT-1.31/openmpt123/openmpt123_sndfile.hpp Mon Jun 9 18:44:58 2025 (r23439) +++ branches/OpenMPT-1.31/openmpt123/openmpt123_sndfile.hpp Mon Jun 9 18:45:10 2025 (r23440) @@ -117,7 +117,7 @@ case match_recurse: break; case match_exact: - if ( mpt::transcode<std::string>( sndfile_encoding, extension ) == format_info.extension ) { + if ( format_info.extension && ( mpt::transcode<std::string>( sndfile_encoding, extension ) == format_info.extension ) ) { if ( flags.use_float && ( subformat_info.format == SF_FORMAT_FLOAT ) ) { return matched_result( format, format_info, subformat_info, match_mode ); } else if ( !flags.use_float && ( subformat_info.format == SF_FORMAT_PCM_16 ) ) { @@ -126,7 +126,7 @@ } break; case match_better: - if ( mpt::transcode<std::string>( sndfile_encoding, extension ) == format_info.extension ) { + if ( format_info.extension && ( mpt::transcode<std::string>( sndfile_encoding, extension ) == format_info.extension ) ) { if ( flags.use_float && ( subformat_info.format == SF_FORMAT_FLOAT || subformat_info.format == SF_FORMAT_DOUBLE ) ) { return matched_result( format, format_info, subformat_info, match_mode ); } else if ( !flags.use_float && ( subformat_info.format & ( subformat_info.format == SF_FORMAT_PCM_16 || subformat_info.format == SF_FORMAT_PCM_24 || subformat_info.format == SF_FORMAT_PCM_32 ) ) ) { @@ -135,7 +135,7 @@ } break; case match_any: - if ( mpt::transcode<std::string>( sndfile_encoding, extension ) == format_info.extension ) { + if ( format_info.extension && ( mpt::transcode<std::string>( sndfile_encoding, extension ) == format_info.extension ) ) { return matched_result( format, format_info, subformat_info, match_mode ); } break; |
|
From: <sv...@op...> - 2025-06-09 16:45:10
|
Author: manx Date: Mon Jun 9 18:44:58 2025 New Revision: 23439 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23439 Log: [Doc] libopenmpt: Update changelog. Modified: branches/OpenMPT-1.32/doc/libopenmpt/changelog.md Modified: branches/OpenMPT-1.32/doc/libopenmpt/changelog.md ============================================================================== --- branches/OpenMPT-1.32/doc/libopenmpt/changelog.md Mon Jun 9 18:42:58 2025 (r23438) +++ branches/OpenMPT-1.32/doc/libopenmpt/changelog.md Mon Jun 9 18:44:58 2025 (r23439) @@ -10,6 +10,8 @@ * [**Bug**] Work-around broken user locale support on Haiku by always assuming UTF8. * [**Bug**] libopenmpt_test did not build from the MSVC source packages. + * [**Bug**] openmpt123: Allow for converting to formats which list the file + extension only in the subformat (i.e. MP3 with libsndfile 1.1.0 or later). * [**Change**] TCB was added to the list of supported file extensions. ModLand and Fujiology use this extension for TCB Tracker modules, instead of the |
|
From: <sv...@op...> - 2025-06-09 16:43:30
|
Author: manx Date: Mon Jun 9 18:42:58 2025 New Revision: 23438 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23438 Log: Merged revision(s) 23436 from trunk/OpenMPT: [Fix] openmpt123: We need to also consider file extensions of subformats. This is necessary because MP3 is a subformat and the major format lists only .m1a as file extension. ........ Modified: branches/OpenMPT-1.32/ (props changed) branches/OpenMPT-1.32/openmpt123/openmpt123_sndfile.hpp Modified: branches/OpenMPT-1.32/openmpt123/openmpt123_sndfile.hpp ============================================================================== --- branches/OpenMPT-1.32/openmpt123/openmpt123_sndfile.hpp Mon Jun 9 18:42:33 2025 (r23437) +++ branches/OpenMPT-1.32/openmpt123/openmpt123_sndfile.hpp Mon Jun 9 18:42:58 2025 (r23438) @@ -106,7 +106,7 @@ switch ( match_mode ) { case match_print: log << MPT_USTRING("sndfile: ") - << mpt::transcode<mpt::ustring>( sndfile_encoding, ( format_info.name ? format_info.name : "" ) ) << MPT_USTRING(" (.") << mpt::transcode<mpt::ustring>( sndfile_encoding, ( format_info.extension ? format_info.extension : "" ) ) << MPT_USTRING(")") + << mpt::transcode<mpt::ustring>( sndfile_encoding, ( format_info.name ? format_info.name : "" ) ) << MPT_USTRING(" (.") << mpt::transcode<mpt::ustring>( sndfile_encoding, ( subformat_info.extension ? subformat_info.extension : format_info.extension ? format_info.extension : "" ) ) << MPT_USTRING(")") << MPT_USTRING(" / ") << mpt::transcode<mpt::ustring>( sndfile_encoding, ( subformat_info.name ? subformat_info.name : "" ) ) << MPT_USTRING(" [") @@ -117,6 +117,14 @@ case match_recurse: break; case match_exact: + if ( subformat_info.extension && ( mpt::transcode<std::string>( sndfile_encoding, extension ) == subformat_info.extension ) ) { + if ( flags.use_float && ( subformat_info.format == SF_FORMAT_FLOAT ) ) { + return matched_result( format, format_info, subformat_info, match_mode ); + } else if ( !flags.use_float && ( subformat_info.format == SF_FORMAT_PCM_16 ) ) { + return matched_result( format, format_info, subformat_info, match_mode ); + } + } + break; if ( format_info.extension && ( mpt::transcode<std::string>( sndfile_encoding, extension ) == format_info.extension ) ) { if ( flags.use_float && ( subformat_info.format == SF_FORMAT_FLOAT ) ) { return matched_result( format, format_info, subformat_info, match_mode ); @@ -126,6 +134,14 @@ } break; case match_better: + if ( subformat_info.extension && ( mpt::transcode<std::string>( sndfile_encoding, extension ) == subformat_info.extension ) ) { + if ( flags.use_float && ( subformat_info.format == SF_FORMAT_FLOAT || subformat_info.format == SF_FORMAT_DOUBLE ) ) { + return matched_result( format, format_info, subformat_info, match_mode ); + } else if ( !flags.use_float && ( subformat_info.format & ( subformat_info.format == SF_FORMAT_PCM_16 || subformat_info.format == SF_FORMAT_PCM_24 || subformat_info.format == SF_FORMAT_PCM_32 ) ) ) { + return matched_result( format, format_info, subformat_info, match_mode ); + } + } + break; if ( format_info.extension && ( mpt::transcode<std::string>( sndfile_encoding, extension ) == format_info.extension ) ) { if ( flags.use_float && ( subformat_info.format == SF_FORMAT_FLOAT || subformat_info.format == SF_FORMAT_DOUBLE ) ) { return matched_result( format, format_info, subformat_info, match_mode ); @@ -135,6 +151,9 @@ } break; case match_any: + if ( subformat_info.extension && ( mpt::transcode<std::string>( sndfile_encoding, extension ) == subformat_info.extension ) ) { + return matched_result( format, format_info, subformat_info, match_mode ); + } if ( format_info.extension && ( mpt::transcode<std::string>( sndfile_encoding, extension ) == format_info.extension ) ) { return matched_result( format, format_info, subformat_info, match_mode ); } |
|
From: <sv...@op...> - 2025-06-09 16:42:40
|
Author: manx Date: Mon Jun 9 18:42:33 2025 New Revision: 23437 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23437 Log: Merged revision(s) 23435 from trunk/OpenMPT: [Fix] openmpt123: Guard against libsndfile returning nullptr as file extension when matching the file format. ........ Modified: branches/OpenMPT-1.32/ (props changed) branches/OpenMPT-1.32/openmpt123/openmpt123_sndfile.hpp Modified: branches/OpenMPT-1.32/openmpt123/openmpt123_sndfile.hpp ============================================================================== --- branches/OpenMPT-1.32/openmpt123/openmpt123_sndfile.hpp Mon Jun 9 18:42:04 2025 (r23436) +++ branches/OpenMPT-1.32/openmpt123/openmpt123_sndfile.hpp Mon Jun 9 18:42:33 2025 (r23437) @@ -117,7 +117,7 @@ case match_recurse: break; case match_exact: - if ( mpt::transcode<std::string>( sndfile_encoding, extension ) == format_info.extension ) { + if ( format_info.extension && ( mpt::transcode<std::string>( sndfile_encoding, extension ) == format_info.extension ) ) { if ( flags.use_float && ( subformat_info.format == SF_FORMAT_FLOAT ) ) { return matched_result( format, format_info, subformat_info, match_mode ); } else if ( !flags.use_float && ( subformat_info.format == SF_FORMAT_PCM_16 ) ) { @@ -126,7 +126,7 @@ } break; case match_better: - if ( mpt::transcode<std::string>( sndfile_encoding, extension ) == format_info.extension ) { + if ( format_info.extension && ( mpt::transcode<std::string>( sndfile_encoding, extension ) == format_info.extension ) ) { if ( flags.use_float && ( subformat_info.format == SF_FORMAT_FLOAT || subformat_info.format == SF_FORMAT_DOUBLE ) ) { return matched_result( format, format_info, subformat_info, match_mode ); } else if ( !flags.use_float && ( subformat_info.format & ( subformat_info.format == SF_FORMAT_PCM_16 || subformat_info.format == SF_FORMAT_PCM_24 || subformat_info.format == SF_FORMAT_PCM_32 ) ) ) { @@ -135,7 +135,7 @@ } break; case match_any: - if ( mpt::transcode<std::string>( sndfile_encoding, extension ) == format_info.extension ) { + if ( format_info.extension && ( mpt::transcode<std::string>( sndfile_encoding, extension ) == format_info.extension ) ) { return matched_result( format, format_info, subformat_info, match_mode ); } break; |
|
From: <sv...@op...> - 2025-06-09 16:42:16
|
Author: manx Date: Mon Jun 9 18:42:04 2025 New Revision: 23436 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23436 Log: [Fix] openmpt123: We need to also consider file extensions of subformats. This is necessary because MP3 is a subformat and the major format lists only .m1a as file extension. Modified: trunk/OpenMPT/openmpt123/openmpt123_sndfile.hpp Modified: trunk/OpenMPT/openmpt123/openmpt123_sndfile.hpp ============================================================================== --- trunk/OpenMPT/openmpt123/openmpt123_sndfile.hpp Mon Jun 9 18:37:23 2025 (r23435) +++ trunk/OpenMPT/openmpt123/openmpt123_sndfile.hpp Mon Jun 9 18:42:04 2025 (r23436) @@ -106,7 +106,7 @@ switch ( match_mode ) { case match_print: log << MPT_USTRING("sndfile: ") - << mpt::transcode<mpt::ustring>( sndfile_encoding, ( format_info.name ? format_info.name : "" ) ) << MPT_USTRING(" (.") << mpt::transcode<mpt::ustring>( sndfile_encoding, ( format_info.extension ? format_info.extension : "" ) ) << MPT_USTRING(")") + << mpt::transcode<mpt::ustring>( sndfile_encoding, ( format_info.name ? format_info.name : "" ) ) << MPT_USTRING(" (.") << mpt::transcode<mpt::ustring>( sndfile_encoding, ( subformat_info.extension ? subformat_info.extension : format_info.extension ? format_info.extension : "" ) ) << MPT_USTRING(")") << MPT_USTRING(" / ") << mpt::transcode<mpt::ustring>( sndfile_encoding, ( subformat_info.name ? subformat_info.name : "" ) ) << MPT_USTRING(" [") @@ -117,6 +117,14 @@ case match_recurse: break; case match_exact: + if ( subformat_info.extension && ( mpt::transcode<std::string>( sndfile_encoding, extension ) == subformat_info.extension ) ) { + if ( flags.use_float && ( subformat_info.format == SF_FORMAT_FLOAT ) ) { + return matched_result( format, format_info, subformat_info, match_mode ); + } else if ( !flags.use_float && ( subformat_info.format == SF_FORMAT_PCM_16 ) ) { + return matched_result( format, format_info, subformat_info, match_mode ); + } + } + break; if ( format_info.extension && ( mpt::transcode<std::string>( sndfile_encoding, extension ) == format_info.extension ) ) { if ( flags.use_float && ( subformat_info.format == SF_FORMAT_FLOAT ) ) { return matched_result( format, format_info, subformat_info, match_mode ); @@ -126,6 +134,14 @@ } break; case match_better: + if ( subformat_info.extension && ( mpt::transcode<std::string>( sndfile_encoding, extension ) == subformat_info.extension ) ) { + if ( flags.use_float && ( subformat_info.format == SF_FORMAT_FLOAT || subformat_info.format == SF_FORMAT_DOUBLE ) ) { + return matched_result( format, format_info, subformat_info, match_mode ); + } else if ( !flags.use_float && ( subformat_info.format & ( subformat_info.format == SF_FORMAT_PCM_16 || subformat_info.format == SF_FORMAT_PCM_24 || subformat_info.format == SF_FORMAT_PCM_32 ) ) ) { + return matched_result( format, format_info, subformat_info, match_mode ); + } + } + break; if ( format_info.extension && ( mpt::transcode<std::string>( sndfile_encoding, extension ) == format_info.extension ) ) { if ( flags.use_float && ( subformat_info.format == SF_FORMAT_FLOAT || subformat_info.format == SF_FORMAT_DOUBLE ) ) { return matched_result( format, format_info, subformat_info, match_mode ); @@ -135,6 +151,9 @@ } break; case match_any: + if ( subformat_info.extension && ( mpt::transcode<std::string>( sndfile_encoding, extension ) == subformat_info.extension ) ) { + return matched_result( format, format_info, subformat_info, match_mode ); + } if ( format_info.extension && ( mpt::transcode<std::string>( sndfile_encoding, extension ) == format_info.extension ) ) { return matched_result( format, format_info, subformat_info, match_mode ); } |
|
From: <sv...@op...> - 2025-06-09 16:37:30
|
Author: manx Date: Mon Jun 9 18:37:23 2025 New Revision: 23435 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23435 Log: [Fix] openmpt123: Guard against libsndfile returning nullptr as file extension when matching the file format. Modified: trunk/OpenMPT/openmpt123/openmpt123_sndfile.hpp Modified: trunk/OpenMPT/openmpt123/openmpt123_sndfile.hpp ============================================================================== --- trunk/OpenMPT/openmpt123/openmpt123_sndfile.hpp Mon Jun 9 08:24:14 2025 (r23434) +++ trunk/OpenMPT/openmpt123/openmpt123_sndfile.hpp Mon Jun 9 18:37:23 2025 (r23435) @@ -117,7 +117,7 @@ case match_recurse: break; case match_exact: - if ( mpt::transcode<std::string>( sndfile_encoding, extension ) == format_info.extension ) { + if ( format_info.extension && ( mpt::transcode<std::string>( sndfile_encoding, extension ) == format_info.extension ) ) { if ( flags.use_float && ( subformat_info.format == SF_FORMAT_FLOAT ) ) { return matched_result( format, format_info, subformat_info, match_mode ); } else if ( !flags.use_float && ( subformat_info.format == SF_FORMAT_PCM_16 ) ) { @@ -126,7 +126,7 @@ } break; case match_better: - if ( mpt::transcode<std::string>( sndfile_encoding, extension ) == format_info.extension ) { + if ( format_info.extension && ( mpt::transcode<std::string>( sndfile_encoding, extension ) == format_info.extension ) ) { if ( flags.use_float && ( subformat_info.format == SF_FORMAT_FLOAT || subformat_info.format == SF_FORMAT_DOUBLE ) ) { return matched_result( format, format_info, subformat_info, match_mode ); } else if ( !flags.use_float && ( subformat_info.format & ( subformat_info.format == SF_FORMAT_PCM_16 || subformat_info.format == SF_FORMAT_PCM_24 || subformat_info.format == SF_FORMAT_PCM_32 ) ) ) { @@ -135,7 +135,7 @@ } break; case match_any: - if ( mpt::transcode<std::string>( sndfile_encoding, extension ) == format_info.extension ) { + if ( format_info.extension && ( mpt::transcode<std::string>( sndfile_encoding, extension ) == format_info.extension ) ) { return matched_result( format, format_info, subformat_info, match_mode ); } break; |
Author: manx Date: Mon Jun 9 08:24:14 2025 New Revision: 23434 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23434 Log: [Var] FLAC: Silence false-positive MSVC static analyzer warning. Modified: trunk/OpenMPT/build/premake/ext-flac.lua trunk/OpenMPT/build/vs2017winxp/ext/flac.vcxproj trunk/OpenMPT/build/vs2017winxpansi/ext/flac.vcxproj trunk/OpenMPT/build/vs2019win7/ext/flac.vcxproj trunk/OpenMPT/build/vs2022win10/ext/flac.vcxproj trunk/OpenMPT/build/vs2022win10uwp/ext/flac.vcxproj trunk/OpenMPT/build/vs2022win11/ext/flac.vcxproj trunk/OpenMPT/build/vs2022win11clang/ext/flac.vcxproj trunk/OpenMPT/build/vs2022win11uwp/ext/flac.vcxproj trunk/OpenMPT/build/vs2022win7/ext/flac.vcxproj trunk/OpenMPT/build/vs2022win8/ext/flac.vcxproj trunk/OpenMPT/build/vs2022win81/ext/flac.vcxproj Modified: trunk/OpenMPT/build/premake/ext-flac.lua ============================================================================== --- trunk/OpenMPT/build/premake/ext-flac.lua Mon Jun 9 08:18:18 2025 (r23433) +++ trunk/OpenMPT/build/premake/ext-flac.lua Mon Jun 9 08:24:14 2025 (r23434) @@ -112,7 +112,7 @@ buildoptions { "/wd4101", "/wd4244", "/wd4267", "/wd4334" } filter {} filter { "action:vs*" } - buildoptions { "/wd6001", "/wd6011", "/wd6031", "/wd6297", "/wd6386", "/wd28182" } -- /analyze + buildoptions { "/wd6001", "/wd6011", "/wd6031", "/wd6297", "/wd6386", "/wd26110", "/wd28182" } -- /analyze filter {} defines { "FLAC__HAS_OGG=1" } links { "ogg" } Modified: trunk/OpenMPT/build/vs2017winxp/ext/flac.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/ext/flac.vcxproj Mon Jun 9 08:18:18 2025 (r23433) +++ trunk/OpenMPT/build/vs2017winxp/ext/flac.vcxproj Mon Jun 9 08:24:14 2025 (r23434) @@ -302,7 +302,7 @@ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -321,7 +321,7 @@ <MinimalRebuild>false</MinimalRebuild> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -344,7 +344,7 @@ <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -368,7 +368,7 @@ <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -394,7 +394,7 @@ <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -418,7 +418,7 @@ <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -439,7 +439,7 @@ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -459,7 +459,7 @@ <MinimalRebuild>false</MinimalRebuild> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -483,7 +483,7 @@ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -509,7 +509,7 @@ <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -537,7 +537,7 @@ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -563,7 +563,7 @@ <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> <SubSystem>Windows</SubSystem> Modified: trunk/OpenMPT/build/vs2017winxpansi/ext/flac.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/ext/flac.vcxproj Mon Jun 9 08:18:18 2025 (r23433) +++ trunk/OpenMPT/build/vs2017winxpansi/ext/flac.vcxproj Mon Jun 9 08:24:14 2025 (r23434) @@ -302,7 +302,7 @@ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -321,7 +321,7 @@ <MinimalRebuild>false</MinimalRebuild> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -344,7 +344,7 @@ <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -368,7 +368,7 @@ <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -394,7 +394,7 @@ <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -418,7 +418,7 @@ <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -439,7 +439,7 @@ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -459,7 +459,7 @@ <MinimalRebuild>false</MinimalRebuild> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -483,7 +483,7 @@ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -509,7 +509,7 @@ <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -537,7 +537,7 @@ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -563,7 +563,7 @@ <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> <SubSystem>Windows</SubSystem> Modified: trunk/OpenMPT/build/vs2019win7/ext/flac.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/ext/flac.vcxproj Mon Jun 9 08:18:18 2025 (r23433) +++ trunk/OpenMPT/build/vs2019win7/ext/flac.vcxproj Mon Jun 9 08:24:14 2025 (r23434) @@ -276,7 +276,7 @@ <MinimalRebuild>false</MinimalRebuild> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -299,7 +299,7 @@ <MinimalRebuild>false</MinimalRebuild> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -326,7 +326,7 @@ <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -354,7 +354,7 @@ <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -384,7 +384,7 @@ <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -412,7 +412,7 @@ <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -436,7 +436,7 @@ <MinimalRebuild>false</MinimalRebuild> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -460,7 +460,7 @@ <MinimalRebuild>false</MinimalRebuild> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -488,7 +488,7 @@ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -518,7 +518,7 @@ <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -550,7 +550,7 @@ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -580,7 +580,7 @@ <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> Modified: trunk/OpenMPT/build/vs2022win10/ext/flac.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10/ext/flac.vcxproj Mon Jun 9 08:18:18 2025 (r23433) +++ trunk/OpenMPT/build/vs2022win10/ext/flac.vcxproj Mon Jun 9 08:24:14 2025 (r23434) @@ -538,7 +538,7 @@ <MinimalRebuild>false</MinimalRebuild> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -561,7 +561,7 @@ <MinimalRebuild>false</MinimalRebuild> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -584,7 +584,7 @@ <MinimalRebuild>false</MinimalRebuild> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -606,7 +606,7 @@ <MinimalRebuild>false</MinimalRebuild> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -632,7 +632,7 @@ <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -660,7 +660,7 @@ <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -688,7 +688,7 @@ <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -716,7 +716,7 @@ <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -746,7 +746,7 @@ <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -774,7 +774,7 @@ <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -802,7 +802,7 @@ <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -830,7 +830,7 @@ <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -854,7 +854,7 @@ <MinimalRebuild>false</MinimalRebuild> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -878,7 +878,7 @@ <MinimalRebuild>false</MinimalRebuild> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -902,7 +902,7 @@ <MinimalRebuild>false</MinimalRebuild> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -926,7 +926,7 @@ <MinimalRebuild>false</MinimalRebuild> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -954,7 +954,7 @@ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -984,7 +984,7 @@ <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -1014,7 +1014,7 @@ <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -1044,7 +1044,7 @@ <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -1076,7 +1076,7 @@ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -1106,7 +1106,7 @@ <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -1136,7 +1136,7 @@ <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -1166,7 +1166,7 @@ <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> Modified: trunk/OpenMPT/build/vs2022win10uwp/ext/flac.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10uwp/ext/flac.vcxproj Mon Jun 9 08:18:18 2025 (r23433) +++ trunk/OpenMPT/build/vs2022win10uwp/ext/flac.vcxproj Mon Jun 9 08:24:14 2025 (r23434) @@ -544,7 +544,7 @@ <MinimalRebuild>false</MinimalRebuild> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -569,7 +569,7 @@ <MinimalRebuild>false</MinimalRebuild> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -594,7 +594,7 @@ <MinimalRebuild>false</MinimalRebuild> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -618,7 +618,7 @@ <MinimalRebuild>false</MinimalRebuild> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -646,7 +646,7 @@ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -676,7 +676,7 @@ <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -706,7 +706,7 @@ <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -736,7 +736,7 @@ <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -768,7 +768,7 @@ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -798,7 +798,7 @@ <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -828,7 +828,7 @@ <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -858,7 +858,7 @@ <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -884,7 +884,7 @@ <MinimalRebuild>false</MinimalRebuild> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -910,7 +910,7 @@ <MinimalRebuild>false</MinimalRebuild> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -936,7 +936,7 @@ <MinimalRebuild>false</MinimalRebuild> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -962,7 +962,7 @@ <MinimalRebuild>false</MinimalRebuild> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -992,7 +992,7 @@ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -1024,7 +1024,7 @@ <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -1056,7 +1056,7 @@ <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -1088,7 +1088,7 @@ <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -1122,7 +1122,7 @@ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -1154,7 +1154,7 @@ <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -1186,7 +1186,7 @@ <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -1218,7 +1218,7 @@ <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Gw /Zc:checkGwOdr /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> Modified: trunk/OpenMPT/build/vs2022win11/ext/flac.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win11/ext/flac.vcxproj Mon Jun 9 08:18:18 2025 (r23433) +++ trunk/OpenMPT/build/vs2022win11/ext/flac.vcxproj Mon Jun 9 08:24:14 2025 (r23434) @@ -538,7 +538,7 @@ <MinimalRebuild>false</MinimalRebuild> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> <ExternalWarningLevel>Level3</ExternalWarningLevel> @@ -561,7 +561,7 @@ <MinimalRebuild>false</MinimalRebuild> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/arch:SSE4.2 /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/arch:SSE4.2 /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions> <LanguageStandard_C>stdc17</LanguageStandard_C> <ConformanceMode>true</ConformanceMode> ... [truncated message content] |
|
From: <sv...@op...> - 2025-06-09 06:18:25
|
Author: manx Date: Mon Jun 9 08:18:18 2025 New Revision: 23433 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23433 Log: [Fix] build: Fix Windows 11 Clang builds. Modified: trunk/OpenMPT/build/auto/setup_arguments.cmd Modified: trunk/OpenMPT/build/auto/setup_arguments.cmd ============================================================================== --- trunk/OpenMPT/build/auto/setup_arguments.cmd Sat Jun 7 22:00:50 2025 (r23432) +++ trunk/OpenMPT/build/auto/setup_arguments.cmd Mon Jun 9 08:18:18 2025 (r23433) @@ -33,7 +33,7 @@ if "%MPT_VS_TARGET%" == "win10" set MPT_VS_WITHTARGET=%MPT_VS_VER%win10 if "%MPT_VS_TARGET%" == "win11" set MPT_VS_WITHTARGET=%MPT_VS_VER%win11 if "%MPT_VS_TARGET%" == "default" set MPT_VS_WITHTARGET=%MPT_VS_VER%win11 -if "%MPT_VS_TARGET%" == "win10clang" set MPT_VS_WITHTARGET=%MPT_VS_VER%win10clang +if "%MPT_VS_TARGET%" == "win11clang" set MPT_VS_WITHTARGET=%MPT_VS_VER%win11clang if "%MPT_VS_ARCH%" == "Win32" ( @@ -46,7 +46,7 @@ if "%MPT_VS_TARGET%" == "win10" set MPT_BIN_TARGET=win10 if "%MPT_VS_TARGET%" == "win11" set MPT_BIN_TARGET=win11 if "%MPT_VS_TARGET%" == "default" set MPT_BIN_TARGET=win11 - if "%MPT_VS_TARGET%" == "win10clang" set MPT_BIN_TARGET=win10clang + if "%MPT_VS_TARGET%" == "win11clang" set MPT_BIN_TARGET=win11clang ) if "%MPT_VS_ARCH%" == "x64" ( if "%MPT_VS_TARGET%" == "winxpansi" set MPT_BIN_TARGET=winxpansi @@ -58,7 +58,7 @@ if "%MPT_VS_TARGET%" == "win10" set MPT_BIN_TARGET=win10 if "%MPT_VS_TARGET%" == "win11" set MPT_BIN_TARGET=win11 if "%MPT_VS_TARGET%" == "default" set MPT_BIN_TARGET=win11 - if "%MPT_VS_TARGET%" == "win10clang" set MPT_BIN_TARGET=win10clang + if "%MPT_VS_TARGET%" == "win11clang" set MPT_BIN_TARGET=win11clang ) if "%MPT_VS_ARCH%" == "ARM" ( if "%MPT_VS_TARGET%" == "winxpansi" set MPT_BIN_TARGET=winxpansi @@ -70,7 +70,7 @@ if "%MPT_VS_TARGET%" == "win10" set MPT_BIN_TARGET=win10 if "%MPT_VS_TARGET%" == "win11" set MPT_BIN_TARGET=win11 if "%MPT_VS_TARGET%" == "default" set MPT_BIN_TARGET=win11 - if "%MPT_VS_TARGET%" == "win10clang" set MPT_BIN_TARGET=win10clang + if "%MPT_VS_TARGET%" == "win11clang" set MPT_BIN_TARGET=win11clang ) if "%MPT_VS_ARCH%" == "ARM64" ( if "%MPT_VS_TARGET%" == "winxpansi" set MPT_BIN_TARGET=winxpansi @@ -82,7 +82,7 @@ if "%MPT_VS_TARGET%" == "win10" set MPT_BIN_TARGET=win10 if "%MPT_VS_TARGET%" == "win11" set MPT_BIN_TARGET=win11 if "%MPT_VS_TARGET%" == "default" set MPT_BIN_TARGET=win11 - if "%MPT_VS_TARGET%" == "win10clang" set MPT_BIN_TARGET=win10clang + if "%MPT_VS_TARGET%" == "win11clang" set MPT_BIN_TARGET=win11clang ) if "%MPT_VS_ARCH%" == "ARM64EC" ( if "%MPT_VS_TARGET%" == "winxpansi" set MPT_BIN_TARGET=winxpansi @@ -94,7 +94,7 @@ if "%MPT_VS_TARGET%" == "win10" set MPT_BIN_TARGET=win10 if "%MPT_VS_TARGET%" == "win11" set MPT_BIN_TARGET=win11 if "%MPT_VS_TARGET%" == "default" set MPT_BIN_TARGET=win11 - if "%MPT_VS_TARGET%" == "win10clang" set MPT_BIN_TARGET=win10clang + if "%MPT_VS_TARGET%" == "win11clang" set MPT_BIN_TARGET=win11clang ) if "%MPT_VS_TARGET%" == "winxpansi" set MPT_BIN_TARGET32=winxpansi @@ -106,7 +106,7 @@ if "%MPT_VS_TARGET%" == "win10" set MPT_BIN_TARGET32=win10 if "%MPT_VS_TARGET%" == "win11" set MPT_BIN_TARGET32=win11 if "%MPT_VS_TARGET%" == "default" set MPT_BIN_TARGET32=win11 -if "%MPT_VS_TARGET%" == "win10clang" set MPT_BIN_TARGET32=win10clang +if "%MPT_VS_TARGET%" == "win11clang" set MPT_BIN_TARGET32=win11clang if "%MPT_VS_TARGET%" == "winxpansi" set MPT_BIN_TARGET64=winxpansi if "%MPT_VS_TARGET%" == "winxp" set MPT_BIN_TARGET64=winxp @@ -117,7 +117,7 @@ if "%MPT_VS_TARGET%" == "win10" set MPT_BIN_TARGET64=win10 if "%MPT_VS_TARGET%" == "win11" set MPT_BIN_TARGET64=win11 if "%MPT_VS_TARGET%" == "default" set MPT_BIN_TARGET64=win11 -if "%MPT_VS_TARGET%" == "win10clang" set MPT_BIN_TARGET64=win10clang +if "%MPT_VS_TARGET%" == "win11clang" set MPT_BIN_TARGET64=win11clang if "%MPT_VS_ARCH%" == "Win32" set MPT_BIN_ARCH_TRK=x86 if "%MPT_VS_ARCH%" == "x64" set MPT_BIN_ARCH_TRK=amd64 @@ -153,7 +153,7 @@ if "%MPT_VS_TARGET%" == "win10" set MPT_DIST_VARIANT_OS=win10 if "%MPT_VS_TARGET%" == "win11" set MPT_DIST_VARIANT_OS=win11 if "%MPT_VS_TARGET%" == "default" set MPT_DIST_VARIANT_OS=win11 -if "%MPT_VS_TARGET%" == "win10clang" set MPT_DIST_VARIANT_OS=win10clang +if "%MPT_VS_TARGET%" == "win11clang" set MPT_DIST_VARIANT_OS=win11clang set MPT_DIST_VARIANT=%MPT_DIST_VARIANT_OS%-%MPT_DIST_VARIANT_ARCH% @@ -167,7 +167,7 @@ if "%MPT_VS_TARGET%" == "win10" set MPT_DIST_VARIANT_PREFIX=win10 if "%MPT_VS_TARGET%" == "win11" set MPT_DIST_VARIANT_PREFIX=win11 if "%MPT_VS_TARGET%" == "default" set MPT_DIST_VARIANT_PREFIX= -if "%MPT_VS_TARGET%" == "win10clang" set MPT_DIST_VARIANT_PREFIX=win10clang +if "%MPT_VS_TARGET%" == "win11clang" set MPT_DIST_VARIANT_PREFIX=win11clang if "%MPT_VS_ARCH%" == "Win32" set MPT_DIST_VARIANT_SUFFIX=x86 if "%MPT_VS_ARCH%" == "x64" set MPT_DIST_VARIANT_SUFFIX=amd64 |
|
From: <sv...@op...> - 2025-06-07 20:01:02
|
Author: manx Date: Sat Jun 7 22:00:50 2025 New Revision: 23432 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23432 Log: Merged revision(s) 23427 from trunk/OpenMPT: [Fix] mpg123: Exclude unneeded and broken strtok work-arounds. ........ Modified: branches/OpenMPT-1.28/ (props changed) branches/OpenMPT-1.28/include/mpg123/src/compat/compat.h Modified: branches/OpenMPT-1.28/include/mpg123/src/compat/compat.h ============================================================================== --- branches/OpenMPT-1.28/include/mpg123/src/compat/compat.h Sat Jun 7 22:00:31 2025 (r23431) +++ branches/OpenMPT-1.28/include/mpg123/src/compat/compat.h Sat Jun 7 22:00:50 2025 (r23432) @@ -116,14 +116,16 @@ #ifdef HAVE_STRTOK_R #define INT123_compat_strtok(a, b, c) strtok_r((a), (b), (c)) #endif +#endif /* OpenMPT */ #if (defined(_UCRT) || defined(_MSC_VER) || (defined(__MINGW32__) || defined(__MINGW64__)) || (defined(__WATCOMC__) && defined(__NT__))) && !defined(__CYGWIN__) #define MPG123_COMPAT_MSVCRT_IO +#ifndef NO_STRTOK /* OpenMPT */ #ifndef INT123_compat_strtok #define INT123_compat_strtok(a, b, c) strtok_s((a), (b), (c)) #endif -#endif #endif /* OpenMPT */ +#endif #if defined(MPG123_COMPAT_MSVCRT_IO) #if defined(_UCRT) |
|
From: <sv...@op...> - 2025-06-07 20:00:38
|
Author: manx Date: Sat Jun 7 22:00:31 2025 New Revision: 23431 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23431 Log: Merged revision(s) 23427 from trunk/OpenMPT: [Fix] mpg123: Exclude unneeded and broken strtok work-arounds. ........ Modified: branches/OpenMPT-1.29/ (props changed) branches/OpenMPT-1.29/include/mpg123/src/compat/compat.h Modified: branches/OpenMPT-1.29/include/mpg123/src/compat/compat.h ============================================================================== --- branches/OpenMPT-1.29/include/mpg123/src/compat/compat.h Sat Jun 7 22:00:12 2025 (r23430) +++ branches/OpenMPT-1.29/include/mpg123/src/compat/compat.h Sat Jun 7 22:00:31 2025 (r23431) @@ -116,14 +116,16 @@ #ifdef HAVE_STRTOK_R #define INT123_compat_strtok(a, b, c) strtok_r((a), (b), (c)) #endif +#endif /* OpenMPT */ #if (defined(_UCRT) || defined(_MSC_VER) || (defined(__MINGW32__) || defined(__MINGW64__)) || (defined(__WATCOMC__) && defined(__NT__))) && !defined(__CYGWIN__) #define MPG123_COMPAT_MSVCRT_IO +#ifndef NO_STRTOK /* OpenMPT */ #ifndef INT123_compat_strtok #define INT123_compat_strtok(a, b, c) strtok_s((a), (b), (c)) #endif -#endif #endif /* OpenMPT */ +#endif #if defined(MPG123_COMPAT_MSVCRT_IO) #if defined(_UCRT) |
|
From: <sv...@op...> - 2025-06-07 20:00:24
|
Author: manx Date: Sat Jun 7 22:00:12 2025 New Revision: 23430 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23430 Log: Merged revision(s) 23427 from trunk/OpenMPT: [Fix] mpg123: Exclude unneeded and broken strtok work-arounds. ........ Modified: branches/OpenMPT-1.30/ (props changed) branches/OpenMPT-1.30/include/mpg123/src/compat/compat.h Modified: branches/OpenMPT-1.30/include/mpg123/src/compat/compat.h ============================================================================== --- branches/OpenMPT-1.30/include/mpg123/src/compat/compat.h Sat Jun 7 21:59:53 2025 (r23429) +++ branches/OpenMPT-1.30/include/mpg123/src/compat/compat.h Sat Jun 7 22:00:12 2025 (r23430) @@ -116,14 +116,16 @@ #ifdef HAVE_STRTOK_R #define INT123_compat_strtok(a, b, c) strtok_r((a), (b), (c)) #endif +#endif /* OpenMPT */ #if (defined(_UCRT) || defined(_MSC_VER) || (defined(__MINGW32__) || defined(__MINGW64__)) || (defined(__WATCOMC__) && defined(__NT__))) && !defined(__CYGWIN__) #define MPG123_COMPAT_MSVCRT_IO +#ifndef NO_STRTOK /* OpenMPT */ #ifndef INT123_compat_strtok #define INT123_compat_strtok(a, b, c) strtok_s((a), (b), (c)) #endif -#endif #endif /* OpenMPT */ +#endif #if defined(MPG123_COMPAT_MSVCRT_IO) #if defined(_UCRT) |
|
From: <sv...@op...> - 2025-06-07 20:00:05
|
Author: manx Date: Sat Jun 7 21:59:53 2025 New Revision: 23429 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23429 Log: Merged revision(s) 23427 from trunk/OpenMPT: [Fix] mpg123: Exclude unneeded and broken strtok work-arounds. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/include/mpg123/src/compat/compat.h Modified: branches/OpenMPT-1.31/include/mpg123/src/compat/compat.h ============================================================================== --- branches/OpenMPT-1.31/include/mpg123/src/compat/compat.h Sat Jun 7 21:59:33 2025 (r23428) +++ branches/OpenMPT-1.31/include/mpg123/src/compat/compat.h Sat Jun 7 21:59:53 2025 (r23429) @@ -116,14 +116,16 @@ #ifdef HAVE_STRTOK_R #define INT123_compat_strtok(a, b, c) strtok_r((a), (b), (c)) #endif +#endif /* OpenMPT */ #if (defined(_UCRT) || defined(_MSC_VER) || (defined(__MINGW32__) || defined(__MINGW64__)) || (defined(__WATCOMC__) && defined(__NT__))) && !defined(__CYGWIN__) #define MPG123_COMPAT_MSVCRT_IO +#ifndef NO_STRTOK /* OpenMPT */ #ifndef INT123_compat_strtok #define INT123_compat_strtok(a, b, c) strtok_s((a), (b), (c)) #endif -#endif #endif /* OpenMPT */ +#endif #if defined(MPG123_COMPAT_MSVCRT_IO) #if defined(_UCRT) |
|
From: <sv...@op...> - 2025-06-07 19:59:40
|
Author: manx Date: Sat Jun 7 21:59:33 2025 New Revision: 23428 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23428 Log: Merged revision(s) 23427 from trunk/OpenMPT: [Fix] mpg123: Exclude unneeded and broken strtok work-arounds. ........ Modified: branches/OpenMPT-1.32/ (props changed) branches/OpenMPT-1.32/include/mpg123/src/compat/compat.h Modified: branches/OpenMPT-1.32/include/mpg123/src/compat/compat.h ============================================================================== --- branches/OpenMPT-1.32/include/mpg123/src/compat/compat.h Sat Jun 7 21:59:02 2025 (r23427) +++ branches/OpenMPT-1.32/include/mpg123/src/compat/compat.h Sat Jun 7 21:59:33 2025 (r23428) @@ -116,14 +116,16 @@ #ifdef HAVE_STRTOK_R #define INT123_compat_strtok(a, b, c) strtok_r((a), (b), (c)) #endif +#endif /* OpenMPT */ #if (defined(_UCRT) || defined(_MSC_VER) || (defined(__MINGW32__) || defined(__MINGW64__)) || (defined(__WATCOMC__) && defined(__NT__))) && !defined(__CYGWIN__) #define MPG123_COMPAT_MSVCRT_IO +#ifndef NO_STRTOK /* OpenMPT */ #ifndef INT123_compat_strtok #define INT123_compat_strtok(a, b, c) strtok_s((a), (b), (c)) #endif -#endif #endif /* OpenMPT */ +#endif #if defined(MPG123_COMPAT_MSVCRT_IO) #if defined(_UCRT) |
|
From: <sv...@op...> - 2025-06-07 19:59:09
|
Author: manx Date: Sat Jun 7 21:59:02 2025 New Revision: 23427 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23427 Log: [Fix] mpg123: Exclude unneeded and broken strtok work-arounds. Modified: trunk/OpenMPT/include/mpg123/src/compat/compat.h Modified: trunk/OpenMPT/include/mpg123/src/compat/compat.h ============================================================================== --- trunk/OpenMPT/include/mpg123/src/compat/compat.h Sat Jun 7 21:55:23 2025 (r23426) +++ trunk/OpenMPT/include/mpg123/src/compat/compat.h Sat Jun 7 21:59:02 2025 (r23427) @@ -116,14 +116,16 @@ #ifdef HAVE_STRTOK_R #define INT123_compat_strtok(a, b, c) strtok_r((a), (b), (c)) #endif +#endif /* OpenMPT */ #if (defined(_UCRT) || defined(_MSC_VER) || (defined(__MINGW32__) || defined(__MINGW64__)) || (defined(__WATCOMC__) && defined(__NT__))) && !defined(__CYGWIN__) #define MPG123_COMPAT_MSVCRT_IO +#ifndef NO_STRTOK /* OpenMPT */ #ifndef INT123_compat_strtok #define INT123_compat_strtok(a, b, c) strtok_s((a), (b), (c)) #endif -#endif #endif /* OpenMPT */ +#endif #if defined(MPG123_COMPAT_MSVCRT_IO) #if defined(_UCRT) |
|
From: <sv...@op...> - 2025-06-07 19:55:34
|
Author: manx Date: Sat Jun 7 21:55:23 2025 New Revision: 23426 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23426 Log: Merged revision(s) 23421 from trunk/OpenMPT: [Fix] mpg123: Exclude unneeded and broken strtok work-arounds. ........ Modified: branches/OpenMPT-1.28/ (props changed) branches/OpenMPT-1.28/include/mpg123/OpenMPT.txt branches/OpenMPT-1.28/include/mpg123/ports/generic/config.h branches/OpenMPT-1.28/include/mpg123/src/compat/compat.h Modified: branches/OpenMPT-1.28/include/mpg123/OpenMPT.txt ============================================================================== --- branches/OpenMPT-1.28/include/mpg123/OpenMPT.txt Sat Jun 7 21:55:04 2025 (r23425) +++ branches/OpenMPT-1.28/include/mpg123/OpenMPT.txt Sat Jun 7 21:55:23 2025 (r23426) @@ -3,7 +3,7 @@ * `ports/generic/config.h` has been added for build system independent builds. * `src/compat/compat.c` has been modified to silence MSVC static analyzer warnings. - * `src/compat/compat.c` and `src/compat/compat.c` have been modified to + * `src/compat/compat.c` and `src/compat/compat.h` have been modified to exclude unneeded functionality. * Modifications are marked by `// OpenMPT` or `/* OpenMPT */`. * Obviously, unnecessary folders and files have been removed. Modified: branches/OpenMPT-1.28/include/mpg123/ports/generic/config.h ============================================================================== --- branches/OpenMPT-1.28/include/mpg123/ports/generic/config.h Sat Jun 7 21:55:04 2025 (r23425) +++ branches/OpenMPT-1.28/include/mpg123/ports/generic/config.h Sat Jun 7 21:55:23 2025 (r23426) @@ -99,6 +99,9 @@ /* libmpg123 does not care about file mode */ #define NO_FILEMODE +/* libmpg123 does not care about strtok */ +#define NO_STRTOK + /* We want some frame index, eh? */ #define FRAME_INDEX 1 #define INDEX_SIZE 1000 Modified: branches/OpenMPT-1.28/include/mpg123/src/compat/compat.h ============================================================================== --- branches/OpenMPT-1.28/include/mpg123/src/compat/compat.h Sat Jun 7 21:55:04 2025 (r23425) +++ branches/OpenMPT-1.28/include/mpg123/src/compat/compat.h Sat Jun 7 21:55:23 2025 (r23426) @@ -110,6 +110,7 @@ typedef unsigned char byte; +#ifndef NO_STRTOK /* OpenMPT */ // Annoying hackery to select a safe strtok variant. MS decided to call their strtok_r strtok_s, while // C11 declares another strtok_s with different prototype. Thanks to you all. #ifdef HAVE_STRTOK_R @@ -122,6 +123,7 @@ #define INT123_compat_strtok(a, b, c) strtok_s((a), (b), (c)) #endif #endif +#endif /* OpenMPT */ #if defined(MPG123_COMPAT_MSVCRT_IO) #if defined(_UCRT) @@ -159,10 +161,12 @@ #include <io.h> #endif +#ifndef NO_STRTOK /* OpenMPT */ #ifndef INT123_compat_strtok #warning "no safe strtok found" #define INT123_compat_strtok(a, b, c) strtok((a), (b)) #endif +#endif /* OpenMPT */ /* A safe realloc also for very old systems where realloc(NULL, size) returns NULL. */ void *INT123_safe_realloc(void *ptr, size_t size); |
|
From: <sv...@op...> - 2025-06-07 19:55:16
|
Author: manx Date: Sat Jun 7 21:55:04 2025 New Revision: 23425 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23425 Log: Merged revision(s) 23421 from trunk/OpenMPT: [Fix] mpg123: Exclude unneeded and broken strtok work-arounds. ........ Modified: branches/OpenMPT-1.29/ (props changed) branches/OpenMPT-1.29/include/mpg123/OpenMPT.txt branches/OpenMPT-1.29/include/mpg123/ports/generic/config.h branches/OpenMPT-1.29/include/mpg123/src/compat/compat.h Modified: branches/OpenMPT-1.29/include/mpg123/OpenMPT.txt ============================================================================== --- branches/OpenMPT-1.29/include/mpg123/OpenMPT.txt Sat Jun 7 21:54:44 2025 (r23424) +++ branches/OpenMPT-1.29/include/mpg123/OpenMPT.txt Sat Jun 7 21:55:04 2025 (r23425) @@ -3,7 +3,7 @@ * `ports/generic/config.h` has been added for build system independent builds. * `src/compat/compat.c` has been modified to silence MSVC static analyzer warnings. - * `src/compat/compat.c` and `src/compat/compat.c` have been modified to + * `src/compat/compat.c` and `src/compat/compat.h` have been modified to exclude unneeded functionality. * Modifications are marked by `// OpenMPT` or `/* OpenMPT */`. * Obviously, unnecessary folders and files have been removed. Modified: branches/OpenMPT-1.29/include/mpg123/ports/generic/config.h ============================================================================== --- branches/OpenMPT-1.29/include/mpg123/ports/generic/config.h Sat Jun 7 21:54:44 2025 (r23424) +++ branches/OpenMPT-1.29/include/mpg123/ports/generic/config.h Sat Jun 7 21:55:04 2025 (r23425) @@ -99,6 +99,9 @@ /* libmpg123 does not care about file mode */ #define NO_FILEMODE +/* libmpg123 does not care about strtok */ +#define NO_STRTOK + /* We want some frame index, eh? */ #define FRAME_INDEX 1 #define INDEX_SIZE 1000 Modified: branches/OpenMPT-1.29/include/mpg123/src/compat/compat.h ============================================================================== --- branches/OpenMPT-1.29/include/mpg123/src/compat/compat.h Sat Jun 7 21:54:44 2025 (r23424) +++ branches/OpenMPT-1.29/include/mpg123/src/compat/compat.h Sat Jun 7 21:55:04 2025 (r23425) @@ -110,6 +110,7 @@ typedef unsigned char byte; +#ifndef NO_STRTOK /* OpenMPT */ // Annoying hackery to select a safe strtok variant. MS decided to call their strtok_r strtok_s, while // C11 declares another strtok_s with different prototype. Thanks to you all. #ifdef HAVE_STRTOK_R @@ -122,6 +123,7 @@ #define INT123_compat_strtok(a, b, c) strtok_s((a), (b), (c)) #endif #endif +#endif /* OpenMPT */ #if defined(MPG123_COMPAT_MSVCRT_IO) #if defined(_UCRT) @@ -159,10 +161,12 @@ #include <io.h> #endif +#ifndef NO_STRTOK /* OpenMPT */ #ifndef INT123_compat_strtok #warning "no safe strtok found" #define INT123_compat_strtok(a, b, c) strtok((a), (b)) #endif +#endif /* OpenMPT */ /* A safe realloc also for very old systems where realloc(NULL, size) returns NULL. */ void *INT123_safe_realloc(void *ptr, size_t size); |
|
From: <sv...@op...> - 2025-06-07 19:54:50
|
Author: manx Date: Sat Jun 7 21:54:44 2025 New Revision: 23424 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23424 Log: Merged revision(s) 23421 from trunk/OpenMPT: [Fix] mpg123: Exclude unneeded and broken strtok work-arounds. ........ Modified: branches/OpenMPT-1.30/ (props changed) branches/OpenMPT-1.30/include/mpg123/OpenMPT.txt branches/OpenMPT-1.30/include/mpg123/ports/generic/config.h branches/OpenMPT-1.30/include/mpg123/src/compat/compat.h Modified: branches/OpenMPT-1.30/include/mpg123/OpenMPT.txt ============================================================================== --- branches/OpenMPT-1.30/include/mpg123/OpenMPT.txt Sat Jun 7 21:54:25 2025 (r23423) +++ branches/OpenMPT-1.30/include/mpg123/OpenMPT.txt Sat Jun 7 21:54:44 2025 (r23424) @@ -3,7 +3,7 @@ * `ports/generic/config.h` has been added for build system independent builds. * `src/compat/compat.c` has been modified to silence MSVC static analyzer warnings. - * `src/compat/compat.c` and `src/compat/compat.c` have been modified to + * `src/compat/compat.c` and `src/compat/compat.h` have been modified to exclude unneeded functionality. * Modifications are marked by `// OpenMPT` or `/* OpenMPT */`. * Obviously, unnecessary folders and files have been removed. Modified: branches/OpenMPT-1.30/include/mpg123/ports/generic/config.h ============================================================================== --- branches/OpenMPT-1.30/include/mpg123/ports/generic/config.h Sat Jun 7 21:54:25 2025 (r23423) +++ branches/OpenMPT-1.30/include/mpg123/ports/generic/config.h Sat Jun 7 21:54:44 2025 (r23424) @@ -99,6 +99,9 @@ /* libmpg123 does not care about file mode */ #define NO_FILEMODE +/* libmpg123 does not care about strtok */ +#define NO_STRTOK + /* We want some frame index, eh? */ #define FRAME_INDEX 1 #define INDEX_SIZE 1000 Modified: branches/OpenMPT-1.30/include/mpg123/src/compat/compat.h ============================================================================== --- branches/OpenMPT-1.30/include/mpg123/src/compat/compat.h Sat Jun 7 21:54:25 2025 (r23423) +++ branches/OpenMPT-1.30/include/mpg123/src/compat/compat.h Sat Jun 7 21:54:44 2025 (r23424) @@ -110,6 +110,7 @@ typedef unsigned char byte; +#ifndef NO_STRTOK /* OpenMPT */ // Annoying hackery to select a safe strtok variant. MS decided to call their strtok_r strtok_s, while // C11 declares another strtok_s with different prototype. Thanks to you all. #ifdef HAVE_STRTOK_R @@ -122,6 +123,7 @@ #define INT123_compat_strtok(a, b, c) strtok_s((a), (b), (c)) #endif #endif +#endif /* OpenMPT */ #if defined(MPG123_COMPAT_MSVCRT_IO) #if defined(_UCRT) @@ -159,10 +161,12 @@ #include <io.h> #endif +#ifndef NO_STRTOK /* OpenMPT */ #ifndef INT123_compat_strtok #warning "no safe strtok found" #define INT123_compat_strtok(a, b, c) strtok((a), (b)) #endif +#endif /* OpenMPT */ /* A safe realloc also for very old systems where realloc(NULL, size) returns NULL. */ void *INT123_safe_realloc(void *ptr, size_t size); |
|
From: <sv...@op...> - 2025-06-07 19:54:37
|
Author: manx Date: Sat Jun 7 21:54:25 2025 New Revision: 23423 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23423 Log: Merged revision(s) 23421 from trunk/OpenMPT: [Fix] mpg123: Exclude unneeded and broken strtok work-arounds. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/include/mpg123/OpenMPT.txt branches/OpenMPT-1.31/include/mpg123/ports/generic/config.h branches/OpenMPT-1.31/include/mpg123/src/compat/compat.h Modified: branches/OpenMPT-1.31/include/mpg123/OpenMPT.txt ============================================================================== --- branches/OpenMPT-1.31/include/mpg123/OpenMPT.txt Sat Jun 7 21:54:07 2025 (r23422) +++ branches/OpenMPT-1.31/include/mpg123/OpenMPT.txt Sat Jun 7 21:54:25 2025 (r23423) @@ -3,7 +3,7 @@ * `ports/generic/config.h` has been added for build system independent builds. * `src/compat/compat.c` has been modified to silence MSVC static analyzer warnings. - * `src/compat/compat.c` and `src/compat/compat.c` have been modified to + * `src/compat/compat.c` and `src/compat/compat.h` have been modified to exclude unneeded functionality. * Modifications are marked by `// OpenMPT` or `/* OpenMPT */`. * Obviously, unnecessary folders and files have been removed. Modified: branches/OpenMPT-1.31/include/mpg123/ports/generic/config.h ============================================================================== --- branches/OpenMPT-1.31/include/mpg123/ports/generic/config.h Sat Jun 7 21:54:07 2025 (r23422) +++ branches/OpenMPT-1.31/include/mpg123/ports/generic/config.h Sat Jun 7 21:54:25 2025 (r23423) @@ -99,6 +99,9 @@ /* libmpg123 does not care about file mode */ #define NO_FILEMODE +/* libmpg123 does not care about strtok */ +#define NO_STRTOK + /* We want some frame index, eh? */ #define FRAME_INDEX 1 #define INDEX_SIZE 1000 Modified: branches/OpenMPT-1.31/include/mpg123/src/compat/compat.h ============================================================================== --- branches/OpenMPT-1.31/include/mpg123/src/compat/compat.h Sat Jun 7 21:54:07 2025 (r23422) +++ branches/OpenMPT-1.31/include/mpg123/src/compat/compat.h Sat Jun 7 21:54:25 2025 (r23423) @@ -110,6 +110,7 @@ typedef unsigned char byte; +#ifndef NO_STRTOK /* OpenMPT */ // Annoying hackery to select a safe strtok variant. MS decided to call their strtok_r strtok_s, while // C11 declares another strtok_s with different prototype. Thanks to you all. #ifdef HAVE_STRTOK_R @@ -122,6 +123,7 @@ #define INT123_compat_strtok(a, b, c) strtok_s((a), (b), (c)) #endif #endif +#endif /* OpenMPT */ #if defined(MPG123_COMPAT_MSVCRT_IO) #if defined(_UCRT) @@ -159,10 +161,12 @@ #include <io.h> #endif +#ifndef NO_STRTOK /* OpenMPT */ #ifndef INT123_compat_strtok #warning "no safe strtok found" #define INT123_compat_strtok(a, b, c) strtok((a), (b)) #endif +#endif /* OpenMPT */ /* A safe realloc also for very old systems where realloc(NULL, size) returns NULL. */ void *INT123_safe_realloc(void *ptr, size_t size); |
3 messages has been excluded from this view by a project administrator.
