You can subscribe to this list here.
2006 |
Jan
|
Feb
|
Mar
(1) |
Apr
(1) |
May
|
Jun
(1) |
Jul
|
Aug
(10) |
Sep
|
Oct
|
Nov
|
Dec
(3) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2007 |
Jan
(1) |
Feb
(2) |
Mar
(3) |
Apr
(2) |
May
(10) |
Jun
(2) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
(3) |
Dec
|
2008 |
Jan
(6) |
Feb
(4) |
Mar
(5) |
Apr
(2) |
May
(1) |
Jun
(1) |
Jul
(4) |
Aug
(6) |
Sep
(2) |
Oct
(9) |
Nov
(1) |
Dec
(4) |
2009 |
Jan
(9) |
Feb
(2) |
Mar
(2) |
Apr
(2) |
May
(6) |
Jun
(18) |
Jul
(33) |
Aug
(39) |
Sep
(33) |
Oct
(24) |
Nov
(23) |
Dec
(22) |
2010 |
Jan
(29) |
Feb
(32) |
Mar
(51) |
Apr
(17) |
May
(31) |
Jun
(21) |
Jul
(32) |
Aug
(28) |
Sep
(35) |
Oct
(27) |
Nov
(11) |
Dec
(13) |
2011 |
Jan
(14) |
Feb
(13) |
Mar
(27) |
Apr
(27) |
May
(28) |
Jun
(20) |
Jul
(43) |
Aug
(52) |
Sep
(66) |
Oct
(61) |
Nov
(11) |
Dec
(8) |
2012 |
Jan
(20) |
Feb
(30) |
Mar
(38) |
Apr
(21) |
May
(33) |
Jun
(21) |
Jul
(25) |
Aug
(9) |
Sep
(24) |
Oct
(42) |
Nov
(27) |
Dec
(41) |
2013 |
Jan
(20) |
Feb
(35) |
Mar
(156) |
Apr
(298) |
May
(258) |
Jun
(201) |
Jul
(105) |
Aug
(60) |
Sep
(193) |
Oct
(245) |
Nov
(280) |
Dec
(194) |
2014 |
Jan
(63) |
Feb
(202) |
Mar
(200) |
Apr
(23) |
May
(53) |
Jun
(105) |
Jul
(18) |
Aug
(26) |
Sep
(110) |
Oct
(187) |
Nov
(97) |
Dec
(74) |
2015 |
Jan
(45) |
Feb
(55) |
Mar
(116) |
Apr
(116) |
May
(193) |
Jun
(164) |
Jul
(50) |
Aug
(111) |
Sep
(98) |
Oct
(71) |
Nov
(103) |
Dec
(63) |
2016 |
Jan
(33) |
Feb
(101) |
Mar
(182) |
Apr
(139) |
May
(140) |
Jun
(103) |
Jul
(165) |
Aug
(286) |
Sep
(208) |
Oct
(127) |
Nov
(97) |
Dec
(54) |
2017 |
Jan
(64) |
Feb
(335) |
Mar
(202) |
Apr
(212) |
May
(139) |
Jun
(127) |
Jul
(294) |
Aug
(154) |
Sep
(170) |
Oct
(152) |
Nov
(156) |
Dec
(62) |
2018 |
Jan
(168) |
Feb
(237) |
Mar
(196) |
Apr
(174) |
May
(174) |
Jun
(161) |
Jul
(127) |
Aug
(88) |
Sep
(149) |
Oct
(66) |
Nov
(52) |
Dec
(135) |
2019 |
Jan
(146) |
Feb
(126) |
Mar
(104) |
Apr
(58) |
May
(60) |
Jun
(28) |
Jul
(197) |
Aug
(129) |
Sep
(141) |
Oct
(148) |
Nov
(63) |
Dec
(100) |
2020 |
Jan
(74) |
Feb
(37) |
Mar
(59) |
Apr
(154) |
May
(194) |
Jun
(133) |
Jul
(313) |
Aug
(197) |
Sep
(49) |
Oct
(162) |
Nov
(143) |
Dec
(57) |
2021 |
Jan
(120) |
Feb
(107) |
Mar
(314) |
Apr
(157) |
May
(524) |
Jun
(169) |
Jul
(72) |
Aug
(133) |
Sep
(135) |
Oct
(146) |
Nov
(198) |
Dec
(325) |
2022 |
Jan
(409) |
Feb
(249) |
Mar
(138) |
Apr
(95) |
May
(102) |
Jun
(221) |
Jul
(66) |
Aug
(120) |
Sep
(192) |
Oct
(131) |
Nov
(53) |
Dec
(171) |
2023 |
Jan
(357) |
Feb
(82) |
Mar
(168) |
Apr
(218) |
May
(196) |
Jun
(86) |
Jul
(115) |
Aug
(49) |
Sep
(190) |
Oct
(102) |
Nov
(45) |
Dec
(76) |
2024 |
Jan
(86) |
Feb
(50) |
Mar
(324) |
Apr
(209) |
May
(197) |
Jun
(232) |
Jul
(194) |
Aug
(247) |
Sep
(219) |
Oct
(266) |
Nov
(328) |
Dec
(304) |
2025 |
Jan
(191) |
Feb
(115) |
Mar
(137) |
Apr
(32) |
May
(126) |
Jun
(403) |
Jul
(213) |
Aug
(152) |
Sep
|
Oct
|
Nov
|
Dec
|
From: <sv...@op...> - 2024-08-15 14:43:27
|
Author: manx Date: Thu Aug 15 16:43:14 2024 New Revision: 21446 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21446 Log: [Var] minimp3: Update to fork <https://github.com/manxorist/minimp3/releases/tag/openmpt-2024-08-15-v3> commit 2811a29e4115199209fe91ae5217c9c5fc611fa6 (2024-08-15). This applies the following pull requests: <https://github.com/lieff/minimp3/pull/125>. Modified: trunk/OpenMPT/include/minimp3/OpenMPT.txt trunk/OpenMPT/include/minimp3/minimp3.h Modified: trunk/OpenMPT/include/minimp3/OpenMPT.txt ============================================================================== --- trunk/OpenMPT/include/minimp3/OpenMPT.txt Thu Aug 15 15:47:24 2024 (r21445) +++ trunk/OpenMPT/include/minimp3/OpenMPT.txt Thu Aug 15 16:43:14 2024 (r21446) @@ -1,10 +1,11 @@ minimp3 library from https://github.com/lieff/minimp3 -Fork https://github.com/manxorist/minimp3/releases/tag/openmpt-2024-08-15-v2 -commit 30b5aea9b6d000f197798ddd44476b641a4d0ba7 (2024-08-15) +Fork https://github.com/manxorist/minimp3/releases/tag/openmpt-2024-08-15-v3 +commit 2811a29e4115199209fe91ae5217c9c5fc611fa6 (2024-08-15) The following changes have been made: * minimp3.c has been added * The following pull rquests have been merged: * https://github.com/lieff/minimp3/pull/126 * https://github.com/lieff/minimp3/pull/96 * https://github.com/lieff/minimp3/pull/97 + * https://github.com/lieff/minimp3/pull/125 * all modifications are marked by /* OpenMPT */ Modified: trunk/OpenMPT/include/minimp3/minimp3.h ============================================================================== --- trunk/OpenMPT/include/minimp3/minimp3.h Thu Aug 15 15:47:24 2024 (r21445) +++ trunk/OpenMPT/include/minimp3/minimp3.h Thu Aug 15 16:43:14 2024 (r21446) @@ -1655,6 +1655,21 @@ } } +static int hdr_is_tag(const uint8_t* hdr) +{ + return hdr[0] == 'T' && hdr[1] == 'A' && hdr[2] == 'G' && hdr[3] == '\0'; +} + +static int hdr_is_null(const uint8_t* hdr) +{ + return hdr[0] == '\0' && hdr[1] == '\0' && hdr[2] == '\0' && hdr[3] == '\0'; +} + +static int hdr_is_null_or_tag(const uint8_t* hdr) +{ + return hdr_is_tag(hdr) > 0 || hdr_is_null(hdr) > 0; +} + static int mp3d_match_frame(const uint8_t *hdr, int mp3_bytes, int frame_bytes) { int i, nmatch; @@ -1663,6 +1678,8 @@ i += hdr_frame_bytes(hdr + i, frame_bytes) + hdr_padding(hdr + i); if (i + HDR_SIZE > mp3_bytes) return nmatch > 0; + if (hdr_is_null_or_tag(hdr + i)) + return nmatch > 0; if (!hdr_compare(hdr, hdr + i)) return 0; } |
From: <sv...@op...> - 2024-08-15 13:47:32
|
Author: manx Date: Thu Aug 15 15:47:24 2024 New Revision: 21445 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21445 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 Thu Aug 15 15:45:22 2024 (r21444) +++ branches/OpenMPT-1.31/doc/libopenmpt/changelog.md Thu Aug 15 15:47:24 2024 (r21445) @@ -10,7 +10,10 @@ * [**Bug**] The Android NDK build system did not enable C++20 when available. * mpg123: Update to v1.32.7 (2024-08-07). - + * minimp3: Update to fork + <https://github.com/manxorist/minimp3/releases/tag/openmpt-2024-08-15-v2> + commit 30b5aea9b6d000f197798ddd44476b641a4d0ba7 (2024-08-15). + ### libopenmpt 0.7.9 (2024-07-21) * [**Sec**] Potential division by 0 when seeking in the module with |
From: <sv...@op...> - 2024-08-15 13:45:28
|
Author: manx Date: Thu Aug 15 15:45:22 2024 New Revision: 21444 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21444 Log: Merged revision(s) 21443 from trunk/OpenMPT: [Var] minimp3: Update to fork <https://github.com/manxorist/minimp3/releases/tag/openmpt-2024-08-15-v2> commit 30b5aea9b6d000f197798ddd44476b641a4d0ba7 (2024-08-15). This applies the following pull requests: <https://github.com/lieff/minimp3/pull/126>, <https://github.com/lieff/minimp3/pull/96>, <https://github.com/lieff/minimp3/pull/97>. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/include/minimp3/OpenMPT.txt branches/OpenMPT-1.31/include/minimp3/minimp3.h Modified: branches/OpenMPT-1.31/include/minimp3/OpenMPT.txt ============================================================================== --- branches/OpenMPT-1.31/include/minimp3/OpenMPT.txt Thu Aug 15 15:44:58 2024 (r21443) +++ branches/OpenMPT-1.31/include/minimp3/OpenMPT.txt Thu Aug 15 15:45:22 2024 (r21444) @@ -1,6 +1,10 @@ minimp3 library from https://github.com/lieff/minimp3 -commit 50d2aaf360a53653b718fead8e258d654c3a7e41 (2021-11-27) +Fork https://github.com/manxorist/minimp3/releases/tag/openmpt-2024-08-15-v2 +commit 30b5aea9b6d000f197798ddd44476b641a4d0ba7 (2024-08-15) The following changes have been made: * minimp3.c has been added - * some warnings have been fixed + * The following pull rquests have been merged: + * https://github.com/lieff/minimp3/pull/126 + * https://github.com/lieff/minimp3/pull/96 + * https://github.com/lieff/minimp3/pull/97 * all modifications are marked by /* OpenMPT */ Modified: branches/OpenMPT-1.31/include/minimp3/minimp3.h ============================================================================== --- branches/OpenMPT-1.31/include/minimp3/minimp3.h Thu Aug 15 15:44:58 2024 (r21443) +++ branches/OpenMPT-1.31/include/minimp3/minimp3.h Thu Aug 15 15:45:22 2024 (r21444) @@ -176,11 +176,7 @@ #define VMUL_S(x, s) vmulq_f32(x, vmovq_n_f32(s)) #define VREV(x) vcombine_f32(vget_high_f32(vrev64q_f32(x)), vget_low_f32(vrev64q_f32(x))) typedef float32x4_t f4; -#if 1 /* OpenMPT */ static int have_simd(void) -#else /* OpenMPT */ -static int have_simd() -#endif /* OpenMPT */ { /* TODO: detect neon for !MINIMP3_ONLY_SIMD */ return 1; } @@ -195,7 +191,7 @@ #define HAVE_SIMD 0 #endif /* !defined(MINIMP3_NO_SIMD) */ -#if defined(__ARM_ARCH) && (__ARM_ARCH >= 6) && !defined(__aarch64__) && !defined(_M_ARM64) +#if defined(__ARM_ARCH) && (__ARM_ARCH >= 6) && !defined(__aarch64__) && !defined(_M_ARM64) && !defined(__ARM_ARCH_6M__) #define HAVE_ARMV6 1 static __inline__ __attribute__((always_inline)) int32_t minimp3_clip_int16_arm(int32_t a) { @@ -945,7 +941,8 @@ static void L3_stereo_process(float *left, const uint8_t *ist_pos, const uint8_t *sfb, const uint8_t *hdr, int max_band[3], int mpeg2_sh) { static const float g_pan[7*2] = { 0,1,0.21132487f,0.78867513f,0.36602540f,0.63397460f,0.5f,0.5f,0.63397460f,0.36602540f,0.78867513f,0.21132487f,1,0 }; - unsigned i, max_pos = HDR_TEST_MPEG1(hdr) ? 7 : 64; + const uint8_t mpeg1 = HDR_TEST_MPEG1(hdr); + unsigned i, max_pos = mpeg1 ? 7 : 64; for (i = 0; sfb[i]; i++) { @@ -953,7 +950,7 @@ if ((int)i > max_band[i % 3] && ipos < max_pos) { float kl, kr, s = HDR_TEST_MS_STEREO(hdr) ? 1.41421356f : 1; - if (HDR_TEST_MPEG1(hdr)) + if (mpeg1) { kl = g_pan[2*ipos]; kr = g_pan[2*ipos + 1]; @@ -1773,7 +1770,7 @@ { for (igr = 0; igr < (HDR_TEST_MPEG1(hdr) ? 2 : 1); igr++, pcm += 576*info->channels) { - memset(scratch.grbuf[0], 0, 576*2*sizeof(float)); + memset(scratch.grbuf, 0, sizeof(scratch.grbuf)); L3_decode(dec, &scratch, scratch.gr_info + igr*info->channels, info->channels); mp3d_synth_granule(dec->qmf_state, scratch.grbuf[0], 18, info->channels, pcm, scratch.syn[0]); } @@ -1787,7 +1784,7 @@ L12_scale_info sci[1]; L12_read_scale_info(hdr, bs_frame, sci); - memset(scratch.grbuf[0], 0, 576*2*sizeof(float)); + memset(scratch.grbuf, 0, sizeof(scratch.grbuf)); for (i = 0, igr = 0; igr < 3; igr++) { if (12 == (i += L12_dequantize_granule(scratch.grbuf[0] + i, bs_frame, sci, info->layer | 1))) @@ -1795,7 +1792,7 @@ i = 0; L12_apply_scf_384(sci, sci->scf + igr, scratch.grbuf[0]); mp3d_synth_granule(dec->qmf_state, scratch.grbuf[0], 12, info->channels, pcm, scratch.syn[0]); - memset(scratch.grbuf[0], 0, 576*2*sizeof(float)); + memset(scratch.grbuf, 0, sizeof(scratch.grbuf)); pcm += 384*info->channels; } if (bs_frame->pos > bs_frame->limit) |
From: <sv...@op...> - 2024-08-15 13:45:06
|
Author: manx Date: Thu Aug 15 15:44:58 2024 New Revision: 21443 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21443 Log: [Var] minimp3: Update to fork <https://github.com/manxorist/minimp3/releases/tag/openmpt-2024-08-15-v2> commit 30b5aea9b6d000f197798ddd44476b641a4d0ba7 (2024-08-15). This applies the following pull requests: <https://github.com/lieff/minimp3/pull/126>, <https://github.com/lieff/minimp3/pull/96>, <https://github.com/lieff/minimp3/pull/97>. Modified: trunk/OpenMPT/include/minimp3/OpenMPT.txt trunk/OpenMPT/include/minimp3/minimp3.h Modified: trunk/OpenMPT/include/minimp3/OpenMPT.txt ============================================================================== --- trunk/OpenMPT/include/minimp3/OpenMPT.txt Thu Aug 15 15:40:18 2024 (r21442) +++ trunk/OpenMPT/include/minimp3/OpenMPT.txt Thu Aug 15 15:44:58 2024 (r21443) @@ -1,6 +1,10 @@ minimp3 library from https://github.com/lieff/minimp3 -commit 50d2aaf360a53653b718fead8e258d654c3a7e41 (2021-11-27) +Fork https://github.com/manxorist/minimp3/releases/tag/openmpt-2024-08-15-v2 +commit 30b5aea9b6d000f197798ddd44476b641a4d0ba7 (2024-08-15) The following changes have been made: * minimp3.c has been added - * some warnings have been fixed + * The following pull rquests have been merged: + * https://github.com/lieff/minimp3/pull/126 + * https://github.com/lieff/minimp3/pull/96 + * https://github.com/lieff/minimp3/pull/97 * all modifications are marked by /* OpenMPT */ Modified: trunk/OpenMPT/include/minimp3/minimp3.h ============================================================================== --- trunk/OpenMPT/include/minimp3/minimp3.h Thu Aug 15 15:40:18 2024 (r21442) +++ trunk/OpenMPT/include/minimp3/minimp3.h Thu Aug 15 15:44:58 2024 (r21443) @@ -176,11 +176,7 @@ #define VMUL_S(x, s) vmulq_f32(x, vmovq_n_f32(s)) #define VREV(x) vcombine_f32(vget_high_f32(vrev64q_f32(x)), vget_low_f32(vrev64q_f32(x))) typedef float32x4_t f4; -#if 1 /* OpenMPT */ static int have_simd(void) -#else /* OpenMPT */ -static int have_simd() -#endif /* OpenMPT */ { /* TODO: detect neon for !MINIMP3_ONLY_SIMD */ return 1; } @@ -195,7 +191,7 @@ #define HAVE_SIMD 0 #endif /* !defined(MINIMP3_NO_SIMD) */ -#if defined(__ARM_ARCH) && (__ARM_ARCH >= 6) && !defined(__aarch64__) && !defined(_M_ARM64) +#if defined(__ARM_ARCH) && (__ARM_ARCH >= 6) && !defined(__aarch64__) && !defined(_M_ARM64) && !defined(__ARM_ARCH_6M__) #define HAVE_ARMV6 1 static __inline__ __attribute__((always_inline)) int32_t minimp3_clip_int16_arm(int32_t a) { @@ -945,7 +941,8 @@ static void L3_stereo_process(float *left, const uint8_t *ist_pos, const uint8_t *sfb, const uint8_t *hdr, int max_band[3], int mpeg2_sh) { static const float g_pan[7*2] = { 0,1,0.21132487f,0.78867513f,0.36602540f,0.63397460f,0.5f,0.5f,0.63397460f,0.36602540f,0.78867513f,0.21132487f,1,0 }; - unsigned i, max_pos = HDR_TEST_MPEG1(hdr) ? 7 : 64; + const uint8_t mpeg1 = HDR_TEST_MPEG1(hdr); + unsigned i, max_pos = mpeg1 ? 7 : 64; for (i = 0; sfb[i]; i++) { @@ -953,7 +950,7 @@ if ((int)i > max_band[i % 3] && ipos < max_pos) { float kl, kr, s = HDR_TEST_MS_STEREO(hdr) ? 1.41421356f : 1; - if (HDR_TEST_MPEG1(hdr)) + if (mpeg1) { kl = g_pan[2*ipos]; kr = g_pan[2*ipos + 1]; @@ -1773,7 +1770,7 @@ { for (igr = 0; igr < (HDR_TEST_MPEG1(hdr) ? 2 : 1); igr++, pcm += 576*info->channels) { - memset(scratch.grbuf[0], 0, 576*2*sizeof(float)); + memset(scratch.grbuf, 0, sizeof(scratch.grbuf)); L3_decode(dec, &scratch, scratch.gr_info + igr*info->channels, info->channels); mp3d_synth_granule(dec->qmf_state, scratch.grbuf[0], 18, info->channels, pcm, scratch.syn[0]); } @@ -1787,7 +1784,7 @@ L12_scale_info sci[1]; L12_read_scale_info(hdr, bs_frame, sci); - memset(scratch.grbuf[0], 0, 576*2*sizeof(float)); + memset(scratch.grbuf, 0, sizeof(scratch.grbuf)); for (i = 0, igr = 0; igr < 3; igr++) { if (12 == (i += L12_dequantize_granule(scratch.grbuf[0] + i, bs_frame, sci, info->layer | 1))) @@ -1795,7 +1792,7 @@ i = 0; L12_apply_scf_384(sci, sci->scf + igr, scratch.grbuf[0]); mp3d_synth_granule(dec->qmf_state, scratch.grbuf[0], 12, info->channels, pcm, scratch.syn[0]); - memset(scratch.grbuf[0], 0, 576*2*sizeof(float)); + memset(scratch.grbuf, 0, sizeof(scratch.grbuf)); pcm += 384*info->channels; } if (bs_frame->pos > bs_frame->limit) |
From: <sv...@op...> - 2024-08-15 13:40:24
|
Author: manx Date: Thu Aug 15 15:40:18 2024 New Revision: 21442 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21442 Log: [Fix] Playback Test: Fix libopenmpt build. Modified: trunk/OpenMPT/test/PlaybackTest.cpp Modified: trunk/OpenMPT/test/PlaybackTest.cpp ============================================================================== --- trunk/OpenMPT/test/PlaybackTest.cpp Thu Aug 15 14:26:46 2024 (r21441) +++ trunk/OpenMPT/test/PlaybackTest.cpp Thu Aug 15 15:40:18 2024 (r21442) @@ -10,6 +10,7 @@ #include "stdafx.h" #include "PlaybackTest.h" +#include "../common/FileReader.h" #include "../soundlib/OPL.h" #include "../soundlib/SampleIO.h" #include "../soundlib/Sndfile.h" |
From: <sv...@op...> - 2024-08-15 12:26:58
|
Author: manx Date: Thu Aug 15 14:26:46 2024 New Revision: 21441 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21441 Log: [Ref] Playback Test: Move gzip compression/decompression out into the caller. Modified: trunk/OpenMPT/common/BuildSettings.h trunk/OpenMPT/mptrack/MainFrm.cpp trunk/OpenMPT/test/PlaybackTest.cpp trunk/OpenMPT/test/PlaybackTest.h Modified: trunk/OpenMPT/common/BuildSettings.h ============================================================================== --- trunk/OpenMPT/common/BuildSettings.h Thu Aug 15 12:30:30 2024 (r21440) +++ trunk/OpenMPT/common/BuildSettings.h Thu Aug 15 14:26:46 2024 (r21441) @@ -114,6 +114,10 @@ #define MPT_ENABLE_UPDATE +#if defined(MPT_BUILD_DEBUG) +#define MPT_ENABLE_PLAYBACK_TEST_MENU +#endif + // Disable unarchiving support //#define NO_ARCHIVE_SUPPORT Modified: trunk/OpenMPT/mptrack/MainFrm.cpp ============================================================================== --- trunk/OpenMPT/mptrack/MainFrm.cpp Thu Aug 15 12:30:30 2024 (r21440) +++ trunk/OpenMPT/mptrack/MainFrm.cpp Thu Aug 15 14:26:46 2024 (r21441) @@ -56,6 +56,11 @@ #include "openmpt/sounddevice/SoundDeviceBuffer.hpp" #include "openmpt/sounddevice/SoundDeviceManager.hpp" +#ifdef MPT_ENABLE_PLAYBACK_TEST_MENU +#include "../unarchiver/ungzip.h" +#include "../common/GzipWriter.h" +#endif + #include <HtmlHelp.h> #include <Dbt.h> // device change messages @@ -67,10 +72,6 @@ static constexpr uint32 MPTTIMER_PERIOD = 100; -#if defined(MPT_BUILD_DEBUG) -#define MPT_ENABLE_PLAYBACK_TEST_MENU -#endif - ///////////////////////////////////////////////////////////////////////////// // CMainFrame @@ -3268,7 +3269,17 @@ auto playTest = sndFile->CreatePlaybackTest(PlaybackTestSettings{}); mpt::ofstream outFile(fileName + P_(".testdata.gz"), std::ios::binary | std::ios::trunc); if(outFile) - playTest.Serialize(outFile, fileName.GetFilename().ToUnicode() + U_(".testdata")); + { + std::ostringstream outStream; + playTest.Serialize(outStream); + #ifdef MPT_WITH_ZLIB + std::string outData = std::move(outStream).str(); + WriteGzip(outFile, outData, fileName.GetFilename().ToUnicode() + U_(".testdata")); + #else + // miniz doesn't have gzip convenience functions + outFile << std::move(outStream).str(); + #endif + } } } @@ -3299,7 +3310,16 @@ if(!modFile.IsValid()) throw std::runtime_error{"Cannot open module data file: " + modFileName.ToUTF8()}; - PlaybackTest playTest{GetFileReader(testFile)}; + FileReader testFileReader = GetFileReader(testFile); + CGzipArchive archive{testFileReader}; + if(archive.IsArchive()) + { + if(!archive.ExtractFile(0)) + throw std::runtime_error{"Cannot extract test data file!"}; + testFileReader = archive.GetOutputFile(); + } + + PlaybackTest playTest{testFileReader}; auto sndFile = std::make_unique<CSoundFile>(); sndFile->Create(GetFileReader(modFile)); Modified: trunk/OpenMPT/test/PlaybackTest.cpp ============================================================================== --- trunk/OpenMPT/test/PlaybackTest.cpp Thu Aug 15 12:30:30 2024 (r21440) +++ trunk/OpenMPT/test/PlaybackTest.cpp Thu Aug 15 14:26:46 2024 (r21441) @@ -10,11 +10,9 @@ #include "stdafx.h" #include "PlaybackTest.h" -#include "../common/GzipWriter.h" #include "../soundlib/OPL.h" #include "../soundlib/SampleIO.h" #include "../soundlib/Sndfile.h" -#include "../unarchiver/ungzip.h" #include "mpt/base/bit.hpp" #include "mpt/binary/hex.hpp" @@ -331,13 +329,6 @@ void PlaybackTest::Deserialize(FileReader file) noexcept(false) { - CGzipArchive archive{file}; - if(archive.IsArchive()) - { - if(!archive.ExtractFile(0)) - throw std::runtime_error{"Cannot extract test data file!"}; - file = archive.GetOutputFile(); - } file.Rewind(); @@ -377,26 +368,17 @@ } -void PlaybackTest::Serialize(std::ostream &output, const mpt::ustring &filename) const noexcept(false) +void PlaybackTest::Serialize(std::ostream &output) const noexcept(false) { - std::ostringstream outStream; - mpt::IO::Write(outStream, m_testData->header); - mpt::IO::Write(outStream, m_testData->sampleDataHashes); + mpt::IO::Write(output, m_testData->header); + mpt::IO::Write(output, m_testData->sampleDataHashes); for(const auto &row : m_testData->rows) { - mpt::IO::Write(outStream, row.header); - mpt::IO::Write(outStream, row.channels); - mpt::IO::WriteVarInt(outStream, row.oplRegisters.size()); - mpt::IO::Write(outStream, row.oplRegisters); + mpt::IO::Write(output, row.header); + mpt::IO::Write(output, row.channels); + mpt::IO::WriteVarInt(output, row.oplRegisters.size()); + mpt::IO::Write(output, row.oplRegisters); } - -#ifdef MPT_WITH_ZLIB - std::string outData = std::move(outStream).str(); - WriteGzip(output, outData, filename); -#else - // miniz doesn't have gzip convenience functions - output << std::move(outStream).str(); -#endif } Modified: trunk/OpenMPT/test/PlaybackTest.h ============================================================================== --- trunk/OpenMPT/test/PlaybackTest.h Thu Aug 15 12:30:30 2024 (r21440) +++ trunk/OpenMPT/test/PlaybackTest.h Thu Aug 15 14:26:46 2024 (r21441) @@ -34,7 +34,7 @@ PlaybackTest& operator=(const PlaybackTest &) = delete; void Deserialize(FileReader file) noexcept(false); - void Serialize(std::ostream &output, const mpt::ustring &filename) const noexcept(false); + void Serialize(std::ostream &output) const noexcept(false); void ToTSV(std::ostream &output) const noexcept(false); PlaybackTestSettings GetSettings() const noexcept; |
From: <sv...@op...> - 2024-08-15 10:30:39
|
Author: manx Date: Thu Aug 15 12:30:30 2024 New Revision: 21440 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21440 Log: [Var] Run clang-format. Modified: trunk/OpenMPT/src/mpt/base/debugging.hpp Modified: trunk/OpenMPT/src/mpt/base/debugging.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/base/debugging.hpp Thu Aug 15 11:38:58 2024 (r21439) +++ trunk/OpenMPT/src/mpt/base/debugging.hpp Thu Aug 15 12:30:30 2024 (r21440) @@ -68,7 +68,7 @@ #elif MPT_COMPILER_CLANG __builtin_debugtrap(); #elif MPT_COMPILER_GCC && (MPT_ARCH_X86 || MPT_ARCH_AMD64) - __asm__ __volatile__ ("int 3"); + __asm__ __volatile__("int 3"); #else DebugBreak(); #endif @@ -186,7 +186,7 @@ #if MPT_COMPILER_CLANG __builtin_debugtrap(); #elif MPT_COMPILER_GCC && (MPT_ARCH_X86 || MPT_ARCH_AMD64) - __asm__ __volatile__ ("int 3"); + __asm__ __volatile__("int 3"); #else kill(getpid(), SIGTRAP); #endif @@ -204,7 +204,7 @@ #elif MPT_COMPILER_CLANG __builtin_debugtrap(); #elif MPT_COMPILER_GCC && (MPT_ARCH_X86 || MPT_ARCH_AMD64) - __asm__ __volatile__ ("int 3"); + __asm__ __volatile__("int 3"); #endif } |
Author: manx Date: Thu Aug 15 11:38:58 2024 New Revision: 21439 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21439 Log: [New] mpt/base/debugging.hpp: Implement C++26 <debugging> for MSVC, Clang, GCC on x86, GCC on amd64, Windows, and Linux. Other platforms use nop-stubs. Added: trunk/OpenMPT/src/mpt/base/debugging.hpp (contents, props changed) Modified: trunk/OpenMPT/build/autotools/Makefile.am trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/PluginBridge.vcxproj trunk/OpenMPT/build/vs2017winxp/PluginBridge.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/PluginBridgeLegacy.vcxproj trunk/OpenMPT/build/vs2017winxp/PluginBridgeLegacy.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/openmpt123.vcxproj trunk/OpenMPT/build/vs2017winxp/openmpt123.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/PluginBridge.vcxproj trunk/OpenMPT/build/vs2017winxpansi/PluginBridge.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/PluginBridgeLegacy.vcxproj trunk/OpenMPT/build/vs2017winxpansi/PluginBridgeLegacy.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/openmpt123.vcxproj trunk/OpenMPT/build/vs2017winxpansi/openmpt123.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj.filters trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2019win10/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2019win10/OpenMPT-NativeSupport.vcxproj.filters trunk/OpenMPT/build/vs2019win10/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2019win10/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2019win10/OpenMPT.vcxproj trunk/OpenMPT/build/vs2019win10/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2019win10/PluginBridge.vcxproj trunk/OpenMPT/build/vs2019win10/PluginBridge.vcxproj.filters trunk/OpenMPT/build/vs2019win10/PluginBridgeLegacy.vcxproj trunk/OpenMPT/build/vs2019win10/PluginBridgeLegacy.vcxproj.filters trunk/OpenMPT/build/vs2019win10/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2019win10/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2019win10/libopenmpt.vcxproj trunk/OpenMPT/build/vs2019win10/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2019win10/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2019win10/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2019win10/openmpt123.vcxproj trunk/OpenMPT/build/vs2019win10/openmpt123.vcxproj.filters trunk/OpenMPT/build/vs2019win10/updatesigntool.vcxproj trunk/OpenMPT/build/vs2019win10/updatesigntool.vcxproj.filters trunk/OpenMPT/build/vs2019win10uwp/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2019win10uwp/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2019win10uwp/libopenmpt.vcxproj trunk/OpenMPT/build/vs2019win10uwp/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2019win7/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2019win7/OpenMPT-NativeSupport.vcxproj.filters trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2019win7/PluginBridge.vcxproj trunk/OpenMPT/build/vs2019win7/PluginBridge.vcxproj.filters trunk/OpenMPT/build/vs2019win7/PluginBridgeLegacy.vcxproj trunk/OpenMPT/build/vs2019win7/PluginBridgeLegacy.vcxproj.filters trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2019win7/openmpt123.vcxproj trunk/OpenMPT/build/vs2019win7/openmpt123.vcxproj.filters trunk/OpenMPT/build/vs2019win7/updatesigntool.vcxproj trunk/OpenMPT/build/vs2019win7/updatesigntool.vcxproj.filters trunk/OpenMPT/build/vs2019win8/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2019win8/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2019win8/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2019win8/OpenMPT-NativeSupport.vcxproj.filters trunk/OpenMPT/build/vs2019win8/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2019win8/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2019win8/OpenMPT.vcxproj trunk/OpenMPT/build/vs2019win8/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2019win8/PluginBridge.vcxproj trunk/OpenMPT/build/vs2019win8/PluginBridge.vcxproj.filters trunk/OpenMPT/build/vs2019win8/PluginBridgeLegacy.vcxproj trunk/OpenMPT/build/vs2019win8/PluginBridgeLegacy.vcxproj.filters trunk/OpenMPT/build/vs2019win8/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2019win8/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2019win8/libopenmpt.vcxproj trunk/OpenMPT/build/vs2019win8/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2019win8/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2019win8/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2019win8/openmpt123.vcxproj trunk/OpenMPT/build/vs2019win8/openmpt123.vcxproj.filters trunk/OpenMPT/build/vs2019win8/updatesigntool.vcxproj trunk/OpenMPT/build/vs2019win8/updatesigntool.vcxproj.filters trunk/OpenMPT/build/vs2019win81/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2019win81/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2019win81/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2019win81/OpenMPT-NativeSupport.vcxproj.filters trunk/OpenMPT/build/vs2019win81/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2019win81/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2019win81/OpenMPT.vcxproj trunk/OpenMPT/build/vs2019win81/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2019win81/PluginBridge.vcxproj trunk/OpenMPT/build/vs2019win81/PluginBridge.vcxproj.filters trunk/OpenMPT/build/vs2019win81/PluginBridgeLegacy.vcxproj trunk/OpenMPT/build/vs2019win81/PluginBridgeLegacy.vcxproj.filters trunk/OpenMPT/build/vs2019win81/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2019win81/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2019win81/libopenmpt.vcxproj trunk/OpenMPT/build/vs2019win81/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2019win81/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2019win81/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2019win81/openmpt123.vcxproj trunk/OpenMPT/build/vs2019win81/openmpt123.vcxproj.filters trunk/OpenMPT/build/vs2019win81/updatesigntool.vcxproj trunk/OpenMPT/build/vs2019win81/updatesigntool.vcxproj.filters trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2022win10/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2022win10/OpenMPT-NativeSupport.vcxproj.filters trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2022win10/PluginBridge.vcxproj trunk/OpenMPT/build/vs2022win10/PluginBridge.vcxproj.filters trunk/OpenMPT/build/vs2022win10/PluginBridgeLegacy.vcxproj trunk/OpenMPT/build/vs2022win10/PluginBridgeLegacy.vcxproj.filters trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2022win10/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win10/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2022win10/openmpt123.vcxproj trunk/OpenMPT/build/vs2022win10/openmpt123.vcxproj.filters trunk/OpenMPT/build/vs2022win10/updatesigntool.vcxproj trunk/OpenMPT/build/vs2022win10/updatesigntool.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT-NativeSupport.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/PluginBridge.vcxproj trunk/OpenMPT/build/vs2022win10clang/PluginBridge.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/PluginBridgeLegacy.vcxproj trunk/OpenMPT/build/vs2022win10clang/PluginBridgeLegacy.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2022win10clang/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win10clang/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2022win10clang/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/openmpt123.vcxproj trunk/OpenMPT/build/vs2022win10clang/openmpt123.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/updatesigntool.vcxproj trunk/OpenMPT/build/vs2022win10clang/updatesigntool.vcxproj.filters trunk/OpenMPT/build/vs2022win10uwp/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2022win10uwp/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2022win10uwp/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win10uwp/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2022win7/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2022win7/OpenMPT-NativeSupport.vcxproj.filters trunk/OpenMPT/build/vs2022win7/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win7/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2022win7/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win7/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2022win7/PluginBridge.vcxproj trunk/OpenMPT/build/vs2022win7/PluginBridge.vcxproj.filters trunk/OpenMPT/build/vs2022win7/PluginBridgeLegacy.vcxproj trunk/OpenMPT/build/vs2022win7/PluginBridgeLegacy.vcxproj.filters trunk/OpenMPT/build/vs2022win7/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2022win7/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2022win7/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win7/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2022win7/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2022win7/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2022win7/openmpt123.vcxproj trunk/OpenMPT/build/vs2022win7/openmpt123.vcxproj.filters trunk/OpenMPT/build/vs2022win7/updatesigntool.vcxproj trunk/OpenMPT/build/vs2022win7/updatesigntool.vcxproj.filters trunk/OpenMPT/build/vs2022win8/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win8/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2022win8/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2022win8/OpenMPT-NativeSupport.vcxproj.filters trunk/OpenMPT/build/vs2022win8/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win8/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2022win8/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win8/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2022win8/PluginBridge.vcxproj trunk/OpenMPT/build/vs2022win8/PluginBridge.vcxproj.filters trunk/OpenMPT/build/vs2022win8/PluginBridgeLegacy.vcxproj trunk/OpenMPT/build/vs2022win8/PluginBridgeLegacy.vcxproj.filters trunk/OpenMPT/build/vs2022win8/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2022win8/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2022win8/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win8/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2022win8/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2022win8/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2022win8/openmpt123.vcxproj trunk/OpenMPT/build/vs2022win8/openmpt123.vcxproj.filters trunk/OpenMPT/build/vs2022win8/updatesigntool.vcxproj trunk/OpenMPT/build/vs2022win8/updatesigntool.vcxproj.filters trunk/OpenMPT/build/vs2022win81/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win81/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2022win81/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2022win81/OpenMPT-NativeSupport.vcxproj.filters trunk/OpenMPT/build/vs2022win81/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win81/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2022win81/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win81/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2022win81/PluginBridge.vcxproj trunk/OpenMPT/build/vs2022win81/PluginBridge.vcxproj.filters trunk/OpenMPT/build/vs2022win81/PluginBridgeLegacy.vcxproj trunk/OpenMPT/build/vs2022win81/PluginBridgeLegacy.vcxproj.filters trunk/OpenMPT/build/vs2022win81/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2022win81/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2022win81/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win81/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2022win81/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2022win81/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2022win81/openmpt123.vcxproj trunk/OpenMPT/build/vs2022win81/openmpt123.vcxproj.filters trunk/OpenMPT/build/vs2022win81/updatesigntool.vcxproj trunk/OpenMPT/build/vs2022win81/updatesigntool.vcxproj.filters trunk/OpenMPT/build/xcode-ios/libopenmpt.xcodeproj/project.pbxproj trunk/OpenMPT/build/xcode-macosx/libopenmpt.xcodeproj/project.pbxproj trunk/OpenMPT/test/TestToolsTracker.h Modified: trunk/OpenMPT/build/autotools/Makefile.am ============================================================================== --- trunk/OpenMPT/build/autotools/Makefile.am Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/autotools/Makefile.am Thu Aug 15 11:38:58 2024 (r21439) @@ -135,6 +135,7 @@ MPT_FILES_SRC_MPT += src/mpt/base/check_platform.hpp MPT_FILES_SRC_MPT += src/mpt/base/compiletime_warning.hpp MPT_FILES_SRC_MPT += src/mpt/base/constexpr_throw.hpp +MPT_FILES_SRC_MPT += src/mpt/base/debugging.hpp MPT_FILES_SRC_MPT += src/mpt/base/detect.hpp MPT_FILES_SRC_MPT += src/mpt/base/detect_arch.hpp MPT_FILES_SRC_MPT += src/mpt/base/detect_compiler.hpp Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj Thu Aug 15 11:38:58 2024 (r21439) @@ -999,6 +999,7 @@ <ClInclude Include="..\..\src\mpt\base\check_platform.hpp" /> <ClInclude Include="..\..\src\mpt\base\compiletime_warning.hpp" /> <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp" /> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_arch.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_compiler.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters Thu Aug 15 11:38:58 2024 (r21439) @@ -948,6 +948,9 @@ <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp"> + <Filter>src\mpt\base</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\base\detect.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj Thu Aug 15 11:38:58 2024 (r21439) @@ -691,6 +691,7 @@ <ClInclude Include="..\..\src\mpt\base\check_platform.hpp" /> <ClInclude Include="..\..\src\mpt\base\compiletime_warning.hpp" /> <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp" /> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_arch.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_compiler.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj.filters Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj.filters Thu Aug 15 11:38:58 2024 (r21439) @@ -345,6 +345,9 @@ <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp"> + <Filter>src\mpt\base</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\base\detect.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj Thu Aug 15 11:38:58 2024 (r21439) @@ -999,6 +999,7 @@ <ClInclude Include="..\..\src\mpt\base\check_platform.hpp" /> <ClInclude Include="..\..\src\mpt\base\compiletime_warning.hpp" /> <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp" /> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_arch.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_compiler.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters Thu Aug 15 11:38:58 2024 (r21439) @@ -948,6 +948,9 @@ <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp"> + <Filter>src\mpt\base</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\base\detect.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj Thu Aug 15 11:38:58 2024 (r21439) @@ -999,6 +999,7 @@ <ClInclude Include="..\..\src\mpt\base\check_platform.hpp" /> <ClInclude Include="..\..\src\mpt\base\compiletime_warning.hpp" /> <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp" /> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_arch.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_compiler.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters Thu Aug 15 11:38:58 2024 (r21439) @@ -948,6 +948,9 @@ <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp"> + <Filter>src\mpt\base</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\base\detect.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxp/PluginBridge.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/PluginBridge.vcxproj Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2017winxp/PluginBridge.vcxproj Thu Aug 15 11:38:58 2024 (r21439) @@ -741,6 +741,7 @@ <ClInclude Include="..\..\src\mpt\base\check_platform.hpp" /> <ClInclude Include="..\..\src\mpt\base\compiletime_warning.hpp" /> <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp" /> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_arch.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_compiler.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/PluginBridge.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/PluginBridge.vcxproj.filters Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2017winxp/PluginBridge.vcxproj.filters Thu Aug 15 11:38:58 2024 (r21439) @@ -234,6 +234,9 @@ <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp"> + <Filter>src\mpt\base</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\base\detect.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxp/PluginBridgeLegacy.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/PluginBridgeLegacy.vcxproj Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2017winxp/PluginBridgeLegacy.vcxproj Thu Aug 15 11:38:58 2024 (r21439) @@ -747,6 +747,7 @@ <ClInclude Include="..\..\src\mpt\base\check_platform.hpp" /> <ClInclude Include="..\..\src\mpt\base\compiletime_warning.hpp" /> <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp" /> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_arch.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_compiler.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/PluginBridgeLegacy.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/PluginBridgeLegacy.vcxproj.filters Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2017winxp/PluginBridgeLegacy.vcxproj.filters Thu Aug 15 11:38:58 2024 (r21439) @@ -234,6 +234,9 @@ <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp"> + <Filter>src\mpt\base</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\base\detect.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj Thu Aug 15 11:38:58 2024 (r21439) @@ -779,6 +779,7 @@ <ClInclude Include="..\..\src\mpt\base\check_platform.hpp" /> <ClInclude Include="..\..\src\mpt\base\compiletime_warning.hpp" /> <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp" /> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_arch.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_compiler.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj.filters Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj.filters Thu Aug 15 11:38:58 2024 (r21439) @@ -570,6 +570,9 @@ <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp"> + <Filter>src\mpt\base</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\base\detect.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj Thu Aug 15 11:38:58 2024 (r21439) @@ -779,6 +779,7 @@ <ClInclude Include="..\..\src\mpt\base\check_platform.hpp" /> <ClInclude Include="..\..\src\mpt\base\compiletime_warning.hpp" /> <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp" /> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_arch.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_compiler.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj.filters Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj.filters Thu Aug 15 11:38:58 2024 (r21439) @@ -570,6 +570,9 @@ <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp"> + <Filter>src\mpt\base</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\base\detect.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj Thu Aug 15 11:38:58 2024 (r21439) @@ -809,6 +809,7 @@ <ClInclude Include="..\..\src\mpt\base\check_platform.hpp" /> <ClInclude Include="..\..\src\mpt\base\compiletime_warning.hpp" /> <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp" /> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_arch.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_compiler.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters Thu Aug 15 11:38:58 2024 (r21439) @@ -582,6 +582,9 @@ <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp"> + <Filter>src\mpt\base</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\base\detect.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxp/openmpt123.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/openmpt123.vcxproj Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2017winxp/openmpt123.vcxproj Thu Aug 15 11:38:58 2024 (r21439) @@ -754,6 +754,7 @@ <ClInclude Include="..\..\src\mpt\base\check_platform.hpp" /> <ClInclude Include="..\..\src\mpt\base\compiletime_warning.hpp" /> <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp" /> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_arch.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_compiler.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/openmpt123.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/openmpt123.vcxproj.filters Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2017winxp/openmpt123.vcxproj.filters Thu Aug 15 11:38:58 2024 (r21439) @@ -108,6 +108,9 @@ <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp"> + <Filter>src\mpt\base</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\base\detect.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj Thu Aug 15 11:38:58 2024 (r21439) @@ -674,6 +674,7 @@ <ClInclude Include="..\..\src\mpt\base\check_platform.hpp" /> <ClInclude Include="..\..\src\mpt\base\compiletime_warning.hpp" /> <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp" /> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_arch.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_compiler.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj.filters Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj.filters Thu Aug 15 11:38:58 2024 (r21439) @@ -327,6 +327,9 @@ <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp"> + <Filter>src\mpt\base</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\base\detect.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj Thu Aug 15 11:38:58 2024 (r21439) @@ -999,6 +999,7 @@ <ClInclude Include="..\..\src\mpt\base\check_platform.hpp" /> <ClInclude Include="..\..\src\mpt\base\compiletime_warning.hpp" /> <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp" /> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_arch.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_compiler.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters Thu Aug 15 11:38:58 2024 (r21439) @@ -948,6 +948,9 @@ <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp"> + <Filter>src\mpt\base</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\base\detect.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj Thu Aug 15 11:38:58 2024 (r21439) @@ -691,6 +691,7 @@ <ClInclude Include="..\..\src\mpt\base\check_platform.hpp" /> <ClInclude Include="..\..\src\mpt\base\compiletime_warning.hpp" /> <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp" /> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_arch.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_compiler.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj.filters Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj.filters Thu Aug 15 11:38:58 2024 (r21439) @@ -345,6 +345,9 @@ <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp"> + <Filter>src\mpt\base</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\base\detect.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj Thu Aug 15 11:38:58 2024 (r21439) @@ -999,6 +999,7 @@ <ClInclude Include="..\..\src\mpt\base\check_platform.hpp" /> <ClInclude Include="..\..\src\mpt\base\compiletime_warning.hpp" /> <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp" /> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_arch.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_compiler.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters Thu Aug 15 11:38:58 2024 (r21439) @@ -948,6 +948,9 @@ <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp"> + <Filter>src\mpt\base</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\base\detect.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj Thu Aug 15 11:38:58 2024 (r21439) @@ -999,6 +999,7 @@ <ClInclude Include="..\..\src\mpt\base\check_platform.hpp" /> <ClInclude Include="..\..\src\mpt\base\compiletime_warning.hpp" /> <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp" /> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_arch.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_compiler.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters Thu Aug 15 11:38:58 2024 (r21439) @@ -948,6 +948,9 @@ <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp"> + <Filter>src\mpt\base</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\base\detect.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxpansi/PluginBridge.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/PluginBridge.vcxproj Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2017winxpansi/PluginBridge.vcxproj Thu Aug 15 11:38:58 2024 (r21439) @@ -741,6 +741,7 @@ <ClInclude Include="..\..\src\mpt\base\check_platform.hpp" /> <ClInclude Include="..\..\src\mpt\base\compiletime_warning.hpp" /> <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp" /> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_arch.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_compiler.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/PluginBridge.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/PluginBridge.vcxproj.filters Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2017winxpansi/PluginBridge.vcxproj.filters Thu Aug 15 11:38:58 2024 (r21439) @@ -234,6 +234,9 @@ <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp"> + <Filter>src\mpt\base</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\base\detect.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxpansi/PluginBridgeLegacy.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/PluginBridgeLegacy.vcxproj Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2017winxpansi/PluginBridgeLegacy.vcxproj Thu Aug 15 11:38:58 2024 (r21439) @@ -747,6 +747,7 @@ <ClInclude Include="..\..\src\mpt\base\check_platform.hpp" /> <ClInclude Include="..\..\src\mpt\base\compiletime_warning.hpp" /> <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp" /> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_arch.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_compiler.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/PluginBridgeLegacy.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/PluginBridgeLegacy.vcxproj.filters Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2017winxpansi/PluginBridgeLegacy.vcxproj.filters Thu Aug 15 11:38:58 2024 (r21439) @@ -234,6 +234,9 @@ <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp"> + <Filter>src\mpt\base</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\base\detect.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj Thu Aug 15 11:38:58 2024 (r21439) @@ -779,6 +779,7 @@ <ClInclude Include="..\..\src\mpt\base\check_platform.hpp" /> <ClInclude Include="..\..\src\mpt\base\compiletime_warning.hpp" /> <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp" /> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_arch.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_compiler.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters Thu Aug 15 11:38:58 2024 (r21439) @@ -570,6 +570,9 @@ <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp"> + <Filter>src\mpt\base</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\base\detect.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj Thu Aug 15 11:38:58 2024 (r21439) @@ -779,6 +779,7 @@ <ClInclude Include="..\..\src\mpt\base\check_platform.hpp" /> <ClInclude Include="..\..\src\mpt\base\compiletime_warning.hpp" /> <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp" /> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_arch.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_compiler.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj.filters Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj.filters Thu Aug 15 11:38:58 2024 (r21439) @@ -570,6 +570,9 @@ <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp"> + <Filter>src\mpt\base</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\base\detect.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj Thu Aug 15 11:38:58 2024 (r21439) @@ -809,6 +809,7 @@ <ClInclude Include="..\..\src\mpt\base\check_platform.hpp" /> <ClInclude Include="..\..\src\mpt\base\compiletime_warning.hpp" /> <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp" /> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_arch.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_compiler.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters Thu Aug 15 11:38:58 2024 (r21439) @@ -582,6 +582,9 @@ <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp"> + <Filter>src\mpt\base</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\base\detect.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxpansi/openmpt123.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/openmpt123.vcxproj Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2017winxpansi/openmpt123.vcxproj Thu Aug 15 11:38:58 2024 (r21439) @@ -754,6 +754,7 @@ <ClInclude Include="..\..\src\mpt\base\check_platform.hpp" /> <ClInclude Include="..\..\src\mpt\base\compiletime_warning.hpp" /> <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp" /> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_arch.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_compiler.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/openmpt123.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/openmpt123.vcxproj.filters Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2017winxpansi/openmpt123.vcxproj.filters Thu Aug 15 11:38:58 2024 (r21439) @@ -108,6 +108,9 @@ <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp"> + <Filter>src\mpt\base</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\base\detect.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj Thu Aug 15 11:38:58 2024 (r21439) @@ -674,6 +674,7 @@ <ClInclude Include="..\..\src\mpt\base\check_platform.hpp" /> <ClInclude Include="..\..\src\mpt\base\compiletime_warning.hpp" /> <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp" /> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_arch.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_compiler.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj.filters Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj.filters Thu Aug 15 11:38:58 2024 (r21439) @@ -327,6 +327,9 @@ <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp"> + <Filter>src\mpt\base</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\base\detect.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj Thu Aug 15 11:38:58 2024 (r21439) @@ -1774,6 +1774,7 @@ <ClInclude Include="..\..\src\mpt\base\check_platform.hpp" /> <ClInclude Include="..\..\src\mpt\base\compiletime_warning.hpp" /> <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp" /> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_arch.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_compiler.hpp" /> Modified: trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj.filters Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj.filters Thu Aug 15 11:38:58 2024 (r21439) @@ -990,6 +990,9 @@ <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp"> + <Filter>src\mpt\base</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\base\detect.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2019win10/OpenMPT-NativeSupport.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win10/OpenMPT-NativeSupport.vcxproj Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2019win10/OpenMPT-NativeSupport.vcxproj Thu Aug 15 11:38:58 2024 (r21439) @@ -1322,6 +1322,7 @@ <ClInclude Include="..\..\src\mpt\base\check_platform.hpp" /> <ClInclude Include="..\..\src\mpt\base\compiletime_warning.hpp" /> <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp" /> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_arch.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_compiler.hpp" /> Modified: trunk/OpenMPT/build/vs2019win10/OpenMPT-NativeSupport.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win10/OpenMPT-NativeSupport.vcxproj.filters Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2019win10/OpenMPT-NativeSupport.vcxproj.filters Thu Aug 15 11:38:58 2024 (r21439) @@ -387,6 +387,9 @@ <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp"> + <Filter>src\mpt\base</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\base\detect.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2019win10/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win10/OpenMPT-UTF8.vcxproj Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2019win10/OpenMPT-UTF8.vcxproj Thu Aug 15 11:38:58 2024 (r21439) @@ -1774,6 +1774,7 @@ <ClInclude Include="..\..\src\mpt\base\check_platform.hpp" /> <ClInclude Include="..\..\src\mpt\base\compiletime_warning.hpp" /> <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp" /> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_arch.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_compiler.hpp" /> Modified: trunk/OpenMPT/build/vs2019win10/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win10/OpenMPT-UTF8.vcxproj.filters Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2019win10/OpenMPT-UTF8.vcxproj.filters Thu Aug 15 11:38:58 2024 (r21439) @@ -990,6 +990,9 @@ <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp"> + <Filter>src\mpt\base</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\base\detect.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2019win10/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win10/OpenMPT.vcxproj Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2019win10/OpenMPT.vcxproj Thu Aug 15 11:38:58 2024 (r21439) @@ -1774,6 +1774,7 @@ <ClInclude Include="..\..\src\mpt\base\check_platform.hpp" /> <ClInclude Include="..\..\src\mpt\base\compiletime_warning.hpp" /> <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp" /> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_arch.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_compiler.hpp" /> Modified: trunk/OpenMPT/build/vs2019win10/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win10/OpenMPT.vcxproj.filters Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2019win10/OpenMPT.vcxproj.filters Thu Aug 15 11:38:58 2024 (r21439) @@ -990,6 +990,9 @@ <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp"> + <Filter>src\mpt\base</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\base\detect.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2019win10/PluginBridge.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win10/PluginBridge.vcxproj Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2019win10/PluginBridge.vcxproj Thu Aug 15 11:38:58 2024 (r21439) @@ -1446,6 +1446,7 @@ <ClInclude Include="..\..\src\mpt\base\check_platform.hpp" /> <ClInclude Include="..\..\src\mpt\base\compiletime_warning.hpp" /> <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp" /> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_arch.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_compiler.hpp" /> Modified: trunk/OpenMPT/build/vs2019win10/PluginBridge.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win10/PluginBridge.vcxproj.filters Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2019win10/PluginBridge.vcxproj.filters Thu Aug 15 11:38:58 2024 (r21439) @@ -240,6 +240,9 @@ <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp"> + <Filter>src\mpt\base</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\base\detect.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2019win10/PluginBridgeLegacy.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win10/PluginBridgeLegacy.vcxproj Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2019win10/PluginBridgeLegacy.vcxproj Thu Aug 15 11:38:58 2024 (r21439) @@ -1446,6 +1446,7 @@ <ClInclude Include="..\..\src\mpt\base\check_platform.hpp" /> <ClInclude Include="..\..\src\mpt\base\compiletime_warning.hpp" /> <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp" /> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_arch.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_compiler.hpp" /> Modified: trunk/OpenMPT/build/vs2019win10/PluginBridgeLegacy.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win10/PluginBridgeLegacy.vcxproj.filters Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2019win10/PluginBridgeLegacy.vcxproj.filters Thu Aug 15 11:38:58 2024 (r21439) @@ -240,6 +240,9 @@ <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp"> + <Filter>src\mpt\base</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\base\detect.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2019win10/libopenmpt-small.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win10/libopenmpt-small.vcxproj Wed Aug 14 16:45:19 2024 (r21438) +++ trunk/OpenMPT/build/vs2019win10/libopenmpt-small.vcxproj Thu Aug 15 11:38:58 2024 (r21439) @@ -1406,6 +1406,7 @@ <ClInclude Include="..\..\src\mpt\base\check_platform.hpp" /> <ClInclude Include="..\..\src\mpt\base\compiletime_warning.hpp" /> <ClInclude Include="..\..\src\mpt\base\constexpr_throw.hpp" /> + <ClInclude Include="..\..\src\mpt\base\debugging.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_arch.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_compiler.hpp" /> Modi... [truncated message content] |
From: <sv...@op...> - 2024-08-14 14:45:31
|
Author: manx Date: Wed Aug 14 16:45:19 2024 New Revision: 21438 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21438 Log: [Var] Run clang-format. Modified: trunk/OpenMPT/src/mpt/base/algorithm.hpp Modified: trunk/OpenMPT/src/mpt/base/algorithm.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/base/algorithm.hpp Wed Aug 14 16:36:34 2024 (r21437) +++ trunk/OpenMPT/src/mpt/base/algorithm.hpp Wed Aug 14 16:45:19 2024 (r21438) @@ -59,16 +59,16 @@ struct has_find<Container, Ret(Args...)> { private: template <typename T> - static constexpr inline auto check(T *) -> typename std::is_same<decltype(std::declval<T>().find(std::declval<Args>()...)), Ret>::type { + static constexpr inline auto check(T *) -> typename std::is_same<decltype(std::declval<T>().find(std::declval<Args>()...)), Ret>::type { return {}; } - template <typename T> + template <typename T> static constexpr inline std::false_type check(...) { return {}; } public: - typedef decltype(check<Container>(nullptr)) type; - static constexpr inline bool value = type::value; + typedef decltype(check<Container>(nullptr)) type; + static constexpr inline bool value = type::value; }; template <typename Tcontainer, typename Tval> |
From: <sv...@op...> - 2024-08-14 14:36:41
|
Author: manx Date: Wed Aug 14 16:36:34 2024 New Revision: 21437 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21437 Log: [Ref] Use mpt::contains again. It is fast now. Modified: trunk/OpenMPT/soundlib/plugins/PluginManager.cpp Modified: trunk/OpenMPT/soundlib/plugins/PluginManager.cpp ============================================================================== --- trunk/OpenMPT/soundlib/plugins/PluginManager.cpp Wed Aug 14 16:35:23 2024 (r21436) +++ trunk/OpenMPT/soundlib/plugins/PluginManager.cpp Wed Aug 14 16:36:34 2024 (r21437) @@ -820,7 +820,7 @@ size_t deleted = 0; for(const auto &[id, i] : existingCandidates) { - if(auto it = containedIDs.find(id); it == containedIDs.end() && !pluginList[i - deleted]->pPluginsList) + if(!mpt::contains(containedIDs, id) && !pluginList[i - deleted]->pPluginsList) { MPT_ASSERT(pluginList[i - deleted]->shellPluginID == id); pluginList.erase(pluginList.begin() + i - deleted); |
From: <sv...@op...> - 2024-08-14 14:35:36
|
Author: manx Date: Wed Aug 14 16:35:23 2024 New Revision: 21436 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21436 Log: [Imp] mpt/base/algorithm.hpp: Use member find() instead of iterator find() when available. The reduces runtime complexity with associative containers. Modified: trunk/OpenMPT/src/mpt/base/algorithm.hpp Modified: trunk/OpenMPT/src/mpt/base/algorithm.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/base/algorithm.hpp Wed Aug 14 11:25:40 2024 (r21435) +++ trunk/OpenMPT/src/mpt/base/algorithm.hpp Wed Aug 14 16:35:23 2024 (r21436) @@ -12,6 +12,7 @@ #include <algorithm> #include <limits> +#include <type_traits> @@ -47,11 +48,57 @@ } +namespace detail { +namespace contains { + +template <typename Container, typename Signature> +struct has_find : std::false_type { +}; + +template <typename Container, typename Ret, typename... Args> +struct has_find<Container, Ret(Args...)> { +private: + template <typename T> + static constexpr inline auto check(T *) -> typename std::is_same<decltype(std::declval<T>().find(std::declval<Args>()...)), Ret>::type { + return {}; + } + template <typename T> + static constexpr inline std::false_type check(...) { + return {}; + } +public: + typedef decltype(check<Container>(nullptr)) type; + static constexpr inline bool value = type::value; +}; + +template <typename Tcontainer, typename Tval> +MPT_CONSTEXPR20_FUN bool contains_class_find_impl(const Tcontainer & container, const Tval & value, std::true_type) noexcept(noexcept(container.find(value) != container.end())) { + return container.find(value) != container.end(); +} + +template <typename Tcontainer, typename Tval> +MPT_CONSTEXPR20_FUN bool contains_class_find_impl(const Tcontainer & container, const Tval & value, std::false_type) noexcept(noexcept(std::find(std::begin(container), std::end(container), value))) { + return std::find(std::begin(container), std::end(container), value) != std::end(container); +} + +template <typename Tcontainer, typename Tval> +MPT_CONSTEXPR20_FUN bool contains_class_impl(const Tcontainer & container, const Tval & value, std::true_type) noexcept(noexcept(mpt::detail::contains::contains_class_find_impl<Tcontainer, Tval>(container, value, typename mpt::detail::contains::has_find<Tcontainer, typename Tcontainer::iterator(Tval)>::type{}))) { + return mpt::detail::contains::contains_class_find_impl<Tcontainer, Tval>(container, value, typename mpt::detail::contains::has_find<Tcontainer, typename Tcontainer::iterator(Tval)>::type{}); +} + template <typename Tcontainer, typename Tval> -MPT_CONSTEXPR20_FUN bool contains(const Tcontainer & container, const Tval & value) noexcept(noexcept(std::find(std::begin(container), std::end(container), value))) { +MPT_CONSTEXPR20_FUN bool contains_class_impl(const Tcontainer & container, const Tval & value, std::false_type) noexcept(noexcept(std::find(std::begin(container), std::end(container), value))) { return std::find(std::begin(container), std::end(container), value) != std::end(container); } +} // namespace contains +} // namespace detail + +template <typename Tcontainer, typename Tval> +MPT_CONSTEXPR20_FUN bool contains(const Tcontainer & container, const Tval & value) noexcept(noexcept(mpt::detail::contains::contains_class_impl<Tcontainer, Tval>(container, value, typename std::is_class<Tcontainer>::type{}))) { + return mpt::detail::contains::contains_class_impl<Tcontainer, Tval>(container, value, typename std::is_class<Tcontainer>::type{}); +} + } // namespace MPT_INLINE_NS } // namespace mpt |
From: <sv...@op...> - 2024-08-14 09:25:53
|
Author: manx Date: Wed Aug 14 11:25:40 2024 New Revision: 21435 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21435 Log: Merged revision(s) 21433 from trunk/OpenMPT: [Ref] mpt/base/detect_compiler.hpp: Detect VS2022 17.11. ........ Modified: branches/OpenMPT-1.30/ (props changed) branches/OpenMPT-1.30/src/mpt/base/detect_compiler.hpp Modified: branches/OpenMPT-1.30/src/mpt/base/detect_compiler.hpp ============================================================================== --- branches/OpenMPT-1.30/src/mpt/base/detect_compiler.hpp Wed Aug 14 11:25:17 2024 (r21434) +++ branches/OpenMPT-1.30/src/mpt/base/detect_compiler.hpp Wed Aug 14 11:25:40 2024 (r21435) @@ -50,7 +50,9 @@ #elif defined(_MSC_VER) #define MPT_COMPILER_MSVC 1 -#if (_MSC_VER >= 1940) +#if (_MSC_VER >= 1941) +#define MPT_COMPILER_MSVC_VERSION MPT_COMPILER_MAKE_VERSION2(2022, 11) +#elif (_MSC_VER >= 1940) #define MPT_COMPILER_MSVC_VERSION MPT_COMPILER_MAKE_VERSION2(2022, 10) #elif (_MSC_VER >= 1939) #define MPT_COMPILER_MSVC_VERSION MPT_COMPILER_MAKE_VERSION2(2022, 9) |
From: <sv...@op...> - 2024-08-14 09:25:29
|
Author: manx Date: Wed Aug 14 11:25:17 2024 New Revision: 21434 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21434 Log: Merged revision(s) 21433 from trunk/OpenMPT: [Ref] mpt/base/detect_compiler.hpp: Detect VS2022 17.11. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/src/mpt/base/detect_compiler.hpp Modified: branches/OpenMPT-1.31/src/mpt/base/detect_compiler.hpp ============================================================================== --- branches/OpenMPT-1.31/src/mpt/base/detect_compiler.hpp Wed Aug 14 11:24:52 2024 (r21433) +++ branches/OpenMPT-1.31/src/mpt/base/detect_compiler.hpp Wed Aug 14 11:25:17 2024 (r21434) @@ -50,7 +50,9 @@ #elif defined(_MSC_VER) #define MPT_COMPILER_MSVC 1 -#if (_MSC_VER >= 1940) +#if (_MSC_VER >= 1941) +#define MPT_COMPILER_MSVC_VERSION MPT_COMPILER_MAKE_VERSION2(2022, 11) +#elif (_MSC_VER >= 1940) #define MPT_COMPILER_MSVC_VERSION MPT_COMPILER_MAKE_VERSION2(2022, 10) #elif (_MSC_VER >= 1939) #define MPT_COMPILER_MSVC_VERSION MPT_COMPILER_MAKE_VERSION2(2022, 9) |
From: <sv...@op...> - 2024-08-14 09:24:59
|
Author: manx Date: Wed Aug 14 11:24:52 2024 New Revision: 21433 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21433 Log: [Ref] mpt/base/detect_compiler.hpp: Detect VS2022 17.11. Modified: trunk/OpenMPT/src/mpt/base/detect_compiler.hpp Modified: trunk/OpenMPT/src/mpt/base/detect_compiler.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/base/detect_compiler.hpp Wed Aug 14 11:24:07 2024 (r21432) +++ trunk/OpenMPT/src/mpt/base/detect_compiler.hpp Wed Aug 14 11:24:52 2024 (r21433) @@ -50,7 +50,9 @@ #elif defined(_MSC_VER) #define MPT_COMPILER_MSVC 1 -#if (_MSC_VER >= 1940) +#if (_MSC_VER >= 1941) +#define MPT_COMPILER_MSVC_VERSION MPT_COMPILER_MAKE_VERSION2(2022, 11) +#elif (_MSC_VER >= 1940) #define MPT_COMPILER_MSVC_VERSION MPT_COMPILER_MAKE_VERSION2(2022, 10) #elif (_MSC_VER >= 1939) #define MPT_COMPILER_MSVC_VERSION MPT_COMPILER_MAKE_VERSION2(2022, 9) |
From: <sv...@op...> - 2024-08-14 09:24:18
|
Author: manx Date: Wed Aug 14 11:24:07 2024 New Revision: 21432 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21432 Log: Merged revision(s) 21428 from trunk/OpenMPT: [Fix] GCC 14 optimizer is still on crack. ........ Modified: branches/OpenMPT-1.28/ (props changed) branches/OpenMPT-1.28/soundlib/Load_xm.cpp Modified: branches/OpenMPT-1.28/soundlib/Load_xm.cpp ============================================================================== --- branches/OpenMPT-1.28/soundlib/Load_xm.cpp Wed Aug 14 11:23:45 2024 (r21431) +++ branches/OpenMPT-1.28/soundlib/Load_xm.cpp Wed Aug 14 11:24:07 2024 (r21432) @@ -753,8 +753,8 @@ #define str_tooMuchPatternData ("Warning: File format limit was reached. Some pattern data may not get written to file.") #define str_pattern ("pattern") -#if MPT_GCC_AT_LEAST(13, 0, 0) && MPT_GCC_BEFORE(14, 1, 0) -// work-around massively confused GCC 13 optimizer: +#if MPT_GCC_AT_LEAST(13, 0, 0) && MPT_GCC_BEFORE(15, 1, 0) +// work-around massively confused GCC 13/14 optimizer: // /usr/include/c++/13/bits/stl_algobase.h:437:30: warning: 'void* __builtin_memcpy(void*, const void*, long unsigned int)' writing between 3 and 9223372036854775806 bytes into a region of size 0 overflows the destination [-Wstringop-overflow=] template <typename Tcont2, typename Tcont1> static MPT_NOINLINE Tcont1 & gcc_append(Tcont1 & cont1, const Tcont2 & cont2) { @@ -1034,7 +1034,7 @@ } } -#if MPT_GCC_AT_LEAST(13, 0, 0) && MPT_GCC_BEFORE(14, 1, 0) +#if MPT_GCC_AT_LEAST(13, 0, 0) && MPT_GCC_BEFORE(15, 1, 0) gcc_append(samples, additionalSamples); #else samples.insert(samples.end(), additionalSamples.begin(), additionalSamples.end()); |
From: <sv...@op...> - 2024-08-14 09:23:52
|
Author: manx Date: Wed Aug 14 11:23:45 2024 New Revision: 21431 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21431 Log: Merged revision(s) 21428 from trunk/OpenMPT: [Fix] GCC 14 optimizer is still on crack. ........ Modified: branches/OpenMPT-1.29/ (props changed) branches/OpenMPT-1.29/soundlib/Load_xm.cpp Modified: branches/OpenMPT-1.29/soundlib/Load_xm.cpp ============================================================================== --- branches/OpenMPT-1.29/soundlib/Load_xm.cpp Wed Aug 14 11:23:23 2024 (r21430) +++ branches/OpenMPT-1.29/soundlib/Load_xm.cpp Wed Aug 14 11:23:45 2024 (r21431) @@ -1047,8 +1047,8 @@ #define str_tooMuchPatternData ("Warning: File format limit was reached. Some pattern data may not get written to file.") #define str_pattern ("pattern") -#if MPT_GCC_AT_LEAST(13, 0, 0) && MPT_GCC_BEFORE(14, 1, 0) -// work-around massively confused GCC 13 optimizer: +#if MPT_GCC_AT_LEAST(13, 0, 0) && MPT_GCC_BEFORE(15, 1, 0) +// work-around massively confused GCC 13/14 optimizer: // /usr/include/c++/13/bits/stl_algobase.h:437:30: warning: 'void* __builtin_memcpy(void*, const void*, long unsigned int)' writing between 3 and 9223372036854775806 bytes into a region of size 0 overflows the destination [-Wstringop-overflow=] template <typename Tcont2, typename Tcont1> static MPT_NOINLINE Tcont1 & gcc_append(Tcont1 & cont1, const Tcont2 & cont2) { @@ -1328,7 +1328,7 @@ } } -#if MPT_GCC_AT_LEAST(13, 0, 0) && MPT_GCC_BEFORE(14, 1, 0) +#if MPT_GCC_AT_LEAST(13, 0, 0) && MPT_GCC_BEFORE(15, 1, 0) gcc_append(samples, additionalSamples); #else samples.insert(samples.end(), additionalSamples.begin(), additionalSamples.end()); |
From: <sv...@op...> - 2024-08-14 09:23:30
|
Author: manx Date: Wed Aug 14 11:23:23 2024 New Revision: 21430 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21430 Log: Merged revision(s) 21428 from trunk/OpenMPT: [Fix] GCC 14 optimizer is still on crack. ........ Modified: branches/OpenMPT-1.30/ (props changed) branches/OpenMPT-1.30/soundlib/Load_xm.cpp Modified: branches/OpenMPT-1.30/soundlib/Load_xm.cpp ============================================================================== --- branches/OpenMPT-1.30/soundlib/Load_xm.cpp Wed Aug 14 11:23:00 2024 (r21429) +++ branches/OpenMPT-1.30/soundlib/Load_xm.cpp Wed Aug 14 11:23:23 2024 (r21430) @@ -1044,8 +1044,8 @@ #ifndef MODPLUG_NO_FILESAVE -#if MPT_GCC_AT_LEAST(13, 0, 0) && MPT_GCC_BEFORE(14, 1, 0) -// work-around massively confused GCC 13 optimizer: +#if MPT_GCC_AT_LEAST(13, 0, 0) && MPT_GCC_BEFORE(15, 1, 0) +// work-around massively confused GCC 13/14 optimizer: // /usr/include/c++/13/bits/stl_algobase.h:437:30: warning: 'void* __builtin_memcpy(void*, const void*, long unsigned int)' writing between 3 and 9223372036854775806 bytes into a region of size 0 overflows the destination [-Wstringop-overflow=] template <typename Tcont2, typename Tcont1> static MPT_NOINLINE Tcont1 & gcc_append(Tcont1 & cont1, const Tcont2 & cont2) { @@ -1326,7 +1326,7 @@ } } -#if MPT_GCC_AT_LEAST(13, 0, 0) && MPT_GCC_BEFORE(14, 1, 0) +#if MPT_GCC_AT_LEAST(13, 0, 0) && MPT_GCC_BEFORE(15, 1, 0) gcc_append(samples, additionalSamples); #else mpt::append(samples, additionalSamples); |
From: <sv...@op...> - 2024-08-14 09:23:07
|
Author: manx Date: Wed Aug 14 11:23:00 2024 New Revision: 21429 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21429 Log: Merged revision(s) 21428 from trunk/OpenMPT: [Fix] GCC 14 optimizer is still on crack. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/soundlib/Load_xm.cpp Modified: branches/OpenMPT-1.31/soundlib/Load_xm.cpp ============================================================================== --- branches/OpenMPT-1.31/soundlib/Load_xm.cpp Wed Aug 14 11:22:38 2024 (r21428) +++ branches/OpenMPT-1.31/soundlib/Load_xm.cpp Wed Aug 14 11:23:00 2024 (r21429) @@ -1135,8 +1135,8 @@ #ifndef MODPLUG_NO_FILESAVE -#if MPT_GCC_AT_LEAST(13, 0, 0) && MPT_GCC_BEFORE(14, 1, 0) -// work-around massively confused GCC 13 optimizer: +#if MPT_GCC_AT_LEAST(13, 0, 0) && MPT_GCC_BEFORE(15, 1, 0) +// work-around massively confused GCC 13/14 optimizer: // /usr/include/c++/13/bits/stl_algobase.h:437:30: warning: 'void* __builtin_memcpy(void*, const void*, long unsigned int)' writing between 3 and 9223372036854775806 bytes into a region of size 0 overflows the destination [-Wstringop-overflow=] template <typename Tcont2, typename Tcont1> static MPT_NOINLINE Tcont1 & gcc_append(Tcont1 & cont1, const Tcont2 & cont2) { @@ -1417,7 +1417,7 @@ } } -#if MPT_GCC_AT_LEAST(13, 0, 0) && MPT_GCC_BEFORE(14, 1, 0) +#if MPT_GCC_AT_LEAST(13, 0, 0) && MPT_GCC_BEFORE(15, 1, 0) gcc_append(samples, additionalSamples); #else mpt::append(samples, additionalSamples); |
From: <sv...@op...> - 2024-08-14 09:22:45
|
Author: manx Date: Wed Aug 14 11:22:38 2024 New Revision: 21428 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21428 Log: [Fix] GCC 14 optimizer is still on crack. Modified: trunk/OpenMPT/soundlib/Load_xm.cpp Modified: trunk/OpenMPT/soundlib/Load_xm.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_xm.cpp Wed Aug 14 11:22:06 2024 (r21427) +++ trunk/OpenMPT/soundlib/Load_xm.cpp Wed Aug 14 11:22:38 2024 (r21428) @@ -1133,8 +1133,8 @@ #ifndef MODPLUG_NO_FILESAVE -#if MPT_GCC_AT_LEAST(13, 0, 0) && MPT_GCC_BEFORE(14, 1, 0) -// work-around massively confused GCC 13 optimizer: +#if MPT_GCC_AT_LEAST(13, 0, 0) && MPT_GCC_BEFORE(15, 1, 0) +// work-around massively confused GCC 13/14 optimizer: // /usr/include/c++/13/bits/stl_algobase.h:437:30: warning: 'void* __builtin_memcpy(void*, const void*, long unsigned int)' writing between 3 and 9223372036854775806 bytes into a region of size 0 overflows the destination [-Wstringop-overflow=] template <typename Tcont2, typename Tcont1> static MPT_NOINLINE Tcont1 & gcc_append(Tcont1 & cont1, const Tcont2 & cont2) { @@ -1415,7 +1415,7 @@ } } -#if MPT_GCC_AT_LEAST(13, 0, 0) && MPT_GCC_BEFORE(14, 1, 0) +#if MPT_GCC_AT_LEAST(13, 0, 0) && MPT_GCC_BEFORE(15, 1, 0) gcc_append(samples, additionalSamples); #else mpt::append(samples, additionalSamples); |
From: <sv...@op...> - 2024-08-14 09:22:24
|
Author: manx Date: Wed Aug 14 11:22:06 2024 New Revision: 21427 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21427 Log: [Var] Update 7-zip to 24.08. Modified: branches/OpenMPT-1.31/build/download_externals.cmd Modified: branches/OpenMPT-1.31/build/download_externals.cmd ============================================================================== --- branches/OpenMPT-1.31/build/download_externals.cmd Wed Aug 14 11:21:58 2024 (r21426) +++ branches/OpenMPT-1.31/build/download_externals.cmd Wed Aug 14 11:22:06 2024 (r21427) @@ -31,9 +31,9 @@ call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://7-zip.org/a/7za920.zip" "build\externals\7za920.zip" 84e830c91a0e8ae499cc4814080da6569d8a6acbddc585c8b62abc86c809793aeb669b0a741063a379fd281ade85f120bc27efeb67d63bf961be893eec8bc3b3 384846 || goto error -call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://7-zip.org/a/7z2407-extra.7z" "build\externals\7z2407-extra.7z" bad57efe210540001da6e02bd31507d0ee00b7d0978eb4e0a0b564acd927860c6f2e9bad4d5aa14616aa058192514e678f7be9f818de90e251367e9170a66627 1610146 || goto error +call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://7-zip.org/a/7z2408-extra.7z" "build\externals\7z2408-extra.7z" 35f55236fccfb576ca014e29d0c35f4a213e53f06683bd2e82f869ed02506e230c8dd623c01d0207244d6a997031f737903456b7ad4a44db1717f0a17a78602e 1611651 || goto error -call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://7-zip.org/a/7z2407-x64.exe" "build\externals\7z2407-x64.exe" c6ba7770de0302dd90b04393a47dd7d80a0de26fab0bc11e147bf356e3e54ec69ba78e3df05f4f8718ba08ccaefbd6ea0409857973af3b6b57d271762685823a 1620576 || goto error +call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://7-zip.org/a/7z2408-x64.exe" "build\externals\7z2408-x64.exe" 850382414d9d33eab134f8bd89dc99759f8d0459b7ad48bd9588405a3705aeb2cd727898529e3f71d9776a42e141c717e844e0b5c358818bbeac01d096907ad1 1624144 || goto error call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://web.archive.org/web/20131217072017id_/http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" "build\externals\WA5.55_SDK.exe" 394375db8a16bf155b5de9376f6290488ab339e503dbdfdc4e2f5bede967799e625c559cca363bc988324f1a8e86e5fd28a9f697422abd7bb3dcde4a766607b5 336166 || goto error @@ -65,8 +65,8 @@ rem Get 7zip installer and unpack it with current commandline 7zip rem This is a mess for automation. Oh well. cscript build\scriptlib\unpack-zip.vbs "build\externals\7za920.zip" "build\tools\7zipold" || goto error -build\tools\7zipold\7za.exe x -y -obuild\tools\7zipa "build\externals\7z2407-extra.7z" || goto error -build\tools\7zipa\7za.exe x -y -obuild\tools\7zip "build\externals\7z2407-x64.exe" || goto error +build\tools\7zipold\7za.exe x -y -obuild\tools\7zipa "build\externals\7z2408-extra.7z" || goto error +build\tools\7zipa\7za.exe x -y -obuild\tools\7zip "build\externals\7z2408-x64.exe" || goto error call build\scriptlib\unpack.cmd "build\tools\htmlhelp" "build\externals\htmlhelp.exe" "." || goto error |
From: <sv...@op...> - 2024-08-14 09:22:11
|
Author: manx Date: Wed Aug 14 11:21:58 2024 New Revision: 21426 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21426 Log: [Var] Update 7-zip to 24.08. Modified: trunk/OpenMPT/build/download_externals.cmd trunk/OpenMPT/build/download_externals.txt Modified: trunk/OpenMPT/build/download_externals.cmd ============================================================================== --- trunk/OpenMPT/build/download_externals.cmd Tue Aug 13 16:27:35 2024 (r21425) +++ trunk/OpenMPT/build/download_externals.cmd Wed Aug 14 11:21:58 2024 (r21426) @@ -39,8 +39,8 @@ rem Get 7zip installer and unpack it with current commandline 7zip rem This is a mess for automation. Oh well. cscript build\scriptlib\unpack-zip.vbs "build\externals\7za920.zip" "build\tools\7zipold" || goto error -build\tools\7zipold\7za.exe x -y -obuild\tools\7zipa "build\externals\7z2407-extra.7z" || goto error -build\tools\7zipa\7za.exe x -y -obuild\tools\7zip "build\externals\7z2407-x64.exe" || goto error +build\tools\7zipold\7za.exe x -y -obuild\tools\7zipa "build\externals\7z2408-extra.7z" || goto error +build\tools\7zipa\7za.exe x -y -obuild\tools\7zip "build\externals\7z2408-x64.exe" || goto error call build\scriptlib\unpack.cmd "build\tools\htmlhelp" "build\externals\htmlhelp.exe" "." || goto error Modified: trunk/OpenMPT/build/download_externals.txt ============================================================================== --- trunk/OpenMPT/build/download_externals.txt Tue Aug 13 16:27:35 2024 (r21425) +++ trunk/OpenMPT/build/download_externals.txt Wed Aug 14 11:21:58 2024 (r21426) @@ -1,6 +1,6 @@ "build/externals/7za920.zip" 384846 84e830c91a0e8ae499cc4814080da6569d8a6acbddc585c8b62abc86c809793aeb669b0a741063a379fd281ade85f120bc27efeb67d63bf961be893eec8bc3b3 "https://7-zip.org/a/7za920.zip" "https://netcologne.dl.sourceforge.net/project/sevenzip/7-Zip/9.20/7za920.zip" -"build/externals/7z2407-extra.7z" 1610146 bad57efe210540001da6e02bd31507d0ee00b7d0978eb4e0a0b564acd927860c6f2e9bad4d5aa14616aa058192514e678f7be9f818de90e251367e9170a66627 "https://7-zip.org/a/7z2407-extra.7z" "https://netcologne.dl.sourceforge.net/project/sevenzip/7-Zip/24.07/7z2407-extra.7z" -"build/externals/7z2407-x64.exe" 1620576 c6ba7770de0302dd90b04393a47dd7d80a0de26fab0bc11e147bf356e3e54ec69ba78e3df05f4f8718ba08ccaefbd6ea0409857973af3b6b57d271762685823a "https://7-zip.org/a/7z2407-x64.exe" "https://netcologne.dl.sourceforge.net/project/sevenzip/7-Zip/24.07/7z2407-x64.exe" +"build/externals/7z2408-extra.7z" 1611651 35f55236fccfb576ca014e29d0c35f4a213e53f06683bd2e82f869ed02506e230c8dd623c01d0207244d6a997031f737903456b7ad4a44db1717f0a17a78602e "https://7-zip.org/a/7z2408-extra.7z" "https://netcologne.dl.sourceforge.net/project/sevenzip/7-Zip/24.08/7z2408-extra.7z" +"build/externals/7z2408-x64.exe" 1624144 850382414d9d33eab134f8bd89dc99759f8d0459b7ad48bd9588405a3705aeb2cd727898529e3f71d9776a42e141c717e844e0b5c358818bbeac01d096907ad1 "https://7-zip.org/a/7z2408-x64.exe" "https://netcologne.dl.sourceforge.net/project/sevenzip/7-Zip/24.08/7z2408-x64.exe" "build/externals/WA5.55_SDK.exe" 336166 394375db8a16bf155b5de9376f6290488ab339e503dbdfdc4e2f5bede967799e625c559cca363bc988324f1a8e86e5fd28a9f697422abd7bb3dcde4a766607b5 "https://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" "http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" "https://web.archive.org/web/20131217072017id_/http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" "build/externals/xmp-sdk.zip" 322744 62c442d656d4bb380360368a0f5f01da11b4ed54333d7f54f875a9a5ec390b08921e00bd08e62cd7a0a5fe642e3377023f20a950cc2a42898ff4cda9ab88fc91 "https://www.un4seen.com/files/xmp-sdk.zip" "build/externals/htmlhelp.exe" 3509072 d91371244ea98c691b4674ee266c4a2496a296800c176adae069d21f5c52c0763b21cc7859cfffa865b89e50171a2c99a6d14620c32f7d72c0ef04045348f856 "https://web.archive.org/web/20200918004813id_/https://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe" "https://web.archive.org/web/20200918004813id_/http://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe" |
From: <sv...@op...> - 2024-08-13 14:27:47
|
Author: manx Date: Tue Aug 13 16:27:35 2024 New Revision: 21425 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21425 Log: Merged revision(s) 21421 from trunk/OpenMPT: [Ref] Silence MSVC static analyser brain-damage. ........ Modified: branches/OpenMPT-1.28/ (props changed) branches/OpenMPT-1.28/soundlib/Load_669.cpp Modified: branches/OpenMPT-1.28/soundlib/Load_669.cpp ============================================================================== --- branches/OpenMPT-1.28/soundlib/Load_669.cpp Tue Aug 13 16:27:09 2024 (r21424) +++ branches/OpenMPT-1.28/soundlib/Load_669.cpp Tue Aug 13 16:27:35 2024 (r21425) @@ -243,7 +243,15 @@ uint8 command = effect[chn] >> 4; if(command < static_cast<uint8>(CountOf(effTrans))) { +#if MPT_COMPILER_MSVC +#pragma warning(push) +// false-positive +#pragma warning(disable:6385) // Reading invalid data from 'effTrans'. +#endif m->command = effTrans[command]; +#if MPT_COMPILER_MSVC +#pragma warning(pop) +#endif } else { m->command = CMD_NONE; |
From: <sv...@op...> - 2024-08-13 14:27:21
|
Author: manx Date: Tue Aug 13 16:27:09 2024 New Revision: 21424 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21424 Log: Merged revision(s) 21421 from trunk/OpenMPT: [Ref] Silence MSVC static analyser brain-damage. ........ Modified: branches/OpenMPT-1.29/ (props changed) branches/OpenMPT-1.29/soundlib/Load_669.cpp Modified: branches/OpenMPT-1.29/soundlib/Load_669.cpp ============================================================================== --- branches/OpenMPT-1.29/soundlib/Load_669.cpp Tue Aug 13 16:26:40 2024 (r21423) +++ branches/OpenMPT-1.29/soundlib/Load_669.cpp Tue Aug 13 16:27:09 2024 (r21424) @@ -247,7 +247,15 @@ uint8 command = effect[chn] >> 4; if(command < static_cast<uint8>(CountOf(effTrans))) { +#if MPT_COMPILER_MSVC +#pragma warning(push) +// false-positive +#pragma warning(disable:6385) // Reading invalid data from 'effTrans'. +#endif m->command = effTrans[command]; +#if MPT_COMPILER_MSVC +#pragma warning(pop) +#endif } else { m->command = CMD_NONE; |
From: <sv...@op...> - 2024-08-13 14:26:52
|
Author: manx Date: Tue Aug 13 16:26:40 2024 New Revision: 21423 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21423 Log: Merged revision(s) 21421 from trunk/OpenMPT: [Ref] Silence MSVC static analyser brain-damage. ........ Modified: branches/OpenMPT-1.30/ (props changed) branches/OpenMPT-1.30/soundlib/Load_669.cpp Modified: branches/OpenMPT-1.30/soundlib/Load_669.cpp ============================================================================== --- branches/OpenMPT-1.30/soundlib/Load_669.cpp Tue Aug 13 16:25:03 2024 (r21422) +++ branches/OpenMPT-1.30/soundlib/Load_669.cpp Tue Aug 13 16:26:40 2024 (r21423) @@ -248,7 +248,15 @@ uint8 command = effect[chn] >> 4; if(command < static_cast<uint8>(std::size(effTrans))) { +#if MPT_COMPILER_MSVC +#pragma warning(push) +// false-positive +#pragma warning(disable:6385) // Reading invalid data from 'effTrans'. +#endif m->command = effTrans[command]; +#if MPT_COMPILER_MSVC +#pragma warning(pop) +#endif } else { m->command = CMD_NONE; |
From: <sv...@op...> - 2024-08-13 14:25:22
|
Author: manx Date: Tue Aug 13 16:25:03 2024 New Revision: 21422 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21422 Log: Merged revision(s) 21421 from trunk/OpenMPT: [Ref] Silence MSVC static analyser brain-damage. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/soundlib/Load_669.cpp Modified: branches/OpenMPT-1.31/soundlib/Load_669.cpp ============================================================================== --- branches/OpenMPT-1.31/soundlib/Load_669.cpp Tue Aug 13 16:23:16 2024 (r21421) +++ branches/OpenMPT-1.31/soundlib/Load_669.cpp Tue Aug 13 16:25:03 2024 (r21422) @@ -248,7 +248,15 @@ uint8 command = effect[chn] >> 4; if(command < static_cast<uint8>(std::size(effTrans))) { +#if MPT_COMPILER_MSVC +#pragma warning(push) +// false-positive +#pragma warning(disable:6385) // Reading invalid data from 'effTrans'. +#endif m->command = effTrans[command]; +#if MPT_COMPILER_MSVC +#pragma warning(pop) +#endif } else { m->command = CMD_NONE; |