Menu
▾
▴
modplug-svn-commit — OpenMPT subversion commit notifications
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
(1) |
Apr
(1) |
May
|
Jun
(1) |
Jul
|
Aug
(10) |
Sep
|
Oct
|
Nov
|
Dec
(3) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(1) |
Feb
(2) |
Mar
(3) |
Apr
(2) |
May
(10) |
Jun
(2) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
(3) |
Dec
|
| 2008 |
Jan
(6) |
Feb
(4) |
Mar
(5) |
Apr
(2) |
May
(1) |
Jun
(1) |
Jul
(4) |
Aug
(6) |
Sep
(2) |
Oct
(9) |
Nov
(1) |
Dec
(4) |
| 2009 |
Jan
(9) |
Feb
(2) |
Mar
(2) |
Apr
(2) |
May
(6) |
Jun
(18) |
Jul
(33) |
Aug
(39) |
Sep
(33) |
Oct
(24) |
Nov
(23) |
Dec
(22) |
| 2010 |
Jan
(29) |
Feb
(32) |
Mar
(51) |
Apr
(17) |
May
(31) |
Jun
(21) |
Jul
(32) |
Aug
(28) |
Sep
(35) |
Oct
(27) |
Nov
(11) |
Dec
(13) |
| 2011 |
Jan
(14) |
Feb
(13) |
Mar
(27) |
Apr
(27) |
May
(28) |
Jun
(20) |
Jul
(43) |
Aug
(52) |
Sep
(66) |
Oct
(61) |
Nov
(11) |
Dec
(8) |
| 2012 |
Jan
(20) |
Feb
(30) |
Mar
(38) |
Apr
(21) |
May
(33) |
Jun
(21) |
Jul
(25) |
Aug
(9) |
Sep
(24) |
Oct
(42) |
Nov
(27) |
Dec
(41) |
| 2013 |
Jan
(20) |
Feb
(35) |
Mar
(156) |
Apr
(298) |
May
(258) |
Jun
(201) |
Jul
(105) |
Aug
(60) |
Sep
(193) |
Oct
(245) |
Nov
(280) |
Dec
(194) |
| 2014 |
Jan
(63) |
Feb
(202) |
Mar
(200) |
Apr
(23) |
May
(53) |
Jun
(105) |
Jul
(18) |
Aug
(26) |
Sep
(110) |
Oct
(187) |
Nov
(97) |
Dec
(74) |
| 2015 |
Jan
(45) |
Feb
(55) |
Mar
(116) |
Apr
(116) |
May
(193) |
Jun
(164) |
Jul
(50) |
Aug
(111) |
Sep
(98) |
Oct
(71) |
Nov
(103) |
Dec
(63) |
| 2016 |
Jan
(33) |
Feb
(101) |
Mar
(182) |
Apr
(139) |
May
(140) |
Jun
(103) |
Jul
(165) |
Aug
(286) |
Sep
(208) |
Oct
(127) |
Nov
(97) |
Dec
(54) |
| 2017 |
Jan
(64) |
Feb
(335) |
Mar
(202) |
Apr
(212) |
May
(139) |
Jun
(127) |
Jul
(294) |
Aug
(154) |
Sep
(170) |
Oct
(152) |
Nov
(156) |
Dec
(62) |
| 2018 |
Jan
(168) |
Feb
(237) |
Mar
(196) |
Apr
(174) |
May
(174) |
Jun
(161) |
Jul
(127) |
Aug
(88) |
Sep
(149) |
Oct
(66) |
Nov
(52) |
Dec
(135) |
| 2019 |
Jan
(146) |
Feb
(126) |
Mar
(104) |
Apr
(58) |
May
(60) |
Jun
(28) |
Jul
(197) |
Aug
(129) |
Sep
(141) |
Oct
(148) |
Nov
(63) |
Dec
(100) |
| 2020 |
Jan
(74) |
Feb
(37) |
Mar
(59) |
Apr
(154) |
May
(194) |
Jun
(133) |
Jul
(313) |
Aug
(197) |
Sep
(49) |
Oct
(162) |
Nov
(143) |
Dec
(57) |
| 2021 |
Jan
(120) |
Feb
(107) |
Mar
(314) |
Apr
(157) |
May
(524) |
Jun
(169) |
Jul
(72) |
Aug
(133) |
Sep
(135) |
Oct
(146) |
Nov
(198) |
Dec
(325) |
| 2022 |
Jan
(409) |
Feb
(249) |
Mar
(138) |
Apr
(95) |
May
(102) |
Jun
(221) |
Jul
(66) |
Aug
(120) |
Sep
(192) |
Oct
(131) |
Nov
(53) |
Dec
(171) |
| 2023 |
Jan
(357) |
Feb
(82) |
Mar
(168) |
Apr
(218) |
May
(196) |
Jun
(86) |
Jul
(115) |
Aug
(49) |
Sep
(190) |
Oct
(102) |
Nov
(45) |
Dec
(76) |
| 2024 |
Jan
(86) |
Feb
(50) |
Mar
(324) |
Apr
(209) |
May
(197) |
Jun
(232) |
Jul
(194) |
Aug
(247) |
Sep
(219) |
Oct
(266) |
Nov
(328) |
Dec
(304) |
| 2025 |
Jan
(191) |
Feb
(115) |
Mar
(137) |
Apr
(32) |
May
(126) |
Jun
(403) |
Jul
(213) |
Aug
(158) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <sv...@op...> - 2024-08-16 10:48:59
|
Author: manx Date: Fri Aug 16 12:48:47 2024 New Revision: 21477 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21477 Log: Merged revision(s) 21475 from trunk/OpenMPT: [Fix] build: Makefile: Remove bogus source files. ........ Modified: branches/OpenMPT-1.30/ (props changed) branches/OpenMPT-1.30/Makefile Modified: branches/OpenMPT-1.30/Makefile ============================================================================== --- branches/OpenMPT-1.30/Makefile Fri Aug 16 12:48:25 2024 (r21476) +++ branches/OpenMPT-1.30/Makefile Fri Aug 16 12:48:47 2024 (r21477) @@ -895,7 +895,6 @@ COMMON_CXX_SOURCES += \ $(sort $(wildcard common/*.cpp)) \ - $(sort $(wildcard src/mpt/src/*.cpp)) \ SOUNDLIB_CXX_SOURCES += \ $(COMMON_CXX_SOURCES) \ |
|
From: <sv...@op...> - 2024-08-16 10:48:37
|
Author: manx Date: Fri Aug 16 12:48:25 2024 New Revision: 21476 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21476 Log: Merged revision(s) 21475 from trunk/OpenMPT: [Fix] build: Makefile: Remove bogus source files. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/Makefile Modified: branches/OpenMPT-1.31/Makefile ============================================================================== --- branches/OpenMPT-1.31/Makefile Fri Aug 16 12:47:57 2024 (r21475) +++ branches/OpenMPT-1.31/Makefile Fri Aug 16 12:48:25 2024 (r21476) @@ -1085,7 +1085,6 @@ COMMON_CXX_SOURCES += \ $(sort $(wildcard common/*.cpp)) \ - $(sort $(wildcard src/mpt/src/*.cpp)) \ SOUNDLIB_CXX_SOURCES += \ $(COMMON_CXX_SOURCES) \ |
|
From: <sv...@op...> - 2024-08-16 10:48:09
|
Author: manx Date: Fri Aug 16 12:47:57 2024 New Revision: 21475 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21475 Log: [Fix] build: Makefile: Remove bogus source files. Modified: trunk/OpenMPT/Makefile Modified: trunk/OpenMPT/Makefile ============================================================================== --- trunk/OpenMPT/Makefile Fri Aug 16 10:53:24 2024 (r21474) +++ trunk/OpenMPT/Makefile Fri Aug 16 12:47:57 2024 (r21475) @@ -1169,7 +1169,6 @@ COMMON_CXX_SOURCES += \ $(sort $(wildcard common/*.cpp)) \ - $(sort $(wildcard src/mpt/src/*.cpp)) \ SOUNDLIB_CXX_SOURCES += \ $(COMMON_CXX_SOURCES) \ |
|
From: <sv...@op...> - 2024-08-16 08:53:36
|
Author: manx Date: Fri Aug 16 10:53:24 2024 New Revision: 21474 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21474 Log: [Ref] mpt/base/float.hpp: Use consteval for user defined literals for better debug build performance. Modified: trunk/OpenMPT/src/mpt/base/float.hpp Modified: trunk/OpenMPT/src/mpt/base/float.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/base/float.hpp Fri Aug 16 10:48:01 2024 (r21473) +++ trunk/OpenMPT/src/mpt/base/float.hpp Fri Aug 16 10:53:24 2024 (r21474) @@ -6,6 +6,7 @@ #include "mpt/base/detect.hpp" +#include "mpt/base/macros.hpp" #include "mpt/base/namespace.hpp" #include <limits> @@ -26,7 +27,7 @@ // fp single using single_float = float; namespace float_literals { -constexpr single_float operator""_fs(long double lit) noexcept { +MPT_CONSTEVAL single_float operator""_fs(long double lit) noexcept { return static_cast<single_float>(lit); } } // namespace float_literals @@ -34,7 +35,7 @@ // fp double using double_float = float; namespace float_literals { -constexpr double_float operator""_fd(long double lit) noexcept { +MPT_CONSTEVAL double_float operator""_fd(long double lit) noexcept { return static_cast<double_float>(lit); } } // namespace float_literals @@ -42,7 +43,7 @@ // fp extended using extended_float = long double; namespace float_literals { -constexpr extended_float operator""_fe(long double lit) noexcept { +MPT_CONSTEVAL extended_float operator""_fe(long double lit) noexcept { return static_cast<extended_float>(lit); } } // namespace float_literals @@ -109,16 +110,16 @@ #undef MPT_BASE_STDFLOAT_FLOAT128 namespace float_literals { -constexpr stdfloat16 operator""_stdf16(long double lit) noexcept { +MPT_CONSTEVAL stdfloat16 operator""_stdf16(long double lit) noexcept { return static_cast<stdfloat16>(lit); } -constexpr stdfloat32 operator""_stdf32(long double lit) noexcept { +MPT_CONSTEVAL stdfloat32 operator""_stdf32(long double lit) noexcept { return static_cast<stdfloat32>(lit); } -constexpr stdfloat64 operator""_stdf64(long double lit) noexcept { +MPT_CONSTEVAL stdfloat64 operator""_stdf64(long double lit) noexcept { return static_cast<stdfloat64>(lit); } -constexpr stdfloat128 operator""_stdf128(long double lit) noexcept { +MPT_CONSTEVAL stdfloat128 operator""_stdf128(long double lit) noexcept { return static_cast<stdfloat128>(lit); } } // namespace float_literals @@ -127,14 +128,14 @@ using fastfloat32 = std::conditional<sizeof(float) == 4, float, std::conditional<sizeof(double) == 4, double, std::conditional<sizeof(long double) == 4, long double, float>::type>::type>::type; namespace float_literals { -constexpr fastfloat32 operator""_ff32(long double lit) noexcept { +MPT_CONSTEVAL fastfloat32 operator""_ff32(long double lit) noexcept { return static_cast<fastfloat32>(lit); } } // namespace float_literals using fastfloat64 = std::conditional<sizeof(float) == 8, float, std::conditional<sizeof(double) == 8, double, std::conditional<sizeof(long double) == 8, long double, double>::type>::type>::type; namespace float_literals { -constexpr fastfloat64 operator""_ff64(long double lit) noexcept { +MPT_CONSTEVAL fastfloat64 operator""_ff64(long double lit) noexcept { return static_cast<fastfloat64>(lit); } } // namespace float_literals @@ -143,14 +144,14 @@ using somefloat32 = std::conditional<sizeof(fastfloat32) == 4, fastfloat32, std::conditional<sizeof(stdfloat32) == 4, stdfloat32, float>::type>::type; namespace float_literals { -constexpr somefloat32 operator""_sf32(long double lit) noexcept { +MPT_CONSTEVAL somefloat32 operator""_sf32(long double lit) noexcept { return static_cast<somefloat32>(lit); } } // namespace float_literals using somefloat64 = std::conditional<sizeof(fastfloat64) == 8, fastfloat64, std::conditional<sizeof(stdfloat64) == 8, stdfloat64, double>::type>::type; namespace float_literals { -constexpr somefloat64 operator""_sf64(long double lit) noexcept { +MPT_CONSTEVAL somefloat64 operator""_sf64(long double lit) noexcept { return static_cast<somefloat64>(lit); } } // namespace float_literals @@ -173,7 +174,7 @@ using nativefloat = std::conditional<mpt::float_traits<somefloat32>::is_preferred, somefloat32, std::conditional<mpt::float_traits<somefloat64>::is_preferred, somefloat64, std::conditional<std::numeric_limits<float>::is_iec559, float, std::conditional<std::numeric_limits<double>::is_iec559, double, std::conditional<std::numeric_limits<long double>::is_iec559, long double, float>::type>::type>::type>::type>::type; namespace float_literals { -constexpr nativefloat operator""_nf(long double lit) noexcept { +MPT_CONSTEVAL nativefloat operator""_nf(long double lit) noexcept { return static_cast<nativefloat>(lit); } } // namespace float_literals |
|
From: <sv...@op...> - 2024-08-16 08:48:13
|
Author: manx Date: Fri Aug 16 10:48:01 2024 New Revision: 21473 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21473 Log: [Ref] mpt/base/float.hpp: Integrate with C++23 <stdfloat> and provide optional mpt::stdfloatN types. [Ref] mpt/base/float.hpp: Provide mpt::fastfloat32 and mpt::fastfloat64 which match semantics of previous mpt::somefloat32 and mpt::somefloat64. The latter now try harder to match the requested size by also trying mpt::stdfloatN types. Modified: trunk/OpenMPT/src/mpt/base/detect_quirks.hpp trunk/OpenMPT/src/mpt/base/float.hpp Modified: trunk/OpenMPT/src/mpt/base/detect_quirks.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/base/detect_quirks.hpp Fri Aug 16 10:33:52 2024 (r21472) +++ trunk/OpenMPT/src/mpt/base/detect_quirks.hpp Fri Aug 16 10:48:01 2024 (r21473) @@ -335,4 +335,10 @@ +#if MPT_LIBCXX_GNU_BEFORE(13) || (MPT_LIBCXX_MS && !MPT_MSVC_AT_LEAST(2022, 7)) || MPT_LIBCXX_LLVM +#define MPT_LIBCXX_QUIRK_NO_STDFLOAT +#endif + + + #endif // MPT_BASE_DETECT_QUIRKS_HPP Modified: trunk/OpenMPT/src/mpt/base/float.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/base/float.hpp Fri Aug 16 10:33:52 2024 (r21472) +++ trunk/OpenMPT/src/mpt/base/float.hpp Fri Aug 16 10:48:01 2024 (r21473) @@ -9,6 +9,9 @@ #include "mpt/base/namespace.hpp" #include <limits> +#if MPT_CXX_AT_LEAST(23) && !defined(MPT_LIBCXX_QUIRK_NO_STDFLOAT) +#include <stdfloat> +#endif // C++23 #include <type_traits> @@ -21,38 +24,131 @@ // n/a // fp single -using single = float; +using single_float = float; namespace float_literals { -constexpr single operator""_fs(long double lit) noexcept { - return static_cast<single>(lit); +constexpr single_float operator""_fs(long double lit) noexcept { + return static_cast<single_float>(lit); } } // namespace float_literals // fp double +using double_float = float; namespace float_literals { -constexpr double operator""_fd(long double lit) noexcept { - return static_cast<double>(lit); +constexpr double_float operator""_fd(long double lit) noexcept { + return static_cast<double_float>(lit); } } // namespace float_literals // fp extended +using extended_float = long double; namespace float_literals { -constexpr long double operator""_fe(long double lit) noexcept { - return static_cast<long double>(lit); +constexpr extended_float operator""_fe(long double lit) noexcept { + return static_cast<extended_float>(lit); } } // namespace float_literals // fp quad // n/a -using somefloat32 = std::conditional<sizeof(float) == 4, float, std::conditional<sizeof(double) == 4, double, std::conditional<sizeof(long double) == 4, long double, float>::type>::type>::type; +#if MPT_CXX_AT_LEAST(23) && !defined(MPT_LIBCXX_QUIRK_NO_STDFLOAT) +#if defined(__STDCPP_FLOAT16_T__) +#if (__STDCPP_FLOAT16_T__ == 1) +#define MPT_BASE_STDFLOAT_FLOAT16 +#endif +#endif +#endif +#if MPT_CXX_AT_LEAST(23) && !defined(MPT_LIBCXX_QUIRK_NO_STDFLOAT) +#if defined(__STDCPP_FLOAT32_T__) +#if (__STDCPP_FLOAT32_T__ == 1) +#define MPT_BASE_STDFLOAT_FLOAT32 +#endif +#endif +#endif +#if MPT_CXX_AT_LEAST(23) && !defined(MPT_LIBCXX_QUIRK_NO_STDFLOAT) +#if defined(__STDCPP_FLOAT64_T__) +#if (__STDCPP_FLOAT64_T__ == 1) +#define MPT_BASE_STDFLOAT_FLOAT64 +#endif +#endif +#endif +#if MPT_CXX_AT_LEAST(23) && !defined(MPT_LIBCXX_QUIRK_NO_STDFLOAT) +#if defined(__STDCPP_FLOAT128_T__) +#if (__STDCPP_FLOAT128_T__ == 1) +#define MPT_BASE_STDFLOAT_FLOAT128 +#endif +#endif +#endif + +#if defined(MPT_BASE_STDFLOAT_FLOAT16) +using stdfloat16 = std::float16_t; +#else +using stdfloat16 = std::conditional<sizeof(float) == 2, float, std::conditional<sizeof(double) == 2, double, std::conditional<sizeof(long double) == 2, long double, float>::type>::type>::type; +#endif + +#if defined(MPT_BASE_STDFLOAT_FLOAT32) +using stdfloat32 = std::float32_t; +#else +using stdfloat32 = std::conditional<sizeof(float) == 4, float, std::conditional<sizeof(double) == 4, double, std::conditional<sizeof(long double) == 4, long double, float>::type>::type>::type; +#endif + +#if defined(MPT_BASE_STDFLOAT_FLOAT64) +using stdfloat64 = std::float64_t; +#else +using stdfloat64 = std::conditional<sizeof(float) == 8, float, std::conditional<sizeof(double) == 8, double, std::conditional<sizeof(long double) == 8, long double, double>::type>::type>::type; +#endif + +#if defined(MPT_BASE_STDFLOAT_FLOAT128) +using stdfloat128 = std::float128_t; +#else +using stdfloat128 = std::conditional<sizeof(float) == 16, float, std::conditional<sizeof(double) == 16, double, std::conditional<sizeof(long double) == 16, long double, long double>::type>::type>::type; +#endif + +#undef MPT_BASE_STDFLOAT_FLOAT16 +#undef MPT_BASE_STDFLOAT_FLOAT32 +#undef MPT_BASE_STDFLOAT_FLOAT64 +#undef MPT_BASE_STDFLOAT_FLOAT128 + +namespace float_literals { +constexpr stdfloat16 operator""_stdf16(long double lit) noexcept { + return static_cast<stdfloat16>(lit); +} +constexpr stdfloat32 operator""_stdf32(long double lit) noexcept { + return static_cast<stdfloat32>(lit); +} +constexpr stdfloat64 operator""_stdf64(long double lit) noexcept { + return static_cast<stdfloat64>(lit); +} +constexpr stdfloat128 operator""_stdf128(long double lit) noexcept { + return static_cast<stdfloat128>(lit); +} +} // namespace float_literals + +// fast floating point types of roughly requested size + +using fastfloat32 = std::conditional<sizeof(float) == 4, float, std::conditional<sizeof(double) == 4, double, std::conditional<sizeof(long double) == 4, long double, float>::type>::type>::type; +namespace float_literals { +constexpr fastfloat32 operator""_ff32(long double lit) noexcept { + return static_cast<fastfloat32>(lit); +} +} // namespace float_literals + +using fastfloat64 = std::conditional<sizeof(float) == 8, float, std::conditional<sizeof(double) == 8, double, std::conditional<sizeof(long double) == 8, long double, double>::type>::type>::type; +namespace float_literals { +constexpr fastfloat64 operator""_ff64(long double lit) noexcept { + return static_cast<fastfloat64>(lit); +} +} // namespace float_literals + +// floating point type of roughly requested size + +using somefloat32 = std::conditional<sizeof(fastfloat32) == 4, fastfloat32, std::conditional<sizeof(stdfloat32) == 4, stdfloat32, float>::type>::type; namespace float_literals { constexpr somefloat32 operator""_sf32(long double lit) noexcept { return static_cast<somefloat32>(lit); } } // namespace float_literals -using somefloat64 = std::conditional<sizeof(float) == 8, float, std::conditional<sizeof(double) == 8, double, std::conditional<sizeof(long double) == 8, long double, double>::type>::type>::type; +using somefloat64 = std::conditional<sizeof(fastfloat64) == 8, fastfloat64, std::conditional<sizeof(stdfloat64) == 8, stdfloat64, double>::type>::type; namespace float_literals { constexpr somefloat64 operator""_sf64(long double lit) noexcept { return static_cast<somefloat64>(lit); |
|
From: <sv...@op...> - 2024-08-16 08:33:59
|
Author: manx Date: Fri Aug 16 10:33:52 2024 New Revision: 21472 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21472 Log: [Ref] mpt/base/floatingpoint.hpp: Rename to mpt/base/float.hpp, in order to better match C++23 <stdfloat>. Modified: trunk/OpenMPT/src/mpt/base/float.hpp Modified: trunk/OpenMPT/src/mpt/base/float.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/base/float.hpp Fri Aug 16 10:29:55 2024 (r21471) +++ trunk/OpenMPT/src/mpt/base/float.hpp Fri Aug 16 10:33:52 2024 (r21472) @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: BSL-1.0 OR BSD-3-Clause */ -#ifndef MPT_BASE_FLOATINGPOINT_HPP -#define MPT_BASE_FLOATINGPOINT_HPP +#ifndef MPT_BASE_FLOAT_HPP +#define MPT_BASE_FLOAT_HPP @@ -88,4 +88,4 @@ -#endif // MPT_BASE_FLOATINGPOINT_HPP +#endif // MPT_BASE_FLOAT_HPP |
Author: manx Date: Fri Aug 16 10:29:55 2024 New Revision: 21471 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21471 Log: [Ref] mpt/base/floatingpoint.hpp: Rename to mpt/base/float.hpp, in order to better match C++23 <stdfloat>. Added: trunk/OpenMPT/src/mpt/base/float.hpp - copied unchanged from r21470, trunk/OpenMPT/src/mpt/base/floatingpoint.hpp Deleted: trunk/OpenMPT/src/mpt/base/floatingpoint.hpp 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/common/mptBaseTypes.h trunk/OpenMPT/openmpt123/openmpt123.hpp trunk/OpenMPT/src/mpt/audio/sample.hpp trunk/OpenMPT/src/mpt/endian/floatingpoint.hpp trunk/OpenMPT/src/openmpt/base/Types.hpp trunk/OpenMPT/src/openmpt/soundbase/MixSample.hpp trunk/OpenMPT/src/openmpt/soundbase/SampleDecode.hpp Modified: trunk/OpenMPT/build/autotools/Makefile.am ============================================================================== --- trunk/OpenMPT/build/autotools/Makefile.am Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/autotools/Makefile.am Fri Aug 16 10:29:55 2024 (r21471) @@ -143,7 +143,7 @@ MPT_FILES_SRC_MPT += src/mpt/base/detect_libcxx.hpp MPT_FILES_SRC_MPT += src/mpt/base/detect_os.hpp MPT_FILES_SRC_MPT += src/mpt/base/detect_quirks.hpp -MPT_FILES_SRC_MPT += src/mpt/base/floatingpoint.hpp +MPT_FILES_SRC_MPT += src/mpt/base/float.hpp MPT_FILES_SRC_MPT += src/mpt/base/integer.hpp MPT_FILES_SRC_MPT += src/mpt/base/macros.hpp MPT_FILES_SRC_MPT += src/mpt/base/math.hpp Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj Fri Aug 16 10:29:55 2024 (r21471) @@ -1007,7 +1007,7 @@ <ClInclude Include="..\..\src\mpt\base\detect_libcxx.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_os.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_quirks.hpp" /> - <ClInclude Include="..\..\src\mpt\base\floatingpoint.hpp" /> + <ClInclude Include="..\..\src\mpt\base\float.hpp" /> <ClInclude Include="..\..\src\mpt\base\integer.hpp" /> <ClInclude Include="..\..\src\mpt\base\macros.hpp" /> <ClInclude Include="..\..\src\mpt\base\math.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters Fri Aug 16 10:29:55 2024 (r21471) @@ -972,7 +972,7 @@ <ClInclude Include="..\..\src\mpt\base\detect_quirks.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> - <ClInclude Include="..\..\src\mpt\base\floatingpoint.hpp"> + <ClInclude Include="..\..\src\mpt\base\float.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> <ClInclude Include="..\..\src\mpt\base\integer.hpp"> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj Fri Aug 16 10:29:55 2024 (r21471) @@ -699,7 +699,7 @@ <ClInclude Include="..\..\src\mpt\base\detect_libcxx.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_os.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_quirks.hpp" /> - <ClInclude Include="..\..\src\mpt\base\floatingpoint.hpp" /> + <ClInclude Include="..\..\src\mpt\base\float.hpp" /> <ClInclude Include="..\..\src\mpt\base\integer.hpp" /> <ClInclude Include="..\..\src\mpt\base\macros.hpp" /> <ClInclude Include="..\..\src\mpt\base\math.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj.filters Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj.filters Fri Aug 16 10:29:55 2024 (r21471) @@ -369,7 +369,7 @@ <ClInclude Include="..\..\src\mpt\base\detect_quirks.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> - <ClInclude Include="..\..\src\mpt\base\floatingpoint.hpp"> + <ClInclude Include="..\..\src\mpt\base\float.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> <ClInclude Include="..\..\src\mpt\base\integer.hpp"> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj Fri Aug 16 10:29:55 2024 (r21471) @@ -1007,7 +1007,7 @@ <ClInclude Include="..\..\src\mpt\base\detect_libcxx.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_os.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_quirks.hpp" /> - <ClInclude Include="..\..\src\mpt\base\floatingpoint.hpp" /> + <ClInclude Include="..\..\src\mpt\base\float.hpp" /> <ClInclude Include="..\..\src\mpt\base\integer.hpp" /> <ClInclude Include="..\..\src\mpt\base\macros.hpp" /> <ClInclude Include="..\..\src\mpt\base\math.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters Fri Aug 16 10:29:55 2024 (r21471) @@ -972,7 +972,7 @@ <ClInclude Include="..\..\src\mpt\base\detect_quirks.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> - <ClInclude Include="..\..\src\mpt\base\floatingpoint.hpp"> + <ClInclude Include="..\..\src\mpt\base\float.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> <ClInclude Include="..\..\src\mpt\base\integer.hpp"> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj Fri Aug 16 10:29:55 2024 (r21471) @@ -1007,7 +1007,7 @@ <ClInclude Include="..\..\src\mpt\base\detect_libcxx.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_os.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_quirks.hpp" /> - <ClInclude Include="..\..\src\mpt\base\floatingpoint.hpp" /> + <ClInclude Include="..\..\src\mpt\base\float.hpp" /> <ClInclude Include="..\..\src\mpt\base\integer.hpp" /> <ClInclude Include="..\..\src\mpt\base\macros.hpp" /> <ClInclude Include="..\..\src\mpt\base\math.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters Fri Aug 16 10:29:55 2024 (r21471) @@ -972,7 +972,7 @@ <ClInclude Include="..\..\src\mpt\base\detect_quirks.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> - <ClInclude Include="..\..\src\mpt\base\floatingpoint.hpp"> + <ClInclude Include="..\..\src\mpt\base\float.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> <ClInclude Include="..\..\src\mpt\base\integer.hpp"> Modified: trunk/OpenMPT/build/vs2017winxp/PluginBridge.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/PluginBridge.vcxproj Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/vs2017winxp/PluginBridge.vcxproj Fri Aug 16 10:29:55 2024 (r21471) @@ -749,7 +749,7 @@ <ClInclude Include="..\..\src\mpt\base\detect_libcxx.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_os.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_quirks.hpp" /> - <ClInclude Include="..\..\src\mpt\base\floatingpoint.hpp" /> + <ClInclude Include="..\..\src\mpt\base\float.hpp" /> <ClInclude Include="..\..\src\mpt\base\integer.hpp" /> <ClInclude Include="..\..\src\mpt\base\macros.hpp" /> <ClInclude Include="..\..\src\mpt\base\math.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/PluginBridge.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/PluginBridge.vcxproj.filters Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/vs2017winxp/PluginBridge.vcxproj.filters Fri Aug 16 10:29:55 2024 (r21471) @@ -258,7 +258,7 @@ <ClInclude Include="..\..\src\mpt\base\detect_quirks.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> - <ClInclude Include="..\..\src\mpt\base\floatingpoint.hpp"> + <ClInclude Include="..\..\src\mpt\base\float.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> <ClInclude Include="..\..\src\mpt\base\integer.hpp"> Modified: trunk/OpenMPT/build/vs2017winxp/PluginBridgeLegacy.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/PluginBridgeLegacy.vcxproj Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/vs2017winxp/PluginBridgeLegacy.vcxproj Fri Aug 16 10:29:55 2024 (r21471) @@ -755,7 +755,7 @@ <ClInclude Include="..\..\src\mpt\base\detect_libcxx.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_os.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_quirks.hpp" /> - <ClInclude Include="..\..\src\mpt\base\floatingpoint.hpp" /> + <ClInclude Include="..\..\src\mpt\base\float.hpp" /> <ClInclude Include="..\..\src\mpt\base\integer.hpp" /> <ClInclude Include="..\..\src\mpt\base\macros.hpp" /> <ClInclude Include="..\..\src\mpt\base\math.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/PluginBridgeLegacy.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/PluginBridgeLegacy.vcxproj.filters Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/vs2017winxp/PluginBridgeLegacy.vcxproj.filters Fri Aug 16 10:29:55 2024 (r21471) @@ -258,7 +258,7 @@ <ClInclude Include="..\..\src\mpt\base\detect_quirks.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> - <ClInclude Include="..\..\src\mpt\base\floatingpoint.hpp"> + <ClInclude Include="..\..\src\mpt\base\float.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> <ClInclude Include="..\..\src\mpt\base\integer.hpp"> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj Fri Aug 16 10:29:55 2024 (r21471) @@ -787,7 +787,7 @@ <ClInclude Include="..\..\src\mpt\base\detect_libcxx.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_os.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_quirks.hpp" /> - <ClInclude Include="..\..\src\mpt\base\floatingpoint.hpp" /> + <ClInclude Include="..\..\src\mpt\base\float.hpp" /> <ClInclude Include="..\..\src\mpt\base\integer.hpp" /> <ClInclude Include="..\..\src\mpt\base\macros.hpp" /> <ClInclude Include="..\..\src\mpt\base\math.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj.filters Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj.filters Fri Aug 16 10:29:55 2024 (r21471) @@ -594,7 +594,7 @@ <ClInclude Include="..\..\src\mpt\base\detect_quirks.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> - <ClInclude Include="..\..\src\mpt\base\floatingpoint.hpp"> + <ClInclude Include="..\..\src\mpt\base\float.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> <ClInclude Include="..\..\src\mpt\base\integer.hpp"> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj Fri Aug 16 10:29:55 2024 (r21471) @@ -787,7 +787,7 @@ <ClInclude Include="..\..\src\mpt\base\detect_libcxx.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_os.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_quirks.hpp" /> - <ClInclude Include="..\..\src\mpt\base\floatingpoint.hpp" /> + <ClInclude Include="..\..\src\mpt\base\float.hpp" /> <ClInclude Include="..\..\src\mpt\base\integer.hpp" /> <ClInclude Include="..\..\src\mpt\base\macros.hpp" /> <ClInclude Include="..\..\src\mpt\base\math.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj.filters Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj.filters Fri Aug 16 10:29:55 2024 (r21471) @@ -594,7 +594,7 @@ <ClInclude Include="..\..\src\mpt\base\detect_quirks.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> - <ClInclude Include="..\..\src\mpt\base\floatingpoint.hpp"> + <ClInclude Include="..\..\src\mpt\base\float.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> <ClInclude Include="..\..\src\mpt\base\integer.hpp"> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj Fri Aug 16 10:29:55 2024 (r21471) @@ -817,7 +817,7 @@ <ClInclude Include="..\..\src\mpt\base\detect_libcxx.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_os.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_quirks.hpp" /> - <ClInclude Include="..\..\src\mpt\base\floatingpoint.hpp" /> + <ClInclude Include="..\..\src\mpt\base\float.hpp" /> <ClInclude Include="..\..\src\mpt\base\integer.hpp" /> <ClInclude Include="..\..\src\mpt\base\macros.hpp" /> <ClInclude Include="..\..\src\mpt\base\math.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters Fri Aug 16 10:29:55 2024 (r21471) @@ -606,7 +606,7 @@ <ClInclude Include="..\..\src\mpt\base\detect_quirks.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> - <ClInclude Include="..\..\src\mpt\base\floatingpoint.hpp"> + <ClInclude Include="..\..\src\mpt\base\float.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> <ClInclude Include="..\..\src\mpt\base\integer.hpp"> Modified: trunk/OpenMPT/build/vs2017winxp/openmpt123.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/openmpt123.vcxproj Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/vs2017winxp/openmpt123.vcxproj Fri Aug 16 10:29:55 2024 (r21471) @@ -762,7 +762,7 @@ <ClInclude Include="..\..\src\mpt\base\detect_libcxx.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_os.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_quirks.hpp" /> - <ClInclude Include="..\..\src\mpt\base\floatingpoint.hpp" /> + <ClInclude Include="..\..\src\mpt\base\float.hpp" /> <ClInclude Include="..\..\src\mpt\base\integer.hpp" /> <ClInclude Include="..\..\src\mpt\base\macros.hpp" /> <ClInclude Include="..\..\src\mpt\base\math.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/openmpt123.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/openmpt123.vcxproj.filters Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/vs2017winxp/openmpt123.vcxproj.filters Fri Aug 16 10:29:55 2024 (r21471) @@ -132,7 +132,7 @@ <ClInclude Include="..\..\src\mpt\base\detect_quirks.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> - <ClInclude Include="..\..\src\mpt\base\floatingpoint.hpp"> + <ClInclude Include="..\..\src\mpt\base\float.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> <ClInclude Include="..\..\src\mpt\base\integer.hpp"> Modified: trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj Fri Aug 16 10:29:55 2024 (r21471) @@ -682,7 +682,7 @@ <ClInclude Include="..\..\src\mpt\base\detect_libcxx.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_os.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_quirks.hpp" /> - <ClInclude Include="..\..\src\mpt\base\floatingpoint.hpp" /> + <ClInclude Include="..\..\src\mpt\base\float.hpp" /> <ClInclude Include="..\..\src\mpt\base\integer.hpp" /> <ClInclude Include="..\..\src\mpt\base\macros.hpp" /> <ClInclude Include="..\..\src\mpt\base\math.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj.filters Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj.filters Fri Aug 16 10:29:55 2024 (r21471) @@ -351,7 +351,7 @@ <ClInclude Include="..\..\src\mpt\base\detect_quirks.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> - <ClInclude Include="..\..\src\mpt\base\floatingpoint.hpp"> + <ClInclude Include="..\..\src\mpt\base\float.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> <ClInclude Include="..\..\src\mpt\base\integer.hpp"> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj Fri Aug 16 10:29:55 2024 (r21471) @@ -1007,7 +1007,7 @@ <ClInclude Include="..\..\src\mpt\base\detect_libcxx.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_os.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_quirks.hpp" /> - <ClInclude Include="..\..\src\mpt\base\floatingpoint.hpp" /> + <ClInclude Include="..\..\src\mpt\base\float.hpp" /> <ClInclude Include="..\..\src\mpt\base\integer.hpp" /> <ClInclude Include="..\..\src\mpt\base\macros.hpp" /> <ClInclude Include="..\..\src\mpt\base\math.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters Fri Aug 16 10:29:55 2024 (r21471) @@ -972,7 +972,7 @@ <ClInclude Include="..\..\src\mpt\base\detect_quirks.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> - <ClInclude Include="..\..\src\mpt\base\floatingpoint.hpp"> + <ClInclude Include="..\..\src\mpt\base\float.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> <ClInclude Include="..\..\src\mpt\base\integer.hpp"> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj Fri Aug 16 10:29:55 2024 (r21471) @@ -699,7 +699,7 @@ <ClInclude Include="..\..\src\mpt\base\detect_libcxx.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_os.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_quirks.hpp" /> - <ClInclude Include="..\..\src\mpt\base\floatingpoint.hpp" /> + <ClInclude Include="..\..\src\mpt\base\float.hpp" /> <ClInclude Include="..\..\src\mpt\base\integer.hpp" /> <ClInclude Include="..\..\src\mpt\base\macros.hpp" /> <ClInclude Include="..\..\src\mpt\base\math.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj.filters Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj.filters Fri Aug 16 10:29:55 2024 (r21471) @@ -369,7 +369,7 @@ <ClInclude Include="..\..\src\mpt\base\detect_quirks.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> - <ClInclude Include="..\..\src\mpt\base\floatingpoint.hpp"> + <ClInclude Include="..\..\src\mpt\base\float.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> <ClInclude Include="..\..\src\mpt\base\integer.hpp"> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj Fri Aug 16 10:29:55 2024 (r21471) @@ -1007,7 +1007,7 @@ <ClInclude Include="..\..\src\mpt\base\detect_libcxx.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_os.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_quirks.hpp" /> - <ClInclude Include="..\..\src\mpt\base\floatingpoint.hpp" /> + <ClInclude Include="..\..\src\mpt\base\float.hpp" /> <ClInclude Include="..\..\src\mpt\base\integer.hpp" /> <ClInclude Include="..\..\src\mpt\base\macros.hpp" /> <ClInclude Include="..\..\src\mpt\base\math.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters Fri Aug 16 10:29:55 2024 (r21471) @@ -972,7 +972,7 @@ <ClInclude Include="..\..\src\mpt\base\detect_quirks.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> - <ClInclude Include="..\..\src\mpt\base\floatingpoint.hpp"> + <ClInclude Include="..\..\src\mpt\base\float.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> <ClInclude Include="..\..\src\mpt\base\integer.hpp"> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj Fri Aug 16 10:29:55 2024 (r21471) @@ -1007,7 +1007,7 @@ <ClInclude Include="..\..\src\mpt\base\detect_libcxx.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_os.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_quirks.hpp" /> - <ClInclude Include="..\..\src\mpt\base\floatingpoint.hpp" /> + <ClInclude Include="..\..\src\mpt\base\float.hpp" /> <ClInclude Include="..\..\src\mpt\base\integer.hpp" /> <ClInclude Include="..\..\src\mpt\base\macros.hpp" /> <ClInclude Include="..\..\src\mpt\base\math.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters Fri Aug 16 10:29:55 2024 (r21471) @@ -972,7 +972,7 @@ <ClInclude Include="..\..\src\mpt\base\detect_quirks.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> - <ClInclude Include="..\..\src\mpt\base\floatingpoint.hpp"> + <ClInclude Include="..\..\src\mpt\base\float.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> <ClInclude Include="..\..\src\mpt\base\integer.hpp"> Modified: trunk/OpenMPT/build/vs2017winxpansi/PluginBridge.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/PluginBridge.vcxproj Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/vs2017winxpansi/PluginBridge.vcxproj Fri Aug 16 10:29:55 2024 (r21471) @@ -749,7 +749,7 @@ <ClInclude Include="..\..\src\mpt\base\detect_libcxx.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_os.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_quirks.hpp" /> - <ClInclude Include="..\..\src\mpt\base\floatingpoint.hpp" /> + <ClInclude Include="..\..\src\mpt\base\float.hpp" /> <ClInclude Include="..\..\src\mpt\base\integer.hpp" /> <ClInclude Include="..\..\src\mpt\base\macros.hpp" /> <ClInclude Include="..\..\src\mpt\base\math.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/PluginBridge.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/PluginBridge.vcxproj.filters Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/vs2017winxpansi/PluginBridge.vcxproj.filters Fri Aug 16 10:29:55 2024 (r21471) @@ -258,7 +258,7 @@ <ClInclude Include="..\..\src\mpt\base\detect_quirks.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> - <ClInclude Include="..\..\src\mpt\base\floatingpoint.hpp"> + <ClInclude Include="..\..\src\mpt\base\float.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> <ClInclude Include="..\..\src\mpt\base\integer.hpp"> Modified: trunk/OpenMPT/build/vs2017winxpansi/PluginBridgeLegacy.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/PluginBridgeLegacy.vcxproj Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/vs2017winxpansi/PluginBridgeLegacy.vcxproj Fri Aug 16 10:29:55 2024 (r21471) @@ -755,7 +755,7 @@ <ClInclude Include="..\..\src\mpt\base\detect_libcxx.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_os.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_quirks.hpp" /> - <ClInclude Include="..\..\src\mpt\base\floatingpoint.hpp" /> + <ClInclude Include="..\..\src\mpt\base\float.hpp" /> <ClInclude Include="..\..\src\mpt\base\integer.hpp" /> <ClInclude Include="..\..\src\mpt\base\macros.hpp" /> <ClInclude Include="..\..\src\mpt\base\math.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/PluginBridgeLegacy.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/PluginBridgeLegacy.vcxproj.filters Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/vs2017winxpansi/PluginBridgeLegacy.vcxproj.filters Fri Aug 16 10:29:55 2024 (r21471) @@ -258,7 +258,7 @@ <ClInclude Include="..\..\src\mpt\base\detect_quirks.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> - <ClInclude Include="..\..\src\mpt\base\floatingpoint.hpp"> + <ClInclude Include="..\..\src\mpt\base\float.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> <ClInclude Include="..\..\src\mpt\base\integer.hpp"> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj Fri Aug 16 10:29:55 2024 (r21471) @@ -787,7 +787,7 @@ <ClInclude Include="..\..\src\mpt\base\detect_libcxx.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_os.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_quirks.hpp" /> - <ClInclude Include="..\..\src\mpt\base\floatingpoint.hpp" /> + <ClInclude Include="..\..\src\mpt\base\float.hpp" /> <ClInclude Include="..\..\src\mpt\base\integer.hpp" /> <ClInclude Include="..\..\src\mpt\base\macros.hpp" /> <ClInclude Include="..\..\src\mpt\base\math.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters Fri Aug 16 10:29:55 2024 (r21471) @@ -594,7 +594,7 @@ <ClInclude Include="..\..\src\mpt\base\detect_quirks.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> - <ClInclude Include="..\..\src\mpt\base\floatingpoint.hpp"> + <ClInclude Include="..\..\src\mpt\base\float.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> <ClInclude Include="..\..\src\mpt\base\integer.hpp"> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj Fri Aug 16 10:29:55 2024 (r21471) @@ -787,7 +787,7 @@ <ClInclude Include="..\..\src\mpt\base\detect_libcxx.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_os.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_quirks.hpp" /> - <ClInclude Include="..\..\src\mpt\base\floatingpoint.hpp" /> + <ClInclude Include="..\..\src\mpt\base\float.hpp" /> <ClInclude Include="..\..\src\mpt\base\integer.hpp" /> <ClInclude Include="..\..\src\mpt\base\macros.hpp" /> <ClInclude Include="..\..\src\mpt\base\math.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj.filters Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj.filters Fri Aug 16 10:29:55 2024 (r21471) @@ -594,7 +594,7 @@ <ClInclude Include="..\..\src\mpt\base\detect_quirks.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> - <ClInclude Include="..\..\src\mpt\base\floatingpoint.hpp"> + <ClInclude Include="..\..\src\mpt\base\float.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> <ClInclude Include="..\..\src\mpt\base\integer.hpp"> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj Fri Aug 16 10:29:55 2024 (r21471) @@ -817,7 +817,7 @@ <ClInclude Include="..\..\src\mpt\base\detect_libcxx.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_os.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_quirks.hpp" /> - <ClInclude Include="..\..\src\mpt\base\floatingpoint.hpp" /> + <ClInclude Include="..\..\src\mpt\base\float.hpp" /> <ClInclude Include="..\..\src\mpt\base\integer.hpp" /> <ClInclude Include="..\..\src\mpt\base\macros.hpp" /> <ClInclude Include="..\..\src\mpt\base\math.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters Fri Aug 16 10:29:55 2024 (r21471) @@ -606,7 +606,7 @@ <ClInclude Include="..\..\src\mpt\base\detect_quirks.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> - <ClInclude Include="..\..\src\mpt\base\floatingpoint.hpp"> + <ClInclude Include="..\..\src\mpt\base\float.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> <ClInclude Include="..\..\src\mpt\base\integer.hpp"> Modified: trunk/OpenMPT/build/vs2017winxpansi/openmpt123.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/openmpt123.vcxproj Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/vs2017winxpansi/openmpt123.vcxproj Fri Aug 16 10:29:55 2024 (r21471) @@ -762,7 +762,7 @@ <ClInclude Include="..\..\src\mpt\base\detect_libcxx.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_os.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_quirks.hpp" /> - <ClInclude Include="..\..\src\mpt\base\floatingpoint.hpp" /> + <ClInclude Include="..\..\src\mpt\base\float.hpp" /> <ClInclude Include="..\..\src\mpt\base\integer.hpp" /> <ClInclude Include="..\..\src\mpt\base\macros.hpp" /> <ClInclude Include="..\..\src\mpt\base\math.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/openmpt123.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/openmpt123.vcxproj.filters Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/vs2017winxpansi/openmpt123.vcxproj.filters Fri Aug 16 10:29:55 2024 (r21471) @@ -132,7 +132,7 @@ <ClInclude Include="..\..\src\mpt\base\detect_quirks.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> - <ClInclude Include="..\..\src\mpt\base\floatingpoint.hpp"> + <ClInclude Include="..\..\src\mpt\base\float.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> <ClInclude Include="..\..\src\mpt\base\integer.hpp"> Modified: trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj Fri Aug 16 10:29:55 2024 (r21471) @@ -682,7 +682,7 @@ <ClInclude Include="..\..\src\mpt\base\detect_libcxx.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_os.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_quirks.hpp" /> - <ClInclude Include="..\..\src\mpt\base\floatingpoint.hpp" /> + <ClInclude Include="..\..\src\mpt\base\float.hpp" /> <ClInclude Include="..\..\src\mpt\base\integer.hpp" /> <ClInclude Include="..\..\src\mpt\base\macros.hpp" /> <ClInclude Include="..\..\src\mpt\base\math.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj.filters Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj.filters Fri Aug 16 10:29:55 2024 (r21471) @@ -351,7 +351,7 @@ <ClInclude Include="..\..\src\mpt\base\detect_quirks.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> - <ClInclude Include="..\..\src\mpt\base\floatingpoint.hpp"> + <ClInclude Include="..\..\src\mpt\base\float.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> <ClInclude Include="..\..\src\mpt\base\integer.hpp"> Modified: trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj Fri Aug 16 10:29:55 2024 (r21471) @@ -1782,7 +1782,7 @@ <ClInclude Include="..\..\src\mpt\base\detect_libcxx.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_os.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_quirks.hpp" /> - <ClInclude Include="..\..\src\mpt\base\floatingpoint.hpp" /> + <ClInclude Include="..\..\src\mpt\base\float.hpp" /> <ClInclude Include="..\..\src\mpt\base\integer.hpp" /> <ClInclude Include="..\..\src\mpt\base\macros.hpp" /> <ClInclude Include="..\..\src\mpt\base\math.hpp" /> Modified: trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj.filters Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj.filters Fri Aug 16 10:29:55 2024 (r21471) @@ -1014,7 +1014,7 @@ <ClInclude Include="..\..\src\mpt\base\detect_quirks.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> - <ClInclude Include="..\..\src\mpt\base\floatingpoint.hpp"> + <ClInclude Include="..\..\src\mpt\base\float.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> <ClInclude Include="..\..\src\mpt\base\integer.hpp"> Modified: trunk/OpenMPT/build/vs2019win10/OpenMPT-NativeSupport.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win10/OpenMPT-NativeSupport.vcxproj Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/vs2019win10/OpenMPT-NativeSupport.vcxproj Fri Aug 16 10:29:55 2024 (r21471) @@ -1330,7 +1330,7 @@ <ClInclude Include="..\..\src\mpt\base\detect_libcxx.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_os.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_quirks.hpp" /> - <ClInclude Include="..\..\src\mpt\base\floatingpoint.hpp" /> + <ClInclude Include="..\..\src\mpt\base\float.hpp" /> <ClInclude Include="..\..\src\mpt\base\integer.hpp" /> <ClInclude Include="..\..\src\mpt\base\macros.hpp" /> <ClInclude Include="..\..\src\mpt\base\math.hpp" /> Modified: trunk/OpenMPT/build/vs2019win10/OpenMPT-NativeSupport.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win10/OpenMPT-NativeSupport.vcxproj.filters Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/vs2019win10/OpenMPT-NativeSupport.vcxproj.filters Fri Aug 16 10:29:55 2024 (r21471) @@ -411,7 +411,7 @@ <ClInclude Include="..\..\src\mpt\base\detect_quirks.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> - <ClInclude Include="..\..\src\mpt\base\floatingpoint.hpp"> + <ClInclude Include="..\..\src\mpt\base\float.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> <ClInclude Include="..\..\src\mpt\base\integer.hpp"> Modified: trunk/OpenMPT/build/vs2019win10/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win10/OpenMPT-UTF8.vcxproj Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/vs2019win10/OpenMPT-UTF8.vcxproj Fri Aug 16 10:29:55 2024 (r21471) @@ -1782,7 +1782,7 @@ <ClInclude Include="..\..\src\mpt\base\detect_libcxx.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_os.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_quirks.hpp" /> - <ClInclude Include="..\..\src\mpt\base\floatingpoint.hpp" /> + <ClInclude Include="..\..\src\mpt\base\float.hpp" /> <ClInclude Include="..\..\src\mpt\base\integer.hpp" /> <ClInclude Include="..\..\src\mpt\base\macros.hpp" /> <ClInclude Include="..\..\src\mpt\base\math.hpp" /> Modified: trunk/OpenMPT/build/vs2019win10/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win10/OpenMPT-UTF8.vcxproj.filters Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/vs2019win10/OpenMPT-UTF8.vcxproj.filters Fri Aug 16 10:29:55 2024 (r21471) @@ -1014,7 +1014,7 @@ <ClInclude Include="..\..\src\mpt\base\detect_quirks.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> - <ClInclude Include="..\..\src\mpt\base\floatingpoint.hpp"> + <ClInclude Include="..\..\src\mpt\base\float.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> <ClInclude Include="..\..\src\mpt\base\integer.hpp"> Modified: trunk/OpenMPT/build/vs2019win10/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win10/OpenMPT.vcxproj Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/vs2019win10/OpenMPT.vcxproj Fri Aug 16 10:29:55 2024 (r21471) @@ -1782,7 +1782,7 @@ <ClInclude Include="..\..\src\mpt\base\detect_libcxx.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_os.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_quirks.hpp" /> - <ClInclude Include="..\..\src\mpt\base\floatingpoint.hpp" /> + <ClInclude Include="..\..\src\mpt\base\float.hpp" /> <ClInclude Include="..\..\src\mpt\base\integer.hpp" /> <ClInclude Include="..\..\src\mpt\base\macros.hpp" /> <ClInclude Include="..\..\src\mpt\base\math.hpp" /> Modified: trunk/OpenMPT/build/vs2019win10/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win10/OpenMPT.vcxproj.filters Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/vs2019win10/OpenMPT.vcxproj.filters Fri Aug 16 10:29:55 2024 (r21471) @@ -1014,7 +1014,7 @@ <ClInclude Include="..\..\src\mpt\base\detect_quirks.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> - <ClInclude Include="..\..\src\mpt\base\floatingpoint.hpp"> + <ClInclude Include="..\..\src\mpt\base\float.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> <ClInclude Include="..\..\src\mpt\base\integer.hpp"> Modified: trunk/OpenMPT/build/vs2019win10/PluginBridge.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win10/PluginBridge.vcxproj Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/vs2019win10/PluginBridge.vcxproj Fri Aug 16 10:29:55 2024 (r21471) @@ -1454,7 +1454,7 @@ <ClInclude Include="..\..\src\mpt\base\detect_libcxx.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_os.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_quirks.hpp" /> - <ClInclude Include="..\..\src\mpt\base\floatingpoint.hpp" /> + <ClInclude Include="..\..\src\mpt\base\float.hpp" /> <ClInclude Include="..\..\src\mpt\base\integer.hpp" /> <ClInclude Include="..\..\src\mpt\base\macros.hpp" /> <ClInclude Include="..\..\src\mpt\base\math.hpp" /> Modified: trunk/OpenMPT/build/vs2019win10/PluginBridge.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win10/PluginBridge.vcxproj.filters Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/vs2019win10/PluginBridge.vcxproj.filters Fri Aug 16 10:29:55 2024 (r21471) @@ -264,7 +264,7 @@ <ClInclude Include="..\..\src\mpt\base\detect_quirks.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> - <ClInclude Include="..\..\src\mpt\base\floatingpoint.hpp"> + <ClInclude Include="..\..\src\mpt\base\float.hpp"> <Filter>src\mpt\base</Filter> </ClInclude> <ClInclude Include="..\..\src\mpt\base\integer.hpp"> Modified: trunk/OpenMPT/build/vs2019win10/PluginBridgeLegacy.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win10/PluginBridgeLegacy.vcxproj Fri Aug 16 10:22:58 2024 (r21470) +++ trunk/OpenMPT/build/vs2019win10/PluginBridgeLegacy.vcxproj Fri Aug 16 10:29:55 2024 (r21471) @@ -1454,7 +1454,7 @@ <ClInclude Include="..\..\src\mpt\base\detect_libcxx.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_os.hpp" /> <ClInclude Include="..\..\src\mpt\base\detect_quirks.hpp" /> - <ClInclude Include="..\..\src\mpt\base\floatingpoint.hpp" /> + <ClInclude Include="..\..\src\mpt\base\float.hpp" /> <ClInclude Include="..\..\src\mpt\base\integer.hpp" /> <ClInclude Include="..\..\src\mpt\base\macros.hpp" /> <ClInclude Include="..\..\src\mpt\base\math.hpp" /> Modified: trunk/OpenMPT/build/vs2019win10/PluginBridgeLegacy.vcxproj.filters =================================... [truncated message content] |
|
From: <sv...@op...> - 2024-08-16 08:23:12
|
Author: manx Date: Fri Aug 16 10:22:58 2024 New Revision: 21470 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21470 Log: [Ref] mpt/base/floatingpoint.hpp: Rename float32 to somefloat32 and float64 to somefloat64. We sadly should do this because C++23 added optional fixed-width forced-IEEE distinct floating point types like std::float32_t and std::float64_t which would be way too easy to confuse with our existing types that best-match native hardware floating point types and do not imply strict IEEE types. Modified: trunk/OpenMPT/soundlib/Load_wav.cpp trunk/OpenMPT/soundlib/SampleIO.cpp trunk/OpenMPT/soundlib/SampleNormalize.h trunk/OpenMPT/soundlib/tuningbase.h trunk/OpenMPT/src/mpt/base/floatingpoint.hpp trunk/OpenMPT/src/mpt/endian/floatingpoint.hpp trunk/OpenMPT/src/openmpt/base/Endian.hpp trunk/OpenMPT/src/openmpt/base/Types.hpp trunk/OpenMPT/src/openmpt/soundbase/SampleConvert.hpp trunk/OpenMPT/src/openmpt/soundbase/SampleConvertFixedPoint.hpp trunk/OpenMPT/src/openmpt/soundbase/SampleDecode.hpp trunk/OpenMPT/src/openmpt/sounddevice/SoundDevicePulseSimple.cpp trunk/OpenMPT/src/openmpt/sounddevice/SoundDevicePulseSimple.hpp trunk/OpenMPT/src/openmpt/sounddevice/SoundDevicePulseaudio.cpp trunk/OpenMPT/src/openmpt/sounddevice/SoundDevicePulseaudio.hpp trunk/OpenMPT/test/test.cpp Modified: trunk/OpenMPT/soundlib/Load_wav.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_wav.cpp Fri Aug 16 10:13:30 2024 (r21469) +++ trunk/OpenMPT/soundlib/Load_wav.cpp Fri Aug 16 10:22:58 2024 (r21470) @@ -175,9 +175,9 @@ if(wavFile.GetSampleFormat() == WAVFormatChunk::fmtFloat) { if(wavFile.GetBitsPerSample() <= 32) - CopyWavChannel<SC::ConversionChain<SC::Convert<int16, float32>, SC::DecodeFloat32<littleEndian32>>>(sample, sampleChunk, channel, wavFile.GetNumChannels()); + CopyWavChannel<SC::ConversionChain<SC::Convert<int16, somefloat32>, SC::DecodeFloat32<littleEndian32>>>(sample, sampleChunk, channel, wavFile.GetNumChannels()); else - CopyWavChannel<SC::ConversionChain<SC::Convert<int16, float64>, SC::DecodeFloat64<littleEndian64>>>(sample, sampleChunk, channel, wavFile.GetNumChannels()); + CopyWavChannel<SC::ConversionChain<SC::Convert<int16, somefloat64>, SC::DecodeFloat64<littleEndian64>>>(sample, sampleChunk, channel, wavFile.GetNumChannels()); } else { if(wavFile.GetBitsPerSample() <= 8) Modified: trunk/OpenMPT/soundlib/SampleIO.cpp ============================================================================== --- trunk/OpenMPT/soundlib/SampleIO.cpp Fri Aug 16 10:13:30 2024 (r21469) +++ trunk/OpenMPT/soundlib/SampleIO.cpp Fri Aug 16 10:22:58 2024 (r21470) @@ -572,10 +572,10 @@ { if(GetEndianness() == littleEndian) { - bytesRead = CopyMonoSample<SC::ConversionChain<SC::Convert<int16, float32>, SC::DecodeFloat32<littleEndian32> > >(sample, sourceBuf, fileSize); + bytesRead = CopyMonoSample<SC::ConversionChain<SC::Convert<int16, somefloat32>, SC::DecodeFloat32<littleEndian32> > >(sample, sourceBuf, fileSize); } else { - bytesRead = CopyMonoSample<SC::ConversionChain<SC::Convert<int16, float32>, SC::DecodeFloat32<bigEndian32> > >(sample, sourceBuf, fileSize); + bytesRead = CopyMonoSample<SC::ConversionChain<SC::Convert<int16, somefloat32>, SC::DecodeFloat32<bigEndian32> > >(sample, sourceBuf, fileSize); } } @@ -585,10 +585,10 @@ { if(GetEndianness() == littleEndian) { - bytesRead = CopyStereoInterleavedSample<SC::ConversionChain<SC::Convert<int16, float32>, SC::DecodeFloat32<littleEndian32> > >(sample, sourceBuf, fileSize); + bytesRead = CopyStereoInterleavedSample<SC::ConversionChain<SC::Convert<int16, somefloat32>, SC::DecodeFloat32<littleEndian32> > >(sample, sourceBuf, fileSize); } else { - bytesRead = CopyStereoInterleavedSample<SC::ConversionChain<SC::Convert<int16, float32>, SC::DecodeFloat32<bigEndian32> > >(sample, sourceBuf, fileSize); + bytesRead = CopyStereoInterleavedSample<SC::ConversionChain<SC::Convert<int16, somefloat32>, SC::DecodeFloat32<bigEndian32> > >(sample, sourceBuf, fileSize); } } @@ -598,10 +598,10 @@ { if(GetEndianness() == littleEndian) { - bytesRead = CopyMonoSample<SC::ConversionChain<SC::Convert<int16, float64>, SC::DecodeFloat64<littleEndian64> > >(sample, sourceBuf, fileSize); + bytesRead = CopyMonoSample<SC::ConversionChain<SC::Convert<int16, somefloat64>, SC::DecodeFloat64<littleEndian64> > >(sample, sourceBuf, fileSize); } else { - bytesRead = CopyMonoSample<SC::ConversionChain<SC::Convert<int16, float64>, SC::DecodeFloat64<bigEndian64> > >(sample, sourceBuf, fileSize); + bytesRead = CopyMonoSample<SC::ConversionChain<SC::Convert<int16, somefloat64>, SC::DecodeFloat64<bigEndian64> > >(sample, sourceBuf, fileSize); } } @@ -611,10 +611,10 @@ { if(GetEndianness() == littleEndian) { - bytesRead = CopyStereoInterleavedSample<SC::ConversionChain<SC::Convert<int16, float64>, SC::DecodeFloat64<littleEndian64> > >(sample, sourceBuf, fileSize); + bytesRead = CopyStereoInterleavedSample<SC::ConversionChain<SC::Convert<int16, somefloat64>, SC::DecodeFloat64<littleEndian64> > >(sample, sourceBuf, fileSize); } else { - bytesRead = CopyStereoInterleavedSample<SC::ConversionChain<SC::Convert<int16, float64>, SC::DecodeFloat64<bigEndian64> > >(sample, sourceBuf, fileSize); + bytesRead = CopyStereoInterleavedSample<SC::ConversionChain<SC::Convert<int16, somefloat64>, SC::DecodeFloat64<bigEndian64> > >(sample, sourceBuf, fileSize); } } @@ -665,13 +665,13 @@ else if(GetBitDepth() == 32 && (GetChannelFormat() == mono || GetChannelFormat() == stereoInterleaved) && GetEncoding() == floatPCMnormalize) { // Normalize to 16-Bit - float32 srcPeak = 1.0f; + somefloat32 srcPeak = 1.0f; if(GetEndianness() == littleEndian) { - bytesRead = CopyAndNormalizeSample<SC::NormalizationChain<SC::Convert<int16, float32>, SC::DecodeFloat32<littleEndian32> > >(sample, sourceBuf, fileSize, &srcPeak); + bytesRead = CopyAndNormalizeSample<SC::NormalizationChain<SC::Convert<int16, somefloat32>, SC::DecodeFloat32<littleEndian32> > >(sample, sourceBuf, fileSize, &srcPeak); } else { - bytesRead = CopyAndNormalizeSample<SC::NormalizationChain<SC::Convert<int16, float32>, SC::DecodeFloat32<bigEndian32> > >(sample, sourceBuf, fileSize, &srcPeak); + bytesRead = CopyAndNormalizeSample<SC::NormalizationChain<SC::Convert<int16, somefloat32>, SC::DecodeFloat32<bigEndian32> > >(sample, sourceBuf, fileSize, &srcPeak); } if(bytesRead && srcPeak != 1.0f) { @@ -686,13 +686,13 @@ else if(GetBitDepth() == 64 && (GetChannelFormat() == mono || GetChannelFormat() == stereoInterleaved) && GetEncoding() == floatPCMnormalize) { // Normalize to 16-Bit - float64 srcPeak = 1.0; + somefloat64 srcPeak = 1.0; if(GetEndianness() == littleEndian) { - bytesRead = CopyAndNormalizeSample<SC::NormalizationChain<SC::Convert<int16, float64>, SC::DecodeFloat64<littleEndian64> > >(sample, sourceBuf, fileSize, &srcPeak); + bytesRead = CopyAndNormalizeSample<SC::NormalizationChain<SC::Convert<int16, somefloat64>, SC::DecodeFloat64<littleEndian64> > >(sample, sourceBuf, fileSize, &srcPeak); } else { - bytesRead = CopyAndNormalizeSample<SC::NormalizationChain<SC::Convert<int16, float64>, SC::DecodeFloat64<bigEndian64> > >(sample, sourceBuf, fileSize, &srcPeak); + bytesRead = CopyAndNormalizeSample<SC::NormalizationChain<SC::Convert<int16, somefloat64>, SC::DecodeFloat64<bigEndian64> > >(sample, sourceBuf, fileSize, &srcPeak); } if(bytesRead && srcPeak != 1.0) { @@ -710,15 +710,15 @@ { bytesRead = CopyMonoSample (sample, sourceBuf, fileSize, - SC::ConversionChain<SC::Convert<int16, float32>, SC::DecodeScaledFloat32<littleEndian32> > - (SC::Convert<int16, float32>(), SC::DecodeScaledFloat32<littleEndian32>(1.0f / static_cast<float>(1<<15))) + SC::ConversionChain<SC::Convert<int16, somefloat32>, SC::DecodeScaledFloat32<littleEndian32> > + (SC::Convert<int16, somefloat32>(), SC::DecodeScaledFloat32<littleEndian32>(1.0f / static_cast<float>(1<<15))) ); } else { bytesRead = CopyMonoSample (sample, sourceBuf, fileSize, - SC::ConversionChain<SC::Convert<int16, float32>, SC::DecodeScaledFloat32<bigEndian32> > - (SC::Convert<int16, float32>(), SC::DecodeScaledFloat32<bigEndian32>(1.0f / static_cast<float>(1<<15))) + SC::ConversionChain<SC::Convert<int16, somefloat32>, SC::DecodeScaledFloat32<bigEndian32> > + (SC::Convert<int16, somefloat32>(), SC::DecodeScaledFloat32<bigEndian32>(1.0f / static_cast<float>(1<<15))) ); } } @@ -731,15 +731,15 @@ { bytesRead = CopyStereoInterleavedSample (sample, sourceBuf, fileSize, - SC::ConversionChain<SC::Convert<int16, float32>, SC::DecodeScaledFloat32<littleEndian32> > - (SC::Convert<int16, float32>(), SC::DecodeScaledFloat32<littleEndian32>(1.0f / static_cast<float>(1<<15))) + SC::ConversionChain<SC::Convert<int16, somefloat32>, SC::DecodeScaledFloat32<littleEndian32> > + (SC::Convert<int16, somefloat32>(), SC::DecodeScaledFloat32<littleEndian32>(1.0f / static_cast<float>(1<<15))) ); } else { bytesRead = CopyStereoInterleavedSample (sample, sourceBuf, fileSize, - SC::ConversionChain<SC::Convert<int16, float32>, SC::DecodeScaledFloat32<bigEndian32> > - (SC::Convert<int16, float32>(), SC::DecodeScaledFloat32<bigEndian32>(1.0f / static_cast<float>(1<<15))) + SC::ConversionChain<SC::Convert<int16, somefloat32>, SC::DecodeScaledFloat32<bigEndian32> > + (SC::Convert<int16, somefloat32>(), SC::DecodeScaledFloat32<bigEndian32>(1.0f / static_cast<float>(1<<15))) ); } } @@ -752,15 +752,15 @@ { bytesRead = CopyMonoSample (sample, sourceBuf, fileSize, - SC::ConversionChain<SC::Convert<int16, float32>, SC::DecodeScaledFloat32<littleEndian32> > - (SC::Convert<int16, float32>(), SC::DecodeScaledFloat32<littleEndian32>(1.0f / static_cast<float>(1<<23))) + SC::ConversionChain<SC::Convert<int16, somefloat32>, SC::DecodeScaledFloat32<littleEndian32> > + (SC::Convert<int16, somefloat32>(), SC::DecodeScaledFloat32<littleEndian32>(1.0f / static_cast<float>(1<<23))) ); } else { bytesRead = CopyMonoSample (sample, sourceBuf, fileSize, - SC::ConversionChain<SC::Convert<int16, float32>, SC::DecodeScaledFloat32<bigEndian32> > - (SC::Convert<int16, float32>(), SC::DecodeScaledFloat32<bigEndian32>(1.0f / static_cast<float>(1<<23))) + SC::ConversionChain<SC::Convert<int16, somefloat32>, SC::DecodeScaledFloat32<bigEndian32> > + (SC::Convert<int16, somefloat32>(), SC::DecodeScaledFloat32<bigEndian32>(1.0f / static_cast<float>(1<<23))) ); } } @@ -773,15 +773,15 @@ { bytesRead = CopyStereoInterleavedSample (sample, sourceBuf, fileSize, - SC::ConversionChain<SC::Convert<int16, float32>, SC::DecodeScaledFloat32<littleEndian32> > - (SC::Convert<int16, float32>(), SC::DecodeScaledFloat32<littleEndian32>(1.0f / static_cast<float>(1<<23))) + SC::ConversionChain<SC::Convert<int16, somefloat32>, SC::DecodeScaledFloat32<littleEndian32> > + (SC::Convert<int16, somefloat32>(), SC::DecodeScaledFloat32<littleEndian32>(1.0f / static_cast<float>(1<<23))) ); } else { bytesRead = CopyStereoInterleavedSample (sample, sourceBuf, fileSize, - SC::ConversionChain<SC::Convert<int16, float32>, SC::DecodeScaledFloat32<bigEndian32> > - (SC::Convert<int16, float32>(), SC::DecodeScaledFloat32<bigEndian32>(1.0f / static_cast<float>(1<<23))) + SC::ConversionChain<SC::Convert<int16, somefloat32>, SC::DecodeScaledFloat32<bigEndian32> > + (SC::Convert<int16, somefloat32>(), SC::DecodeScaledFloat32<bigEndian32>(1.0f / static_cast<float>(1<<23))) ); } } Modified: trunk/OpenMPT/soundlib/SampleNormalize.h ============================================================================== --- trunk/OpenMPT/soundlib/SampleNormalize.h Fri Aug 16 10:13:30 2024 (r21469) +++ trunk/OpenMPT/soundlib/SampleNormalize.h Fri Aug 16 10:22:58 2024 (r21470) @@ -64,11 +64,11 @@ }; template <> -struct Normalize<float32> +struct Normalize<somefloat32> { - using input_t = float32; - using output_t = float32; - using peak_t = float32; + using input_t = somefloat32; + using output_t = somefloat32; + using peak_t = somefloat32; float maxVal; float maxValInv; MPT_FORCEINLINE Normalize() @@ -104,11 +104,11 @@ }; template <> -struct Normalize<float64> +struct Normalize<somefloat64> { - using input_t = float64; - using output_t = float64; - using peak_t = float64; + using input_t = somefloat64; + using output_t = somefloat64; + using peak_t = somefloat64; double maxVal; double maxValInv; MPT_FORCEINLINE Normalize() Modified: trunk/OpenMPT/soundlib/tuningbase.h ============================================================================== --- trunk/OpenMPT/soundlib/tuningbase.h Fri Aug 16 10:13:30 2024 (r21469) +++ trunk/OpenMPT/soundlib/tuningbase.h Fri Aug 16 10:22:58 2024 (r21470) @@ -32,7 +32,7 @@ using NOTEINDEXTYPE = int16; // Some signed integer-type. using UNOTEINDEXTYPE = uint16; // Unsigned NOTEINDEXTYPE. -using RATIOTYPE = float32; // Some 'real figure' type able to present ratios. If changing RATIOTYPE, serialization methods may need modifications. +using RATIOTYPE = somefloat32; // Some 'real figure' type able to present ratios. If changing RATIOTYPE, serialization methods may need modifications. // Counter of steps between notes. If there is no 'finetune'(finestepcount == 0), // then 'step difference' between notes is the Modified: trunk/OpenMPT/src/mpt/base/floatingpoint.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/base/floatingpoint.hpp Fri Aug 16 10:13:30 2024 (r21469) +++ trunk/OpenMPT/src/mpt/base/floatingpoint.hpp Fri Aug 16 10:22:58 2024 (r21470) @@ -45,17 +45,17 @@ // fp quad // n/a -using float32 = std::conditional<sizeof(float) == 4, float, std::conditional<sizeof(double) == 4, double, std::conditional<sizeof(long double) == 4, long double, float>::type>::type>::type; +using somefloat32 = std::conditional<sizeof(float) == 4, float, std::conditional<sizeof(double) == 4, double, std::conditional<sizeof(long double) == 4, long double, float>::type>::type>::type; namespace float_literals { -constexpr float32 operator""_f32(long double lit) noexcept { - return static_cast<float32>(lit); +constexpr somefloat32 operator""_sf32(long double lit) noexcept { + return static_cast<somefloat32>(lit); } } // namespace float_literals -using float64 = std::conditional<sizeof(float) == 8, float, std::conditional<sizeof(double) == 8, double, std::conditional<sizeof(long double) == 8, long double, double>::type>::type>::type; +using somefloat64 = std::conditional<sizeof(float) == 8, float, std::conditional<sizeof(double) == 8, double, std::conditional<sizeof(long double) == 8, long double, double>::type>::type>::type; namespace float_literals { -constexpr float64 operator""_f64(long double lit) noexcept { - return static_cast<float64>(lit); +constexpr somefloat64 operator""_sf64(long double lit) noexcept { + return static_cast<somefloat64>(lit); } } // namespace float_literals @@ -75,7 +75,7 @@ // prefer smaller floats, but try to use IEEE754 floats using nativefloat = - std::conditional<mpt::float_traits<float32>::is_preferred, float32, std::conditional<mpt::float_traits<float64>::is_preferred, float64, std::conditional<std::numeric_limits<float>::is_iec559, float, std::conditional<std::numeric_limits<double>::is_iec559, double, std::conditional<std::numeric_limits<long double>::is_iec559, long double, float>::type>::type>::type>::type>::type; + std::conditional<mpt::float_traits<somefloat32>::is_preferred, somefloat32, std::conditional<mpt::float_traits<somefloat64>::is_preferred, somefloat64, std::conditional<std::numeric_limits<float>::is_iec559, float, std::conditional<std::numeric_limits<double>::is_iec559, double, std::conditional<std::numeric_limits<long double>::is_iec559, long double, float>::type>::type>::type>::type>::type; namespace float_literals { constexpr nativefloat operator""_nf(long double lit) noexcept { return static_cast<nativefloat>(lit); Modified: trunk/OpenMPT/src/mpt/endian/floatingpoint.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/endian/floatingpoint.hpp Fri Aug 16 10:13:30 2024 (r21469) +++ trunk/OpenMPT/src/mpt/endian/floatingpoint.hpp Fri Aug 16 10:22:58 2024 (r21470) @@ -27,8 +27,8 @@ // 1.0f --> 0x3f800000u -MPT_FORCEINLINE uint32 EncodeIEEE754binary32(float32 f) { - if constexpr (mpt::float_traits<float32>::is_float32 && mpt::float_traits<float32>::is_ieee754_binary && mpt::float_traits<float32>::is_native_endian) { +MPT_FORCEINLINE uint32 EncodeIEEE754binary32(somefloat32 f) { + if constexpr (mpt::float_traits<somefloat32>::is_float32 && mpt::float_traits<somefloat32>::is_ieee754_binary && mpt::float_traits<somefloat32>::is_native_endian) { return mpt::bit_cast<uint32>(f); } else { int e = 0; @@ -55,8 +55,8 @@ } } -MPT_FORCEINLINE uint64 EncodeIEEE754binary64(float64 f) { - if constexpr (mpt::float_traits<float64>::is_float64 && mpt::float_traits<float64>::is_ieee754_binary && mpt::float_traits<float64>::is_native_endian) { +MPT_FORCEINLINE uint64 EncodeIEEE754binary64(somefloat64 f) { + if constexpr (mpt::float_traits<somefloat64>::is_float64 && mpt::float_traits<somefloat64>::is_ieee754_binary && mpt::float_traits<somefloat64>::is_native_endian) { return mpt::bit_cast<uint64>(f); } else { int e = 0; @@ -84,9 +84,9 @@ } // 0x3f800000u --> 1.0f -MPT_FORCEINLINE float32 DecodeIEEE754binary32(uint32 i) { - if constexpr (mpt::float_traits<float32>::is_float32 && mpt::float_traits<float32>::is_ieee754_binary && mpt::float_traits<float32>::is_native_endian) { - return mpt::bit_cast<float32>(i); +MPT_FORCEINLINE somefloat32 DecodeIEEE754binary32(uint32 i) { + if constexpr (mpt::float_traits<somefloat32>::is_float32 && mpt::float_traits<somefloat32>::is_ieee754_binary && mpt::float_traits<somefloat32>::is_native_endian) { + return mpt::bit_cast<somefloat32>(i); } else { uint32 mant = (i & 0x007fffffu) >> 0; uint32 expo = (i & 0x7f800000u) >> 23; @@ -95,20 +95,20 @@ float m = sign ? -static_cast<float>(mant) : static_cast<float>(mant); int e = static_cast<int>(expo) - 127 + 1 - 24; float f = std::ldexp(m, e); - return static_cast<float32>(f); + return static_cast<somefloat32>(f); } else { mant |= 0x00800000u; float m = sign ? -static_cast<float>(mant) : static_cast<float>(mant); int e = static_cast<int>(expo) - 127 + 1 - 24; float f = std::ldexp(m, e); - return static_cast<float32>(f); + return static_cast<somefloat32>(f); } } } -MPT_FORCEINLINE float64 DecodeIEEE754binary64(uint64 i) { - if constexpr (mpt::float_traits<float64>::is_float64 && mpt::float_traits<float64>::is_ieee754_binary && mpt::float_traits<float64>::is_native_endian) { - return mpt::bit_cast<float64>(i); +MPT_FORCEINLINE somefloat64 DecodeIEEE754binary64(uint64 i) { + if constexpr (mpt::float_traits<somefloat64>::is_float64 && mpt::float_traits<somefloat64>::is_ieee754_binary && mpt::float_traits<somefloat64>::is_native_endian) { + return mpt::bit_cast<somefloat64>(i); } else { uint64 mant = (i & 0x000fffffffffffffull) >> 0; uint64 expo = (i & 0x7ff0000000000000ull) >> 52; @@ -117,13 +117,13 @@ double m = sign ? -static_cast<double>(mant) : static_cast<double>(mant); int e = static_cast<int>(expo) - 1023 + 1 - 53; double f = std::ldexp(m, e); - return static_cast<float64>(f); + return static_cast<somefloat64>(f); } else { mant |= 0x0010000000000000ull; double m = sign ? -static_cast<double>(mant) : static_cast<double>(mant); int e = static_cast<int>(expo) - 1023 + 1 - 53; double f = std::ldexp(m, e); - return static_cast<float64>(f); + return static_cast<somefloat64>(f); } } } @@ -141,10 +141,10 @@ return bytes[i]; } IEEE754binary32Emulated() = default; - MPT_FORCEINLINE explicit IEEE754binary32Emulated(float32 f) { + MPT_FORCEINLINE explicit IEEE754binary32Emulated(somefloat32 f) { SetInt32(EncodeIEEE754binary32(f)); } - MPT_FORCEINLINE IEEE754binary32Emulated & operator=(float32 f) { + MPT_FORCEINLINE IEEE754binary32Emulated & operator=(somefloat32 f) { SetInt32(EncodeIEEE754binary32(f)); return *this; } @@ -157,7 +157,7 @@ bytes[2] = b2; bytes[3] = b3; } - MPT_FORCEINLINE operator float32() const { + MPT_FORCEINLINE operator somefloat32() const { return DecodeIEEE754binary32(GetInt32()); } MPT_FORCEINLINE self_t & SetInt32(uint32 i) { @@ -196,10 +196,10 @@ return bytes[i]; } IEEE754binary64Emulated() = default; - MPT_FORCEINLINE explicit IEEE754binary64Emulated(float64 f) { + MPT_FORCEINLINE explicit IEEE754binary64Emulated(somefloat64 f) { SetInt64(EncodeIEEE754binary64(f)); } - MPT_FORCEINLINE IEEE754binary64Emulated & operator=(float64 f) { + MPT_FORCEINLINE IEEE754binary64Emulated & operator=(somefloat64 f) { SetInt64(EncodeIEEE754binary64(f)); return *this; } @@ -213,7 +213,7 @@ bytes[6] = b6; bytes[7] = b7; } - MPT_FORCEINLINE operator float64() const { + MPT_FORCEINLINE operator somefloat64() const { return DecodeIEEE754binary64(GetInt64()); } MPT_FORCEINLINE self_t & SetInt64(uint64 i) { @@ -280,7 +280,7 @@ template <mpt::endian endian = mpt::endian::native> struct IEEE754binary32Native { public: - float32 value; + somefloat32 value; public: MPT_FORCEINLINE std::byte GetByte(std::size_t i) const { @@ -293,10 +293,10 @@ } } IEEE754binary32Native() = default; - MPT_FORCEINLINE explicit IEEE754binary32Native(float32 f) { + MPT_FORCEINLINE explicit IEEE754binary32Native(somefloat32 f) { value = f; } - MPT_FORCEINLINE IEEE754binary32Native & operator=(float32 f) { + MPT_FORCEINLINE IEEE754binary32Native & operator=(somefloat32 f) { value = f; return *this; } @@ -312,7 +312,7 @@ value = DecodeIEEE754binary32(0u | (static_cast<uint32>(b0) << 24) | (static_cast<uint32>(b1) << 16) | (static_cast<uint32>(b2) << 8) | (static_cast<uint32>(b3) << 0)); } } - MPT_FORCEINLINE operator float32() const { + MPT_FORCEINLINE operator somefloat32() const { return value; } MPT_FORCEINLINE IEEE754binary32Native & SetInt32(uint32 i) { @@ -333,7 +333,7 @@ template <mpt::endian endian = mpt::endian::native> struct IEEE754binary64Native { public: - float64 value; + somefloat64 value; public: MPT_FORCEINLINE std::byte GetByte(std::size_t i) const { @@ -346,10 +346,10 @@ } } IEEE754binary64Native() = default; - MPT_FORCEINLINE explicit IEEE754binary64Native(float64 f) { + MPT_FORCEINLINE explicit IEEE754binary64Native(somefloat64 f) { value = f; } - MPT_FORCEINLINE IEEE754binary64Native & operator=(float64 f) { + MPT_FORCEINLINE IEEE754binary64Native & operator=(somefloat64 f) { value = f; return *this; } @@ -362,7 +362,7 @@ value = DecodeIEEE754binary64(0ull | (static_cast<uint64>(b0) << 56) | (static_cast<uint64>(b1) << 48) | (static_cast<uint64>(b2) << 40) | (static_cast<uint64>(b3) << 32) | (static_cast<uint64>(b4) << 24) | (static_cast<uint64>(b5) << 16) | (static_cast<uint64>(b6) << 8) | (static_cast<uint64>(b7) << 0)); } } - MPT_FORCEINLINE operator float64() const { + MPT_FORCEINLINE operator somefloat64() const { return value; } MPT_FORCEINLINE IEEE754binary64Native & SetInt64(uint64 i) { @@ -412,10 +412,10 @@ using IEEE754binary64BE = IEEE754binary64Native<>; }; -using IEEE754binary32LE = IEEE754binary_types<mpt::float_traits<float32>::is_float32 && mpt::float_traits<float32>::is_ieee754_binary && mpt::float_traits<float32>::is_native_endian, mpt::endian::native>::IEEE754binary32LE; -using IEEE754binary32BE = IEEE754binary_types<mpt::float_traits<float32>::is_float32 && mpt::float_traits<float32>::is_ieee754_binary && mpt::float_traits<float32>::is_native_endian, mpt::endian::native>::IEEE754binary32BE; -using IEEE754binary64LE = IEEE754binary_types<mpt::float_traits<float32>::is_float64 && mpt::float_traits<float32>::is_ieee754_binary && mpt::float_traits<float32>::is_native_endian, mpt::endian::native>::IEEE754binary64LE; -using IEEE754binary64BE = IEEE754binary_types<mpt::float_traits<float32>::is_float64 && mpt::float_traits<float32>::is_ieee754_binary && mpt::float_traits<float32>::is_native_endian, mpt::endian::native>::IEEE754binary64BE; +using IEEE754binary32LE = IEEE754binary_types<mpt::float_traits<somefloat32>::is_float32 && mpt::float_traits<somefloat32>::is_ieee754_binary && mpt::float_traits<somefloat32>::is_native_endian, mpt::endian::native>::IEEE754binary32LE; +using IEEE754binary32BE = IEEE754binary_types<mpt::float_traits<somefloat32>::is_float32 && mpt::float_traits<somefloat32>::is_ieee754_binary && mpt::float_traits<somefloat32>::is_native_endian, mpt::endian::native>::IEEE754binary32BE; +using IEEE754binary64LE = IEEE754binary_types<mpt::float_traits<somefloat32>::is_float64 && mpt::float_traits<somefloat32>::is_ieee754_binary && mpt::float_traits<somefloat32>::is_native_endian, mpt::endian::native>::IEEE754binary64LE; +using IEEE754binary64BE = IEEE754binary_types<mpt::float_traits<somefloat32>::is_float64 && mpt::float_traits<somefloat32>::is_ieee754_binary && mpt::float_traits<somefloat32>::is_native_endian, mpt::endian::native>::IEEE754binary64BE; static_assert(sizeof(IEEE754binary32LE) == 4); static_assert(sizeof(IEEE754binary32BE) == 4); Modified: trunk/OpenMPT/src/openmpt/base/Endian.hpp ============================================================================== --- trunk/OpenMPT/src/openmpt/base/Endian.hpp Fri Aug 16 10:13:30 2024 (r21469) +++ trunk/OpenMPT/src/openmpt/base/Endian.hpp Fri Aug 16 10:22:58 2024 (r21470) @@ -39,10 +39,10 @@ -using IEEE754binary32LE = mpt::IEEE754binary_types<mpt::float_traits<float32>::is_float32 && mpt::float_traits<float32>::is_ieee754_binary && mpt::float_traits<float32>::is_native_endian, mpt::endian::native>::IEEE754binary32LE; -using IEEE754binary32BE = mpt::IEEE754binary_types<mpt::float_traits<float32>::is_float32 && mpt::float_traits<float32>::is_ieee754_binary && mpt::float_traits<float32>::is_native_endian, mpt::endian::native>::IEEE754binary32BE; -using IEEE754binary64LE = mpt::IEEE754binary_types<mpt::float_traits<float64>::is_float64 && mpt::float_traits<float64>::is_ieee754_binary && mpt::float_traits<float64>::is_native_endian, mpt::endian::native>::IEEE754binary64LE; -using IEEE754binary64BE = mpt::IEEE754binary_types<mpt::float_traits<float64>::is_float64 && mpt::float_traits<float64>::is_ieee754_binary && mpt::float_traits<float64>::is_native_endian, mpt::endian::native>::IEEE754binary64BE; +using IEEE754binary32LE = mpt::IEEE754binary_types<mpt::float_traits<somefloat32>::is_float32 && mpt::float_traits<somefloat32>::is_ieee754_binary && mpt::float_traits<somefloat32>::is_native_endian, mpt::endian::native>::IEEE754binary32LE; +using IEEE754binary32BE = mpt::IEEE754binary_types<mpt::float_traits<somefloat32>::is_float32 && mpt::float_traits<somefloat32>::is_ieee754_binary && mpt::float_traits<somefloat32>::is_native_endian, mpt::endian::native>::IEEE754binary32BE; +using IEEE754binary64LE = mpt::IEEE754binary_types<mpt::float_traits<somefloat64>::is_float64 && mpt::float_traits<somefloat64>::is_ieee754_binary && mpt::float_traits<somefloat64>::is_native_endian, mpt::endian::native>::IEEE754binary64LE; +using IEEE754binary64BE = mpt::IEEE754binary_types<mpt::float_traits<somefloat64>::is_float64 && mpt::float_traits<somefloat64>::is_ieee754_binary && mpt::float_traits<somefloat64>::is_native_endian, mpt::endian::native>::IEEE754binary64BE; // unaligned Modified: trunk/OpenMPT/src/openmpt/base/Types.hpp ============================================================================== --- trunk/OpenMPT/src/openmpt/base/Types.hpp Fri Aug 16 10:13:30 2024 (r21469) +++ trunk/OpenMPT/src/openmpt/base/Types.hpp Fri Aug 16 10:22:58 2024 (r21470) @@ -25,8 +25,8 @@ using uint64 = mpt::uint64; using nativefloat = mpt::nativefloat; -using float32 = mpt::float32; -using float64 = mpt::float64; +using somefloat32 = mpt::somefloat32; +using somefloat64 = mpt::somefloat64; using namespace mpt::float_literals; Modified: trunk/OpenMPT/src/openmpt/soundbase/SampleConvert.hpp ============================================================================== --- trunk/OpenMPT/src/openmpt/soundbase/SampleConvert.hpp Fri Aug 16 10:13:30 2024 (r21469) +++ trunk/OpenMPT/src/openmpt/soundbase/SampleConvert.hpp Fri Aug 16 10:22:58 2024 (r21470) @@ -153,9 +153,9 @@ }; template <> -struct Convert<uint8, float32> +struct Convert<uint8, somefloat32> { - using input_t = float32; + using input_t = somefloat32; using output_t = uint8; MPT_FORCEINLINE output_t operator()(input_t val) { @@ -234,9 +234,9 @@ }; template <> -struct Convert<int8, float32> +struct Convert<int8, somefloat32> { - using input_t = float32; + using input_t = somefloat32; using output_t = int8; MPT_FORCEINLINE output_t operator()(input_t val) { @@ -315,9 +315,9 @@ }; template <> -struct Convert<int16, float32> +struct Convert<int16, somefloat32> { - using input_t = float32; + using input_t = somefloat32; using output_t = int16; MPT_FORCEINLINE output_t operator()(input_t val) { @@ -396,9 +396,9 @@ }; template <> -struct Convert<int24, float32> +struct Convert<int24, somefloat32> { - using input_t = float32; + using input_t = somefloat32; using output_t = int24; MPT_FORCEINLINE output_t operator()(input_t val) { @@ -477,9 +477,9 @@ }; template <> -struct Convert<int32, float32> +struct Convert<int32, somefloat32> { - using input_t = float32; + using input_t = somefloat32; using output_t = int32; MPT_FORCEINLINE output_t operator()(input_t val) { @@ -558,9 +558,9 @@ }; template <> -struct Convert<int64, float32> +struct Convert<int64, somefloat32> { - using input_t = float32; + using input_t = somefloat32; using output_t = int64; MPT_FORCEINLINE output_t operator()(input_t val) { @@ -584,68 +584,68 @@ }; template <> -struct Convert<float32, uint8> +struct Convert<somefloat32, uint8> { using input_t = uint8; - using output_t = float32; + using output_t = somefloat32; MPT_FORCEINLINE output_t operator()(input_t val) { - return static_cast<float32>(static_cast<int>(val) - 0x80) * (1.0f / static_cast<float32>(static_cast<uint8>(1) << 7)); + return static_cast<somefloat32>(static_cast<int>(val) - 0x80) * (1.0f / static_cast<somefloat32>(static_cast<uint8>(1) << 7)); } }; template <> -struct Convert<float32, int8> +struct Convert<somefloat32, int8> { using input_t = int8; - using output_t = float32; + using output_t = somefloat32; MPT_FORCEINLINE output_t operator()(input_t val) { - return static_cast<float32>(val) * (1.0f / static_cast<float>(static_cast<uint8>(1) << 7)); + return static_cast<somefloat32>(val) * (1.0f / static_cast<float>(static_cast<uint8>(1) << 7)); } }; template <> -struct Convert<float32, int16> +struct Convert<somefloat32, int16> { using input_t = int16; - using output_t = float32; + using output_t = somefloat32; MPT_FORCEINLINE output_t operator()(input_t val) { - return static_cast<float32>(val) * (1.0f / static_cast<float>(static_cast<uint16>(1) << 15)); + return static_cast<somefloat32>(val) * (1.0f / static_cast<float>(static_cast<uint16>(1) << 15)); } }; template <> -struct Convert<float32, int24> +struct Convert<somefloat32, int24> { using input_t = int24; - using output_t = float32; + using output_t = somefloat32; MPT_FORCEINLINE output_t operator()(input_t val) { - return static_cast<float32>(val) * (1.0f / static_cast<float>(static_cast<uint32>(1) << 23)); + return static_cast<somefloat32>(val) * (1.0f / static_cast<float>(static_cast<uint32>(1) << 23)); } }; template <> -struct Convert<float32, int32> +struct Convert<somefloat32, int32> { using input_t = int32; - using output_t = float32; + using output_t = somefloat32; MPT_FORCEINLINE output_t operator()(input_t val) { - return static_cast<float32>(val) * (1.0f / static_cast<float>(static_cast<uint32>(1) << 31)); + return static_cast<somefloat32>(val) * (1.0f / static_cast<float>(static_cast<uint32>(1) << 31)); } }; template <> -struct Convert<float32, int64> +struct Convert<somefloat32, int64> { using input_t = int64; - using output_t = float32; + using output_t = somefloat32; MPT_FORCEINLINE output_t operator()(input_t val) { - return static_cast<float32>(val) * (1.0f / static_cast<float>(static_cast<uint64>(1) << 63)); + return static_cast<somefloat32>(val) * (1.0f / static_cast<float>(static_cast<uint64>(1) << 63)); } }; Modified: trunk/OpenMPT/src/openmpt/soundbase/SampleConvertFixedPoint.hpp ============================================================================== --- trunk/OpenMPT/src/openmpt/soundbase/SampleConvertFixedPoint.hpp Fri Aug 16 10:13:30 2024 (r21469) +++ trunk/OpenMPT/src/openmpt/soundbase/SampleConvertFixedPoint.hpp Fri Aug 16 10:22:58 2024 (r21470) @@ -110,10 +110,10 @@ }; template <int fractionalBits> -struct ConvertFixedPoint<float32, int32, fractionalBits> +struct ConvertFixedPoint<somefloat32, int32, fractionalBits> { using input_t = int32; - using output_t = float32; + using output_t = somefloat32; const float factor; MPT_FORCEINLINE ConvertFixedPoint() : factor(1.0f / static_cast<float>(1 << fractionalBits)) @@ -123,15 +123,15 @@ MPT_FORCEINLINE output_t operator()(input_t val) { static_assert(fractionalBits >= 0 && fractionalBits <= sizeof(input_t) * 8 - 1); - return static_cast<float32>(val) * factor; + return static_cast<somefloat32>(val) * factor; } }; template <int fractionalBits> -struct ConvertFixedPoint<float64, int32, fractionalBits> +struct ConvertFixedPoint<somefloat64, int32, fractionalBits> { using input_t = int32; - using output_t = float64; + using output_t = somefloat64; const double factor; MPT_FORCEINLINE ConvertFixedPoint() : factor(1.0 / static_cast<double>(1 << fractionalBits)) @@ -141,7 +141,7 @@ MPT_FORCEINLINE output_t operator()(input_t val) { static_assert(fractionalBits >= 0 && fractionalBits <= sizeof(input_t) * 8 - 1); - return static_cast<float64>(val) * factor; + return static_cast<somefloat64>(val) * factor; } }; @@ -218,9 +218,9 @@ }; template <int fractionalBits> -struct ConvertToFixedPoint<int32, float32, fractionalBits> +struct ConvertToFixedPoint<int32, somefloat32, fractionalBits> { - using input_t = float32; + using input_t = somefloat32; using output_t = int32; const float factor; MPT_FORCEINLINE ConvertToFixedPoint() @@ -237,9 +237,9 @@ }; template <int fractionalBits> -struct ConvertToFixedPoint<int32, float64, fractionalBits> +struct ConvertToFixedPoint<int32, somefloat64, fractionalBits> { - using input_t = float64; + using input_t = somefloat64; using output_t = int32; const double factor; MPT_FORCEINLINE ConvertToFixedPoint() Modified: trunk/OpenMPT/src/openmpt/soundbase/SampleDecode.hpp ============================================================================== --- trunk/OpenMPT/src/openmpt/soundbase/SampleDecode.hpp Fri Aug 16 10:13:30 2024 (r21469) +++ trunk/OpenMPT/src/openmpt/soundbase/SampleDecode.hpp Fri Aug 16 10:22:58 2024 (r21470) @@ -290,11 +290,11 @@ struct DecodeFloat32 { using input_t = std::byte; - using output_t = float32; + using output_t = somefloat32; static constexpr std::size_t input_inc = 4; MPT_FORCEINLINE output_t operator()(const input_t *inBuf) { - float32 val = IEEE754binary32LE(inBuf[loLoByteIndex], inBuf[loHiByteIndex], inBuf[hiLoByteIndex], inBuf[hiHiByteIndex]); + somefloat32 val = IEEE754binary32LE(inBuf[loLoByteIndex], inBuf[loHiByteIndex], inBuf[hiLoByteIndex], inBuf[hiHiByteIndex]); val = mpt::sanitize_nan(val); if(std::isinf(val)) { @@ -314,12 +314,12 @@ struct DecodeScaledFloat32 { using input_t = std::byte; - using output_t = float32; + using output_t = somefloat32; static constexpr std::size_t input_inc = 4; float factor; MPT_FORCEINLINE output_t operator()(const input_t *inBuf) { - float32 val = IEEE754binary32LE(inBuf[loLoByteIndex], inBuf[loHiByteIndex], inBuf[hiLoByteIndex], inBuf[hiHiByteIndex]); + somefloat32 val = IEEE754binary32LE(inBuf[loLoByteIndex], inBuf[loHiByteIndex], inBuf[hiLoByteIndex], inBuf[hiHiByteIndex]); val = mpt::sanitize_nan(val); if(std::isinf(val)) { @@ -344,11 +344,11 @@ struct DecodeFloat64 { using input_t = std::byte; - using output_t = float64; + using output_t = somefloat64; static constexpr std::size_t input_inc = 8; MPT_FORCEINLINE output_t operator()(const input_t *inBuf) { - float64 val = IEEE754binary64LE(inBuf[b0], inBuf[b1], inBuf[b2], inBuf[b3], inBuf[b4], inBuf[b5], inBuf[b6], inBuf[b7]); + somefloat64 val = IEEE754binary64LE(inBuf[b0], inBuf[b1], inBuf[b2], inBuf[b3], inBuf[b4], inBuf[b5], inBuf[b6], inBuf[b7]); val = mpt::sanitize_nan(val); if(std::isinf(val)) { Modified: trunk/OpenMPT/src/openmpt/sounddevice/SoundDevicePulseSimple.cpp ============================================================================== --- trunk/OpenMPT/src/openmpt/sounddevice/SoundDevicePulseSimple.cpp Fri Aug 16 10:13:30 2024 (r21469) +++ trunk/OpenMPT/src/openmpt/sounddevice/SoundDevicePulseSimple.cpp Fri Aug 16 10:22:58 2024 (r21470) @@ -405,8 +405,8 @@ CallbackLockedAudioReadPrepare(m_OutputBuffer.size() / m_Settings.Channels, latencyFrames); CallbackLockedAudioProcess(m_OutputBuffer.data(), nullptr, m_OutputBuffer.size() / m_Settings.Channels); error = 0; - static_assert(sizeof(float32) == 4); - if(pa_simple_write(m_PA_SimpleOutput, m_OutputBuffer.data(), m_OutputBuffer.size() * sizeof(float32), &error) < 0) + static_assert(sizeof(somefloat32) == 4); + if(pa_simple_write(m_PA_SimpleOutput, m_OutputBuffer.data(), m_OutputBuffer.size() * sizeof(somefloat32), &error) < 0) { SendDeviceMessage(LogError, MPT_UFORMAT_MESSAGE("pa_simple_write failed: {}")(PulseErrorString(error))); needsClose = true; Modified: trunk/OpenMPT/src/openmpt/sounddevice/SoundDevicePulseSimple.hpp ============================================================================== --- trunk/OpenMPT/src/openmpt/sounddevice/SoundDevicePulseSimple.hpp Fri Aug 16 10:13:30 2024 (r21469) +++ trunk/OpenMPT/src/openmpt/sounddevice/SoundDevicePulseSimple.hpp Fri Aug 16 10:22:58 2024 (r21470) @@ -60,7 +60,7 @@ private: pa_simple *m_PA_SimpleOutput; SoundDevice::BufferAttributes m_EffectiveBufferAttributes; - std::vector<float32> m_OutputBuffer; + std::vector<somefloat32> m_OutputBuffer; std::atomic<uint32> m_StatisticLastLatencyFrames; }; Modified: trunk/OpenMPT/src/openmpt/sounddevice/SoundDevicePulseaudio.cpp ============================================================================== --- trunk/OpenMPT/src/openmpt/sounddevice/SoundDevicePulseaudio.cpp Fri Aug 16 10:13:30 2024 (r21469) +++ trunk/OpenMPT/src/openmpt/sounddevice/SoundDevicePulseaudio.cpp Fri Aug 16 10:22:58 2024 (r21470) @@ -375,8 +375,8 @@ CallbackLockedAudioReadPrepare(m_OutputBuffer.size() / m_Settings.Channels, latencyFrames); CallbackLockedAudioProcess(m_OutputBuffer.data(), nullptr, m_OutputBuffer.size() / m_Settings.Channels); error = 0; - static_assert(sizeof(float32) == 4); - if(pa_simple_write(m_PA_SimpleOutput, m_OutputBuffer.data(), m_OutputBuffer.size() * sizeof(float32), &error) < 0) + static_assert(sizeof(somefloat32) == 4); + if(pa_simple_write(m_PA_SimpleOutput, m_OutputBuffer.data(), m_OutputBuffer.size() * sizeof(somefloat32), &error) < 0) { SendDeviceMessage(LogError, MPT_UFORMAT_MESSAGE("pa_simple_write failed: {}")(PulseErrorString(error))); needsClose = true; Modified: trunk/OpenMPT/src/openmpt/sounddevice/SoundDevicePulseaudio.hpp ============================================================================== --- trunk/OpenMPT/src/openmpt/sounddevice/SoundDevicePulseaudio.hpp Fri Aug 16 10:13:30 2024 (r21469) +++ trunk/OpenMPT/src/openmpt/sounddevice/SoundDevicePulseaudio.hpp Fri Aug 16 10:22:58 2024 (r21470) @@ -64,7 +64,7 @@ private: pa_simple *m_PA_SimpleOutput; SoundDevice::BufferAttributes m_EffectiveBufferAttributes; - std::vector<float32> m_OutputBuffer; + std::vector<somefloat32> m_OutputBuffer; std::atomic<uint32> m_StatisticLastLatencyFrames; }; Modified: trunk/OpenMPT/test/test.cpp ============================================================================== --- trunk/OpenMPT/test/test.cpp Fri Aug 16 10:13:30 2024 (r21469) +++ trunk/OpenMPT/test/test.cpp Fri Aug 16 10:22:58 2024 (r21470) @@ -4618,8 +4618,8 @@ sample.nLength = 65536; sample.uFlags.set(CHN_16BIT); sample.pData.pSample = sampleBuf.data(); - CopyAndNormalizeSample<SC::NormalizationChain<SC::Convert<int16, float32>, SC::DecodeFloat32<bigEndian32> > >(sample, source32.data(), 4*65536); - CopySample<SC::ConversionChain<SC::Convert<int16, float32>, SC::DecodeFloat32<bigEndian32> > >(truncated16.data(), 65536, 1, source32.data(), 65536 * 4, 1); + CopyAndNormalizeSample<SC::NormalizationChain<SC::Convert<int16, somefloat32>, SC::DecodeFloat32<bigEndian32> > >(sample, source32.data(), 4*65536); + CopySample<SC::ConversionChain<SC::Convert<int16, somefloat32>, SC::DecodeFloat32<bigEndian32> > >(truncated16.data(), 65536, 1, source32.data(), 65536 * 4, 1); for(std::size_t i = 0; i < 65536; i++) { |
|
From: <sv...@op...> - 2024-08-16 08:13:42
|
Author: manx Date: Fri Aug 16 10:13:30 2024 New Revision: 21469 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21469 Log: [Ref] openmpt/sounddevice/SoundDevicePulseaudio.cpp: static_assert(sizeof(float32)). [Ref] openmpt/sounddevice/SoundDevicePulseSimple.cpp: static_assert(sizeof(float32)). Modified: trunk/OpenMPT/src/openmpt/sounddevice/SoundDevicePulseSimple.cpp trunk/OpenMPT/src/openmpt/sounddevice/SoundDevicePulseaudio.cpp Modified: trunk/OpenMPT/src/openmpt/sounddevice/SoundDevicePulseSimple.cpp ============================================================================== --- trunk/OpenMPT/src/openmpt/sounddevice/SoundDevicePulseSimple.cpp Fri Aug 16 10:12:35 2024 (r21468) +++ trunk/OpenMPT/src/openmpt/sounddevice/SoundDevicePulseSimple.cpp Fri Aug 16 10:13:30 2024 (r21469) @@ -405,6 +405,7 @@ CallbackLockedAudioReadPrepare(m_OutputBuffer.size() / m_Settings.Channels, latencyFrames); CallbackLockedAudioProcess(m_OutputBuffer.data(), nullptr, m_OutputBuffer.size() / m_Settings.Channels); error = 0; + static_assert(sizeof(float32) == 4); if(pa_simple_write(m_PA_SimpleOutput, m_OutputBuffer.data(), m_OutputBuffer.size() * sizeof(float32), &error) < 0) { SendDeviceMessage(LogError, MPT_UFORMAT_MESSAGE("pa_simple_write failed: {}")(PulseErrorString(error))); Modified: trunk/OpenMPT/src/openmpt/sounddevice/SoundDevicePulseaudio.cpp ============================================================================== --- trunk/OpenMPT/src/openmpt/sounddevice/SoundDevicePulseaudio.cpp Fri Aug 16 10:12:35 2024 (r21468) +++ trunk/OpenMPT/src/openmpt/sounddevice/SoundDevicePulseaudio.cpp Fri Aug 16 10:13:30 2024 (r21469) @@ -375,6 +375,7 @@ CallbackLockedAudioReadPrepare(m_OutputBuffer.size() / m_Settings.Channels, latencyFrames); CallbackLockedAudioProcess(m_OutputBuffer.data(), nullptr, m_OutputBuffer.size() / m_Settings.Channels); error = 0; + static_assert(sizeof(float32) == 4); if(pa_simple_write(m_PA_SimpleOutput, m_OutputBuffer.data(), m_OutputBuffer.size() * sizeof(float32), &error) < 0) { SendDeviceMessage(LogError, MPT_UFORMAT_MESSAGE("pa_simple_write failed: {}")(PulseErrorString(error))); |
|
From: <sv...@op...> - 2024-08-16 08:12:42
|
Author: manx Date: Fri Aug 16 10:12:35 2024 New Revision: 21468 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21468 Log: [Ref] openmpt/sounddevice/SoundDevicePulseaudio.cpp: Tiny clenaup. [Ref] openmpt/sounddevice/SoundDevicePulseSimple.cpp: Tiny clenaup. Modified: trunk/OpenMPT/src/openmpt/sounddevice/SoundDevicePulseSimple.cpp trunk/OpenMPT/src/openmpt/sounddevice/SoundDevicePulseaudio.cpp Modified: trunk/OpenMPT/src/openmpt/sounddevice/SoundDevicePulseSimple.cpp ============================================================================== --- trunk/OpenMPT/src/openmpt/sounddevice/SoundDevicePulseSimple.cpp Fri Aug 16 09:50:56 2024 (r21467) +++ trunk/OpenMPT/src/openmpt/sounddevice/SoundDevicePulseSimple.cpp Fri Aug 16 10:12:35 2024 (r21468) @@ -405,7 +405,7 @@ CallbackLockedAudioReadPrepare(m_OutputBuffer.size() / m_Settings.Channels, latencyFrames); CallbackLockedAudioProcess(m_OutputBuffer.data(), nullptr, m_OutputBuffer.size() / m_Settings.Channels); error = 0; - if(pa_simple_write(m_PA_SimpleOutput, &(m_OutputBuffer[0]), m_OutputBuffer.size() * sizeof(float32), &error) < 0) + if(pa_simple_write(m_PA_SimpleOutput, m_OutputBuffer.data(), m_OutputBuffer.size() * sizeof(float32), &error) < 0) { SendDeviceMessage(LogError, MPT_UFORMAT_MESSAGE("pa_simple_write failed: {}")(PulseErrorString(error))); needsClose = true; Modified: trunk/OpenMPT/src/openmpt/sounddevice/SoundDevicePulseaudio.cpp ============================================================================== --- trunk/OpenMPT/src/openmpt/sounddevice/SoundDevicePulseaudio.cpp Fri Aug 16 09:50:56 2024 (r21467) +++ trunk/OpenMPT/src/openmpt/sounddevice/SoundDevicePulseaudio.cpp Fri Aug 16 10:12:35 2024 (r21468) @@ -375,7 +375,7 @@ CallbackLockedAudioReadPrepare(m_OutputBuffer.size() / m_Settings.Channels, latencyFrames); CallbackLockedAudioProcess(m_OutputBuffer.data(), nullptr, m_OutputBuffer.size() / m_Settings.Channels); error = 0; - if(pa_simple_write(m_PA_SimpleOutput, &(m_OutputBuffer[0]), m_OutputBuffer.size() * sizeof(float32), &error) < 0) + if(pa_simple_write(m_PA_SimpleOutput, m_OutputBuffer.data(), m_OutputBuffer.size() * sizeof(float32), &error) < 0) { SendDeviceMessage(LogError, MPT_UFORMAT_MESSAGE("pa_simple_write failed: {}")(PulseErrorString(error))); needsClose = true; |
|
From: <sv...@op...> - 2024-08-16 07:51:04
|
Author: manx Date: Fri Aug 16 09:50:56 2024 New Revision: 21467 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21467 Log: [Ref] Do not rely on sizeof(float32). Modified: trunk/OpenMPT/soundlib/Load_it.cpp Modified: trunk/OpenMPT/soundlib/Load_it.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_it.cpp Fri Aug 16 08:56:20 2024 (r21466) +++ trunk/OpenMPT/soundlib/Load_it.cpp Fri Aug 16 09:50:56 2024 (r21467) @@ -2033,8 +2033,8 @@ } const uint32 extraDataSize = - 4 + sizeof(float32) + // 4 for ID and size of dryRatio - 4 + sizeof(int32); // Default Program + 4 + sizeof(IEEE754binary32LE) + // 4 for ID and size of dryRatio + 4 + sizeof(int32); // Default Program // For each extra entity, add 4 for ID, plus 4 for size of entity, plus size of entity chunkSize += extraDataSize + 4; // +4 is for size field itself |
|
From: <sv...@op...> - 2024-08-16 06:56:33
|
Author: manx Date: Fri Aug 16 08:56:20 2024 New Revision: 21466 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21466 Log: [Ref] openmpt/soundbase/SampleConvert.hpp: Minor type cleanup. Modified: trunk/OpenMPT/src/openmpt/soundbase/SampleConvert.hpp Modified: trunk/OpenMPT/src/openmpt/soundbase/SampleConvert.hpp ============================================================================== --- trunk/OpenMPT/src/openmpt/soundbase/SampleConvert.hpp Fri Aug 16 08:04:48 2024 (r21465) +++ trunk/OpenMPT/src/openmpt/soundbase/SampleConvert.hpp Fri Aug 16 08:56:20 2024 (r21466) @@ -590,7 +590,7 @@ using output_t = float32; MPT_FORCEINLINE output_t operator()(input_t val) { - return static_cast<float32>(static_cast<int>(val) - 0x80) * (1.0f / static_cast<float32>(static_cast<unsigned int>(1) << 7)); + return static_cast<float32>(static_cast<int>(val) - 0x80) * (1.0f / static_cast<float32>(static_cast<uint8>(1) << 7)); } }; @@ -601,7 +601,7 @@ using output_t = float32; MPT_FORCEINLINE output_t operator()(input_t val) { - return static_cast<float32>(val) * (1.0f / static_cast<float>(static_cast<unsigned int>(1) << 7)); + return static_cast<float32>(val) * (1.0f / static_cast<float>(static_cast<uint8>(1) << 7)); } }; @@ -612,7 +612,7 @@ using output_t = float32; MPT_FORCEINLINE output_t operator()(input_t val) { - return static_cast<float32>(val) * (1.0f / static_cast<float>(static_cast<unsigned int>(1) << 15)); + return static_cast<float32>(val) * (1.0f / static_cast<float>(static_cast<uint16>(1) << 15)); } }; @@ -623,7 +623,7 @@ using output_t = float32; MPT_FORCEINLINE output_t operator()(input_t val) { - return static_cast<float32>(val) * (1.0f / static_cast<float>(static_cast<unsigned int>(1) << 23)); + return static_cast<float32>(val) * (1.0f / static_cast<float>(static_cast<uint32>(1) << 23)); } }; @@ -634,7 +634,7 @@ using output_t = float32; MPT_FORCEINLINE output_t operator()(input_t val) { - return static_cast<float32>(val) * (1.0f / static_cast<float>(static_cast<unsigned int>(1) << 31)); + return static_cast<float32>(val) * (1.0f / static_cast<float>(static_cast<uint32>(1) << 31)); } }; @@ -656,7 +656,7 @@ using output_t = double; MPT_FORCEINLINE output_t operator()(input_t val) { - return static_cast<double>(static_cast<int>(val) - 0x80) * (1.0 / static_cast<double>(static_cast<unsigned int>(1) << 7)); + return static_cast<double>(static_cast<int>(val) - 0x80) * (1.0 / static_cast<double>(static_cast<uint8>(1) << 7)); } }; @@ -667,7 +667,7 @@ using output_t = double; MPT_FORCEINLINE output_t operator()(input_t val) { - return static_cast<double>(val) * (1.0 / static_cast<double>(static_cast<unsigned int>(1) << 7)); + return static_cast<double>(val) * (1.0 / static_cast<double>(static_cast<uint8>(1) << 7)); } }; @@ -678,7 +678,7 @@ using output_t = double; MPT_FORCEINLINE output_t operator()(input_t val) { - return static_cast<double>(val) * (1.0 / static_cast<double>(static_cast<unsigned int>(1) << 15)); + return static_cast<double>(val) * (1.0 / static_cast<double>(static_cast<uint16>(1) << 15)); } }; @@ -689,7 +689,7 @@ using output_t = double; MPT_FORCEINLINE output_t operator()(input_t val) { - return static_cast<double>(val) * (1.0 / static_cast<double>(static_cast<unsigned int>(1) << 23)); + return static_cast<double>(val) * (1.0 / static_cast<double>(static_cast<uint32>(1) << 23)); } }; @@ -700,7 +700,7 @@ using output_t = double; MPT_FORCEINLINE output_t operator()(input_t val) { - return static_cast<double>(val) * (1.0 / static_cast<double>(static_cast<unsigned int>(1) << 31)); + return static_cast<double>(val) * (1.0 / static_cast<double>(static_cast<uint32>(1) << 31)); } }; |
|
From: <sv...@op...> - 2024-08-16 06:04:56
|
Author: manx Date: Fri Aug 16 08:04:48 2024 New Revision: 21465 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21465 Log: [Ref] mpt/base/floatingpoint.hpp: Remove traits than combine size, IEEE, and endianness. [Ref] mpt/base/floatingpoint.hpp: Add traits for float16 and float128. Modified: trunk/OpenMPT/src/mpt/base/floatingpoint.hpp trunk/OpenMPT/src/mpt/endian/floatingpoint.hpp trunk/OpenMPT/src/openmpt/base/Endian.hpp Modified: trunk/OpenMPT/src/mpt/base/floatingpoint.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/base/floatingpoint.hpp Thu Aug 15 21:47:09 2024 (r21464) +++ trunk/OpenMPT/src/mpt/base/floatingpoint.hpp Fri Aug 16 08:04:48 2024 (r21465) @@ -64,14 +64,12 @@ static constexpr bool is_float = !std::numeric_limits<T>::is_integer; static constexpr bool is_hard = is_float && !MPT_COMPILER_QUIRK_FLOAT_EMULATED; static constexpr bool is_soft = is_float && MPT_COMPILER_QUIRK_FLOAT_EMULATED; + static constexpr bool is_float16 = is_float && (sizeof(T) == 2); static constexpr bool is_float32 = is_float && (sizeof(T) == 4); static constexpr bool is_float64 = is_float && (sizeof(T) == 8); + static constexpr bool is_float128 = is_float && (sizeof(T) == 16); static constexpr bool is_native_endian = is_float && !MPT_COMPILER_QUIRK_FLOAT_NOTNATIVEENDIAN; static constexpr bool is_ieee754_binary = is_float && std::numeric_limits<T>::is_iec559 && !MPT_COMPILER_QUIRK_FLOAT_NOTIEEE754; - static constexpr bool is_ieee754_binary32 = is_float && is_ieee754_binary && is_float32; - static constexpr bool is_ieee754_binary64 = is_float && is_ieee754_binary && is_float64; - static constexpr bool is_ieee754_binary32ne = is_float && is_ieee754_binary && is_float32 && is_native_endian; - static constexpr bool is_ieee754_binary64ne = is_float && is_ieee754_binary && is_float64 && is_native_endian; static constexpr bool is_preferred = is_float && ((is_float32 && MPT_COMPILER_QUIRK_FLOAT_PREFER32) || (is_float64 && MPT_COMPILER_QUIRK_FLOAT_PREFER64)); }; Modified: trunk/OpenMPT/src/mpt/endian/floatingpoint.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/endian/floatingpoint.hpp Thu Aug 15 21:47:09 2024 (r21464) +++ trunk/OpenMPT/src/mpt/endian/floatingpoint.hpp Fri Aug 16 08:04:48 2024 (r21465) @@ -28,7 +28,7 @@ // 1.0f --> 0x3f800000u MPT_FORCEINLINE uint32 EncodeIEEE754binary32(float32 f) { - if constexpr (mpt::float_traits<float32>::is_ieee754_binary32ne) { + if constexpr (mpt::float_traits<float32>::is_float32 && mpt::float_traits<float32>::is_ieee754_binary && mpt::float_traits<float32>::is_native_endian) { return mpt::bit_cast<uint32>(f); } else { int e = 0; @@ -56,7 +56,7 @@ } MPT_FORCEINLINE uint64 EncodeIEEE754binary64(float64 f) { - if constexpr (mpt::float_traits<float64>::is_ieee754_binary64ne) { + if constexpr (mpt::float_traits<float64>::is_float64 && mpt::float_traits<float64>::is_ieee754_binary && mpt::float_traits<float64>::is_native_endian) { return mpt::bit_cast<uint64>(f); } else { int e = 0; @@ -85,7 +85,7 @@ // 0x3f800000u --> 1.0f MPT_FORCEINLINE float32 DecodeIEEE754binary32(uint32 i) { - if constexpr (mpt::float_traits<float32>::is_ieee754_binary32ne) { + if constexpr (mpt::float_traits<float32>::is_float32 && mpt::float_traits<float32>::is_ieee754_binary && mpt::float_traits<float32>::is_native_endian) { return mpt::bit_cast<float32>(i); } else { uint32 mant = (i & 0x007fffffu) >> 0; @@ -107,7 +107,7 @@ } MPT_FORCEINLINE float64 DecodeIEEE754binary64(uint64 i) { - if constexpr (mpt::float_traits<float64>::is_ieee754_binary64ne) { + if constexpr (mpt::float_traits<float64>::is_float64 && mpt::float_traits<float64>::is_ieee754_binary && mpt::float_traits<float64>::is_native_endian) { return mpt::bit_cast<float64>(i); } else { uint64 mant = (i & 0x000fffffffffffffull) >> 0; @@ -412,10 +412,10 @@ using IEEE754binary64BE = IEEE754binary64Native<>; }; -using IEEE754binary32LE = IEEE754binary_types<mpt::float_traits<float32>::is_ieee754_binary32ne, mpt::endian::native>::IEEE754binary32LE; -using IEEE754binary32BE = IEEE754binary_types<mpt::float_traits<float32>::is_ieee754_binary32ne, mpt::endian::native>::IEEE754binary32BE; -using IEEE754binary64LE = IEEE754binary_types<mpt::float_traits<float64>::is_ieee754_binary64ne, mpt::endian::native>::IEEE754binary64LE; -using IEEE754binary64BE = IEEE754binary_types<mpt::float_traits<float64>::is_ieee754_binary64ne, mpt::endian::native>::IEEE754binary64BE; +using IEEE754binary32LE = IEEE754binary_types<mpt::float_traits<float32>::is_float32 && mpt::float_traits<float32>::is_ieee754_binary && mpt::float_traits<float32>::is_native_endian, mpt::endian::native>::IEEE754binary32LE; +using IEEE754binary32BE = IEEE754binary_types<mpt::float_traits<float32>::is_float32 && mpt::float_traits<float32>::is_ieee754_binary && mpt::float_traits<float32>::is_native_endian, mpt::endian::native>::IEEE754binary32BE; +using IEEE754binary64LE = IEEE754binary_types<mpt::float_traits<float32>::is_float64 && mpt::float_traits<float32>::is_ieee754_binary && mpt::float_traits<float32>::is_native_endian, mpt::endian::native>::IEEE754binary64LE; +using IEEE754binary64BE = IEEE754binary_types<mpt::float_traits<float32>::is_float64 && mpt::float_traits<float32>::is_ieee754_binary && mpt::float_traits<float32>::is_native_endian, mpt::endian::native>::IEEE754binary64BE; static_assert(sizeof(IEEE754binary32LE) == 4); static_assert(sizeof(IEEE754binary32BE) == 4); Modified: trunk/OpenMPT/src/openmpt/base/Endian.hpp ============================================================================== --- trunk/OpenMPT/src/openmpt/base/Endian.hpp Thu Aug 15 21:47:09 2024 (r21464) +++ trunk/OpenMPT/src/openmpt/base/Endian.hpp Fri Aug 16 08:04:48 2024 (r21465) @@ -39,10 +39,10 @@ -using IEEE754binary32LE = mpt::IEEE754binary_types<mpt::float_traits<float32>::is_ieee754_binary32ne, mpt::endian::native>::IEEE754binary32LE; -using IEEE754binary32BE = mpt::IEEE754binary_types<mpt::float_traits<float32>::is_ieee754_binary32ne, mpt::endian::native>::IEEE754binary32BE; -using IEEE754binary64LE = mpt::IEEE754binary_types<mpt::float_traits<float64>::is_ieee754_binary64ne, mpt::endian::native>::IEEE754binary64LE; -using IEEE754binary64BE = mpt::IEEE754binary_types<mpt::float_traits<float64>::is_ieee754_binary64ne, mpt::endian::native>::IEEE754binary64BE; +using IEEE754binary32LE = mpt::IEEE754binary_types<mpt::float_traits<float32>::is_float32 && mpt::float_traits<float32>::is_ieee754_binary && mpt::float_traits<float32>::is_native_endian, mpt::endian::native>::IEEE754binary32LE; +using IEEE754binary32BE = mpt::IEEE754binary_types<mpt::float_traits<float32>::is_float32 && mpt::float_traits<float32>::is_ieee754_binary && mpt::float_traits<float32>::is_native_endian, mpt::endian::native>::IEEE754binary32BE; +using IEEE754binary64LE = mpt::IEEE754binary_types<mpt::float_traits<float64>::is_float64 && mpt::float_traits<float64>::is_ieee754_binary && mpt::float_traits<float64>::is_native_endian, mpt::endian::native>::IEEE754binary64LE; +using IEEE754binary64BE = mpt::IEEE754binary_types<mpt::float_traits<float64>::is_float64 && mpt::float_traits<float64>::is_ieee754_binary && mpt::float_traits<float64>::is_native_endian, mpt::endian::native>::IEEE754binary64BE; // unaligned |
|
From: <sv...@op...> - 2024-08-15 19:47:16
|
Author: manx Date: Thu Aug 15 21:47:09 2024 New Revision: 21464 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21464 Log: [Var] InnoSetup: Update to 6.3.3. 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 Thu Aug 15 21:40:24 2024 (r21463) +++ trunk/OpenMPT/build/download_externals.cmd Thu Aug 15 21:47:09 2024 (r21464) @@ -52,7 +52,7 @@ call :killdir "build\tools\innosetup" || goto error mkdir "build\tools\innosetup" || goto error -"build\externals\innosetup-6.3.1.exe" /PORTABLE=1 /CURRENTUSER /DIR="%CD%\build\tools\innosetup\{app}" /LOG="%CD%\build\tools\innosetup\setup.log" /SILENT || goto error +"build\externals\innosetup-6.3.3.exe" /PORTABLE=1 /CURRENTUSER /DIR="%CD%\build\tools\innosetup\{app}" /LOG="%CD%\build\tools\innosetup\setup.log" /SILENT || goto error call :killdir "build\tools\innounp" || goto error call :killdir "build\tools\innosetup5" || goto error Modified: trunk/OpenMPT/build/download_externals.txt ============================================================================== --- trunk/OpenMPT/build/download_externals.txt Thu Aug 15 21:40:24 2024 (r21463) +++ trunk/OpenMPT/build/download_externals.txt Thu Aug 15 21:47:09 2024 (r21464) @@ -6,7 +6,7 @@ "build/externals/htmlhelp.exe" 3509072 d91371244ea98c691b4674ee266c4a2496a296800c176adae069d21f5c52c0763b21cc7859cfffa865b89e50171a2c99a6d14620c32f7d72c0ef04045348f856 "https://web.archive.org/web/20200918004813id_/https://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe" "https://web.archive.org/web/20200918004813id_/http://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe" "build/externals/python-3.12.5-embed-amd64.zip" 11058677 d1f478a24c16aa46ca7950a13881563c46301bd698f614077a6b2076d2cea49d6cf0555515b5ead94be43f95cf9bc6e30d1b6ded77555b0f42d2f4c140ec6a96 "https://www.python.org/ftp/python/3.12.5/python-3.12.5-embed-amd64.zip" "build/externals/innounp050.rar" 141621 dbbc809308267a866db9d6b751fdeda6d179e1a65d8ddb14bb51984431ae91493f9a76105e1789b245732043a2c696c869ed10964b48cf59f81e55bd52f85330 "https://netcologne.dl.sourceforge.net/project/innounp/innounp/innounp 0.50/innounp050.rar" "https://deac-fra.dl.sourceforge.net/project/innounp/innounp/innounp 0.50/innounp050.rar" -"build/externals/innosetup-6.3.1.exe" 5251664 65d8b14febd0f8003c89c468966912f8fd799e48986fee8bd5f0549936f6cb9cd5ff11c5429e0b2587215140e595fcacbc129b6f81cccc09ca518758da4d86bc "https://files.jrsoftware.org/is/6/innosetup-6.3.1.exe" +"build/externals/innosetup-6.3.3.exe" 5634744 785e7cdad84da42ddfc94f8e20b7150a92fbca1904cfa4d7e23f68b874fba134e9c91a1fb5a8291e7e334f57c1063061d3e8496a2d9e7c4d9415ea9f12a3522e "https://files.jrsoftware.org/is/6/innosetup-6.3.3.exe" "https://files.innosetup.nl/innosetup-6.3.3.exe" "build/externals/isetup-5.5.8-unicode.exe" 2342456 da7e27d85caec85b4194c7b1412c5a64c0ae12f22d903b94f2f4ee9ea0cb99c91b2d1dbb49262eefae8129e6b91f5c46f26f353011076e77e75f9c955fc5e1cb "https://files.jrsoftware.org/is/5/isetup-5.5.8-unicode.exe" "build/externals/example_songs_ompt_1_30.7z" 4881392 bfecf7f97fd71bd52bcfb38307ccb98c751e6a0fa0c1f31208b22b9392f03ea3da8f9271327df2de4fc2e463e0c13c6a24107fbe18caf8f446b7e7cf93073fa5 "https://download.openmpt.org/resources/modules/example_songs_ompt_1_30.7z" "build/externals/allegro-4.2.3.1-hg.8+r8500.zip" 3872466 46cd8d4d7138b795dbc66994e953d0abc578c6d3c00615e3580237458529d33d7ad9d269a9778918d4b3719d75750d5cca74ff6bf38ad357a766472799ee9e7b "https://lib.openmpt.org/files/libopenmpt/contrib/allegro/allegro-4.2.3.1-hg.8+r8500.zip" "https://mercury.sexy/members/manx/liballegro-4.2/allegro-4.2.3.1-hg.8+r8500.zip" |
|
From: <sv...@op...> - 2024-08-15 19:40:36
|
Author: manx Date: Thu Aug 15 21:40:24 2024 New Revision: 21463 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21463 Log: [Mod] OpenMPT: Version is now 1.31.09.02 Modified: branches/OpenMPT-1.31/common/versionNumber.h Modified: branches/OpenMPT-1.31/common/versionNumber.h ============================================================================== --- branches/OpenMPT-1.31/common/versionNumber.h Thu Aug 15 21:40:01 2024 (r21462) +++ branches/OpenMPT-1.31/common/versionNumber.h Thu Aug 15 21:40:24 2024 (r21463) @@ -18,6 +18,6 @@ #define VER_MAJORMAJOR 1 #define VER_MAJOR 31 #define VER_MINOR 09 -#define VER_MINORMINOR 01 +#define VER_MINORMINOR 02 OPENMPT_NAMESPACE_END |
|
From: <sv...@op...> - 2024-08-15 19:40:15
|
Author: manx Date: Thu Aug 15 21:40:01 2024 New Revision: 21462 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21462 Log: [Mod] OpenMPT: Version is now 1.32.00.23 Modified: trunk/OpenMPT/common/versionNumber.h Modified: trunk/OpenMPT/common/versionNumber.h ============================================================================== --- trunk/OpenMPT/common/versionNumber.h Thu Aug 15 20:53:15 2024 (r21461) +++ trunk/OpenMPT/common/versionNumber.h Thu Aug 15 21:40:01 2024 (r21462) @@ -18,6 +18,6 @@ #define VER_MAJORMAJOR 1 #define VER_MAJOR 32 #define VER_MINOR 00 -#define VER_MINORMINOR 22 +#define VER_MINORMINOR 23 OPENMPT_NAMESPACE_END |
Author: manx Date: Thu Aug 15 20:53:15 2024 New Revision: 21461 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21461 Log: [Var] Regenerate project files. Modified: branches/OpenMPT-1.31/build/vs2019win10/OpenMPT-ANSI.vcxproj branches/OpenMPT-1.31/build/vs2019win10/OpenMPT-NativeSupport.vcxproj branches/OpenMPT-1.31/build/vs2019win10/OpenMPT-UTF8.vcxproj branches/OpenMPT-1.31/build/vs2019win10/OpenMPT-WineWrapper.vcxproj branches/OpenMPT-1.31/build/vs2019win10/OpenMPT.vcxproj branches/OpenMPT-1.31/build/vs2019win10/PluginBridge.vcxproj branches/OpenMPT-1.31/build/vs2019win10/PluginBridgeLegacy.vcxproj branches/OpenMPT-1.31/build/vs2019win10/ext/UnRAR.vcxproj branches/OpenMPT-1.31/build/vs2019win10/ext/ancient.vcxproj branches/OpenMPT-1.31/build/vs2019win10/ext/flac.vcxproj branches/OpenMPT-1.31/build/vs2019win10/ext/lame.vcxproj branches/OpenMPT-1.31/build/vs2019win10/ext/lhasa.vcxproj branches/OpenMPT-1.31/build/vs2019win10/ext/minimp3.vcxproj branches/OpenMPT-1.31/build/vs2019win10/ext/miniz.vcxproj branches/OpenMPT-1.31/build/vs2019win10/ext/minizip.vcxproj branches/OpenMPT-1.31/build/vs2019win10/ext/mpg123.vcxproj branches/OpenMPT-1.31/build/vs2019win10/ext/ogg.vcxproj branches/OpenMPT-1.31/build/vs2019win10/ext/opus.vcxproj branches/OpenMPT-1.31/build/vs2019win10/ext/opusenc.vcxproj branches/OpenMPT-1.31/build/vs2019win10/ext/opusfile.vcxproj branches/OpenMPT-1.31/build/vs2019win10/ext/portaudio.vcxproj branches/OpenMPT-1.31/build/vs2019win10/ext/portaudiocpp.vcxproj branches/OpenMPT-1.31/build/vs2019win10/ext/pugixml.vcxproj branches/OpenMPT-1.31/build/vs2019win10/ext/r8brain.vcxproj branches/OpenMPT-1.31/build/vs2019win10/ext/rtaudio.vcxproj branches/OpenMPT-1.31/build/vs2019win10/ext/rtmidi.vcxproj branches/OpenMPT-1.31/build/vs2019win10/ext/smbPitchShift.vcxproj branches/OpenMPT-1.31/build/vs2019win10/ext/soundtouch.vcxproj branches/OpenMPT-1.31/build/vs2019win10/ext/stb_vorbis.vcxproj branches/OpenMPT-1.31/build/vs2019win10/ext/vorbis.vcxproj branches/OpenMPT-1.31/build/vs2019win10/ext/zlib.vcxproj branches/OpenMPT-1.31/build/vs2019win10/in_openmpt.vcxproj branches/OpenMPT-1.31/build/vs2019win10/libopenmpt-small.vcxproj branches/OpenMPT-1.31/build/vs2019win10/libopenmpt.vcxproj branches/OpenMPT-1.31/build/vs2019win10/libopenmpt_example_c.vcxproj branches/OpenMPT-1.31/build/vs2019win10/libopenmpt_example_c_mem.vcxproj branches/OpenMPT-1.31/build/vs2019win10/libopenmpt_example_c_probe.vcxproj branches/OpenMPT-1.31/build/vs2019win10/libopenmpt_example_c_unsafe.vcxproj branches/OpenMPT-1.31/build/vs2019win10/libopenmpt_example_cxx.vcxproj branches/OpenMPT-1.31/build/vs2019win10/libopenmpt_test.vcxproj branches/OpenMPT-1.31/build/vs2019win10/openmpt123.vcxproj branches/OpenMPT-1.31/build/vs2019win10/updatesigntool.vcxproj branches/OpenMPT-1.31/build/vs2019win10/xmp-openmpt.vcxproj branches/OpenMPT-1.31/build/vs2019win10uwp/ext/minimp3.vcxproj branches/OpenMPT-1.31/build/vs2019win10uwp/ext/miniz.vcxproj branches/OpenMPT-1.31/build/vs2019win10uwp/ext/mpg123.vcxproj branches/OpenMPT-1.31/build/vs2019win10uwp/ext/ogg.vcxproj branches/OpenMPT-1.31/build/vs2019win10uwp/ext/stb_vorbis.vcxproj branches/OpenMPT-1.31/build/vs2019win10uwp/ext/vorbis.vcxproj branches/OpenMPT-1.31/build/vs2019win10uwp/ext/zlib.vcxproj branches/OpenMPT-1.31/build/vs2019win10uwp/libopenmpt-small.vcxproj branches/OpenMPT-1.31/build/vs2019win10uwp/libopenmpt.vcxproj branches/OpenMPT-1.31/build/vs2022win10/OpenMPT-ANSI.vcxproj branches/OpenMPT-1.31/build/vs2022win10/OpenMPT-NativeSupport.vcxproj branches/OpenMPT-1.31/build/vs2022win10/OpenMPT-UTF8.vcxproj branches/OpenMPT-1.31/build/vs2022win10/OpenMPT-WineWrapper.vcxproj branches/OpenMPT-1.31/build/vs2022win10/OpenMPT.vcxproj branches/OpenMPT-1.31/build/vs2022win10/PluginBridge.vcxproj branches/OpenMPT-1.31/build/vs2022win10/PluginBridgeLegacy.vcxproj branches/OpenMPT-1.31/build/vs2022win10/ext/UnRAR.vcxproj branches/OpenMPT-1.31/build/vs2022win10/ext/ancient.vcxproj branches/OpenMPT-1.31/build/vs2022win10/ext/flac.vcxproj branches/OpenMPT-1.31/build/vs2022win10/ext/lame.vcxproj branches/OpenMPT-1.31/build/vs2022win10/ext/lhasa.vcxproj branches/OpenMPT-1.31/build/vs2022win10/ext/minimp3.vcxproj branches/OpenMPT-1.31/build/vs2022win10/ext/miniz.vcxproj branches/OpenMPT-1.31/build/vs2022win10/ext/minizip.vcxproj branches/OpenMPT-1.31/build/vs2022win10/ext/mpg123.vcxproj branches/OpenMPT-1.31/build/vs2022win10/ext/ogg.vcxproj branches/OpenMPT-1.31/build/vs2022win10/ext/opus.vcxproj branches/OpenMPT-1.31/build/vs2022win10/ext/opusenc.vcxproj branches/OpenMPT-1.31/build/vs2022win10/ext/opusfile.vcxproj branches/OpenMPT-1.31/build/vs2022win10/ext/portaudio.vcxproj branches/OpenMPT-1.31/build/vs2022win10/ext/portaudiocpp.vcxproj branches/OpenMPT-1.31/build/vs2022win10/ext/pugixml.vcxproj branches/OpenMPT-1.31/build/vs2022win10/ext/r8brain.vcxproj branches/OpenMPT-1.31/build/vs2022win10/ext/rtaudio.vcxproj branches/OpenMPT-1.31/build/vs2022win10/ext/rtmidi.vcxproj branches/OpenMPT-1.31/build/vs2022win10/ext/smbPitchShift.vcxproj branches/OpenMPT-1.31/build/vs2022win10/ext/soundtouch.vcxproj branches/OpenMPT-1.31/build/vs2022win10/ext/stb_vorbis.vcxproj branches/OpenMPT-1.31/build/vs2022win10/ext/vorbis.vcxproj branches/OpenMPT-1.31/build/vs2022win10/ext/zlib.vcxproj branches/OpenMPT-1.31/build/vs2022win10/in_openmpt.vcxproj branches/OpenMPT-1.31/build/vs2022win10/libopenmpt-small.vcxproj branches/OpenMPT-1.31/build/vs2022win10/libopenmpt.vcxproj branches/OpenMPT-1.31/build/vs2022win10/libopenmpt_example_c.vcxproj branches/OpenMPT-1.31/build/vs2022win10/libopenmpt_example_c_mem.vcxproj branches/OpenMPT-1.31/build/vs2022win10/libopenmpt_example_c_probe.vcxproj branches/OpenMPT-1.31/build/vs2022win10/libopenmpt_example_c_unsafe.vcxproj branches/OpenMPT-1.31/build/vs2022win10/libopenmpt_example_cxx.vcxproj branches/OpenMPT-1.31/build/vs2022win10/libopenmpt_test.vcxproj branches/OpenMPT-1.31/build/vs2022win10/openmpt123.vcxproj branches/OpenMPT-1.31/build/vs2022win10/updatesigntool.vcxproj branches/OpenMPT-1.31/build/vs2022win10/xmp-openmpt.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/OpenMPT-ANSI.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/OpenMPT-NativeSupport.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/OpenMPT-UTF8.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/OpenMPT-WineWrapper.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/OpenMPT.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/PluginBridge.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/PluginBridgeLegacy.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/ext/UnRAR.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/ext/ancient.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/ext/flac.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/ext/lame.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/ext/lhasa.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/ext/minimp3.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/ext/miniz.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/ext/minizip.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/ext/mpg123.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/ext/ogg.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/ext/opus.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/ext/opusenc.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/ext/opusfile.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/ext/portaudio.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/ext/portaudiocpp.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/ext/pugixml.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/ext/r8brain.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/ext/rtaudio.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/ext/rtmidi.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/ext/smbPitchShift.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/ext/soundtouch.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/ext/stb_vorbis.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/ext/vorbis.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/ext/zlib.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/in_openmpt.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/libopenmpt-small.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/libopenmpt.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/libopenmpt_example_c.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/libopenmpt_example_c_mem.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/libopenmpt_example_c_probe.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/libopenmpt_example_c_unsafe.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/libopenmpt_example_cxx.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/libopenmpt_test.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/openmpt123.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/updatesigntool.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/xmp-openmpt.vcxproj branches/OpenMPT-1.31/build/vs2022win10uwp/ext/minimp3.vcxproj branches/OpenMPT-1.31/build/vs2022win10uwp/ext/miniz.vcxproj branches/OpenMPT-1.31/build/vs2022win10uwp/ext/mpg123.vcxproj branches/OpenMPT-1.31/build/vs2022win10uwp/ext/ogg.vcxproj branches/OpenMPT-1.31/build/vs2022win10uwp/ext/stb_vorbis.vcxproj branches/OpenMPT-1.31/build/vs2022win10uwp/ext/vorbis.vcxproj branches/OpenMPT-1.31/build/vs2022win10uwp/ext/zlib.vcxproj branches/OpenMPT-1.31/build/vs2022win10uwp/libopenmpt-small.vcxproj branches/OpenMPT-1.31/build/vs2022win10uwp/libopenmpt.vcxproj Modified: branches/OpenMPT-1.31/build/vs2019win10/OpenMPT-ANSI.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2019win10/OpenMPT-ANSI.vcxproj Thu Aug 15 20:53:09 2024 (r21460) +++ branches/OpenMPT-1.31/build/vs2019win10/OpenMPT-ANSI.vcxproj Thu Aug 15 20:53:15 2024 (r21461) @@ -568,7 +568,7 @@ <PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeaderFile>PCH.h</PrecompiledHeaderFile> <WarningLevel>Level4</WarningLevel> - <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000A;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\asiomodern\include;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ForcedIncludeFiles>PCH.h</ForcedIncludeFiles> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> @@ -582,7 +582,7 @@ <UseStandardPreprocessor>true</UseStandardPreprocessor> </ClCompile> <ResourceCompile> - <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000A;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"x86\";%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"x86\";%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\asiomodern\include;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> @@ -605,7 +605,7 @@ <PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeaderFile>PCH.h</PrecompiledHeaderFile> <WarningLevel>Level4</WarningLevel> - <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000A;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\asiomodern\include;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ForcedIncludeFiles>PCH.h</ForcedIncludeFiles> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> @@ -619,7 +619,7 @@ <UseStandardPreprocessor>true</UseStandardPreprocessor> </ClCompile> <ResourceCompile> - <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000A;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"amd64\";%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"amd64\";%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\asiomodern\include;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> @@ -642,7 +642,7 @@ <PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeaderFile>PCH.h</PrecompiledHeaderFile> <WarningLevel>Level4</WarningLevel> - <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000A;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\asiomodern\include;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ForcedIncludeFiles>PCH.h</ForcedIncludeFiles> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> @@ -656,7 +656,7 @@ <UseStandardPreprocessor>true</UseStandardPreprocessor> </ClCompile> <ResourceCompile> - <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000A;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"arm\";%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"arm\";%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\asiomodern\include;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> @@ -678,7 +678,7 @@ <PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeaderFile>PCH.h</PrecompiledHeaderFile> <WarningLevel>Level4</WarningLevel> - <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000A;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\asiomodern\include;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ForcedIncludeFiles>PCH.h</ForcedIncludeFiles> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> @@ -692,7 +692,7 @@ <UseStandardPreprocessor>true</UseStandardPreprocessor> </ClCompile> <ResourceCompile> - <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000A;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"arm64\";%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"arm64\";%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\asiomodern\include;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> @@ -714,7 +714,7 @@ <PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeaderFile>PCH.h</PrecompiledHeaderFile> <WarningLevel>Level4</WarningLevel> - <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000A;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\asiomodern\include;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ForcedIncludeFiles>PCH.h</ForcedIncludeFiles> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> @@ -732,7 +732,7 @@ <UseStandardPreprocessor>true</UseStandardPreprocessor> </ClCompile> <ResourceCompile> - <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000A;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"x86\";%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"x86\";%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\asiomodern\include;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> @@ -756,7 +756,7 @@ <PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeaderFile>PCH.h</PrecompiledHeaderFile> <WarningLevel>Level4</WarningLevel> - <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000A;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\asiomodern\include;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ForcedIncludeFiles>PCH.h</ForcedIncludeFiles> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> @@ -773,7 +773,7 @@ <UseStandardPreprocessor>true</UseStandardPreprocessor> </ClCompile> <ResourceCompile> - <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000A;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"amd64\";%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"amd64\";%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\asiomodern\include;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> @@ -797,7 +797,7 @@ <PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeaderFile>PCH.h</PrecompiledHeaderFile> <WarningLevel>Level4</WarningLevel> - <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000A;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\asiomodern\include;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ForcedIncludeFiles>PCH.h</ForcedIncludeFiles> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> @@ -814,7 +814,7 @@ <UseStandardPreprocessor>true</UseStandardPreprocessor> </ClCompile> <ResourceCompile> - <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000A;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"arm\";%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"arm\";%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\asiomodern\include;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> @@ -838,7 +838,7 @@ <PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeaderFile>PCH.h</PrecompiledHeaderFile> <WarningLevel>Level4</WarningLevel> - <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000A;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\asiomodern\include;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ForcedIncludeFiles>PCH.h</ForcedIncludeFiles> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> @@ -855,7 +855,7 @@ <UseStandardPreprocessor>true</UseStandardPreprocessor> </ClCompile> <ResourceCompile> - <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000A;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"arm64\";%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"arm64\";%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\asiomodern\include;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> @@ -879,7 +879,7 @@ <PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeaderFile>PCH.h</PrecompiledHeaderFile> <WarningLevel>Level4</WarningLevel> - <PreprocessorDefinitions>DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000A;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\asiomodern\include;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ForcedIncludeFiles>PCH.h</ForcedIncludeFiles> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> @@ -898,7 +898,7 @@ <UseStandardPreprocessor>true</UseStandardPreprocessor> </ClCompile> <ResourceCompile> - <PreprocessorDefinitions>DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000A;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"x86\";%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"x86\";%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\asiomodern\include;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> @@ -922,7 +922,7 @@ <PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeaderFile>PCH.h</PrecompiledHeaderFile> <WarningLevel>Level4</WarningLevel> - <PreprocessorDefinitions>DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000A;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;... [truncated message content] |
Author: manx Date: Thu Aug 15 20:53:09 2024 New Revision: 21460 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21460 Log: [Var] Regenerate project files. Modified: trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2019win10/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2019win10/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2019win10/OpenMPT-WineWrapper.vcxproj trunk/OpenMPT/build/vs2019win10/OpenMPT.vcxproj trunk/OpenMPT/build/vs2019win10/PluginBridge.vcxproj trunk/OpenMPT/build/vs2019win10/PluginBridgeLegacy.vcxproj trunk/OpenMPT/build/vs2019win10/ext/UnRAR.vcxproj trunk/OpenMPT/build/vs2019win10/ext/ancient.vcxproj trunk/OpenMPT/build/vs2019win10/ext/flac.vcxproj trunk/OpenMPT/build/vs2019win10/ext/lame.vcxproj trunk/OpenMPT/build/vs2019win10/ext/lhasa.vcxproj trunk/OpenMPT/build/vs2019win10/ext/minimp3.vcxproj trunk/OpenMPT/build/vs2019win10/ext/miniz.vcxproj trunk/OpenMPT/build/vs2019win10/ext/minizip.vcxproj trunk/OpenMPT/build/vs2019win10/ext/mpg123.vcxproj trunk/OpenMPT/build/vs2019win10/ext/ogg.vcxproj trunk/OpenMPT/build/vs2019win10/ext/opus.vcxproj trunk/OpenMPT/build/vs2019win10/ext/opusenc.vcxproj trunk/OpenMPT/build/vs2019win10/ext/opusfile.vcxproj trunk/OpenMPT/build/vs2019win10/ext/portaudio.vcxproj trunk/OpenMPT/build/vs2019win10/ext/portaudiocpp.vcxproj trunk/OpenMPT/build/vs2019win10/ext/pugixml.vcxproj trunk/OpenMPT/build/vs2019win10/ext/r8brain.vcxproj trunk/OpenMPT/build/vs2019win10/ext/rtaudio.vcxproj trunk/OpenMPT/build/vs2019win10/ext/rtmidi.vcxproj trunk/OpenMPT/build/vs2019win10/ext/smbPitchShift.vcxproj trunk/OpenMPT/build/vs2019win10/ext/soundtouch.vcxproj trunk/OpenMPT/build/vs2019win10/ext/stb_vorbis.vcxproj trunk/OpenMPT/build/vs2019win10/ext/vorbis.vcxproj trunk/OpenMPT/build/vs2019win10/ext/zlib.vcxproj trunk/OpenMPT/build/vs2019win10/in_openmpt.vcxproj trunk/OpenMPT/build/vs2019win10/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2019win10/libopenmpt.vcxproj trunk/OpenMPT/build/vs2019win10/libopenmpt_example_c.vcxproj trunk/OpenMPT/build/vs2019win10/libopenmpt_example_c_mem.vcxproj trunk/OpenMPT/build/vs2019win10/libopenmpt_example_c_probe.vcxproj trunk/OpenMPT/build/vs2019win10/libopenmpt_example_c_unsafe.vcxproj trunk/OpenMPT/build/vs2019win10/libopenmpt_example_cxx.vcxproj trunk/OpenMPT/build/vs2019win10/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2019win10/openmpt123.vcxproj trunk/OpenMPT/build/vs2019win10/updatesigntool.vcxproj trunk/OpenMPT/build/vs2019win10/xmp-openmpt.vcxproj trunk/OpenMPT/build/vs2019win10uwp/ext/minimp3.vcxproj trunk/OpenMPT/build/vs2019win10uwp/ext/miniz.vcxproj trunk/OpenMPT/build/vs2019win10uwp/ext/mpg123.vcxproj trunk/OpenMPT/build/vs2019win10uwp/ext/ogg.vcxproj trunk/OpenMPT/build/vs2019win10uwp/ext/stb_vorbis.vcxproj trunk/OpenMPT/build/vs2019win10uwp/ext/vorbis.vcxproj trunk/OpenMPT/build/vs2019win10uwp/ext/zlib.vcxproj trunk/OpenMPT/build/vs2019win10uwp/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2019win10uwp/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win10/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win10/OpenMPT-WineWrapper.vcxproj trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win10/PluginBridge.vcxproj trunk/OpenMPT/build/vs2022win10/PluginBridgeLegacy.vcxproj trunk/OpenMPT/build/vs2022win10/ext/UnRAR.vcxproj trunk/OpenMPT/build/vs2022win10/ext/ancient.vcxproj trunk/OpenMPT/build/vs2022win10/ext/flac.vcxproj trunk/OpenMPT/build/vs2022win10/ext/lame.vcxproj trunk/OpenMPT/build/vs2022win10/ext/lhasa.vcxproj trunk/OpenMPT/build/vs2022win10/ext/minimp3.vcxproj trunk/OpenMPT/build/vs2022win10/ext/miniz.vcxproj trunk/OpenMPT/build/vs2022win10/ext/minizip.vcxproj trunk/OpenMPT/build/vs2022win10/ext/mpg123.vcxproj trunk/OpenMPT/build/vs2022win10/ext/ogg.vcxproj trunk/OpenMPT/build/vs2022win10/ext/opus.vcxproj trunk/OpenMPT/build/vs2022win10/ext/opusenc.vcxproj trunk/OpenMPT/build/vs2022win10/ext/opusfile.vcxproj trunk/OpenMPT/build/vs2022win10/ext/portaudio.vcxproj trunk/OpenMPT/build/vs2022win10/ext/portaudiocpp.vcxproj trunk/OpenMPT/build/vs2022win10/ext/pugixml.vcxproj trunk/OpenMPT/build/vs2022win10/ext/r8brain.vcxproj trunk/OpenMPT/build/vs2022win10/ext/rtaudio.vcxproj trunk/OpenMPT/build/vs2022win10/ext/rtmidi.vcxproj trunk/OpenMPT/build/vs2022win10/ext/smbPitchShift.vcxproj trunk/OpenMPT/build/vs2022win10/ext/soundtouch.vcxproj trunk/OpenMPT/build/vs2022win10/ext/stb_vorbis.vcxproj trunk/OpenMPT/build/vs2022win10/ext/vorbis.vcxproj trunk/OpenMPT/build/vs2022win10/ext/zlib.vcxproj trunk/OpenMPT/build/vs2022win10/in_openmpt.vcxproj trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2022win10/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win10/libopenmpt_example_c.vcxproj trunk/OpenMPT/build/vs2022win10/libopenmpt_example_c_mem.vcxproj trunk/OpenMPT/build/vs2022win10/libopenmpt_example_c_probe.vcxproj trunk/OpenMPT/build/vs2022win10/libopenmpt_example_c_unsafe.vcxproj trunk/OpenMPT/build/vs2022win10/libopenmpt_example_cxx.vcxproj trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2022win10/openmpt123.vcxproj trunk/OpenMPT/build/vs2022win10/updatesigntool.vcxproj trunk/OpenMPT/build/vs2022win10/xmp-openmpt.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT-WineWrapper.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win10clang/PluginBridge.vcxproj trunk/OpenMPT/build/vs2022win10clang/PluginBridgeLegacy.vcxproj trunk/OpenMPT/build/vs2022win10clang/ext/UnRAR.vcxproj trunk/OpenMPT/build/vs2022win10clang/ext/ancient.vcxproj trunk/OpenMPT/build/vs2022win10clang/ext/flac.vcxproj trunk/OpenMPT/build/vs2022win10clang/ext/lame.vcxproj trunk/OpenMPT/build/vs2022win10clang/ext/lhasa.vcxproj trunk/OpenMPT/build/vs2022win10clang/ext/minimp3.vcxproj trunk/OpenMPT/build/vs2022win10clang/ext/miniz.vcxproj trunk/OpenMPT/build/vs2022win10clang/ext/minizip.vcxproj trunk/OpenMPT/build/vs2022win10clang/ext/mpg123.vcxproj trunk/OpenMPT/build/vs2022win10clang/ext/ogg.vcxproj trunk/OpenMPT/build/vs2022win10clang/ext/opus.vcxproj trunk/OpenMPT/build/vs2022win10clang/ext/opusenc.vcxproj trunk/OpenMPT/build/vs2022win10clang/ext/opusfile.vcxproj trunk/OpenMPT/build/vs2022win10clang/ext/portaudio.vcxproj trunk/OpenMPT/build/vs2022win10clang/ext/portaudiocpp.vcxproj trunk/OpenMPT/build/vs2022win10clang/ext/pugixml.vcxproj trunk/OpenMPT/build/vs2022win10clang/ext/r8brain.vcxproj trunk/OpenMPT/build/vs2022win10clang/ext/rtaudio.vcxproj trunk/OpenMPT/build/vs2022win10clang/ext/rtmidi.vcxproj trunk/OpenMPT/build/vs2022win10clang/ext/smbPitchShift.vcxproj trunk/OpenMPT/build/vs2022win10clang/ext/soundtouch.vcxproj trunk/OpenMPT/build/vs2022win10clang/ext/stb_vorbis.vcxproj trunk/OpenMPT/build/vs2022win10clang/ext/vorbis.vcxproj trunk/OpenMPT/build/vs2022win10clang/ext/zlib.vcxproj trunk/OpenMPT/build/vs2022win10clang/in_openmpt.vcxproj trunk/OpenMPT/build/vs2022win10clang/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2022win10clang/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win10clang/libopenmpt_example_c.vcxproj trunk/OpenMPT/build/vs2022win10clang/libopenmpt_example_c_mem.vcxproj trunk/OpenMPT/build/vs2022win10clang/libopenmpt_example_c_probe.vcxproj trunk/OpenMPT/build/vs2022win10clang/libopenmpt_example_c_unsafe.vcxproj trunk/OpenMPT/build/vs2022win10clang/libopenmpt_example_cxx.vcxproj trunk/OpenMPT/build/vs2022win10clang/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2022win10clang/openmpt123.vcxproj trunk/OpenMPT/build/vs2022win10clang/updatesigntool.vcxproj trunk/OpenMPT/build/vs2022win10clang/xmp-openmpt.vcxproj trunk/OpenMPT/build/vs2022win10uwp/ext/minimp3.vcxproj trunk/OpenMPT/build/vs2022win10uwp/ext/miniz.vcxproj trunk/OpenMPT/build/vs2022win10uwp/ext/mpg123.vcxproj trunk/OpenMPT/build/vs2022win10uwp/ext/ogg.vcxproj trunk/OpenMPT/build/vs2022win10uwp/ext/stb_vorbis.vcxproj trunk/OpenMPT/build/vs2022win10uwp/ext/vorbis.vcxproj trunk/OpenMPT/build/vs2022win10uwp/ext/zlib.vcxproj trunk/OpenMPT/build/vs2022win10uwp/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2022win10uwp/libopenmpt.vcxproj Modified: trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj Thu Aug 15 20:50:23 2024 (r21459) +++ trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj Thu Aug 15 20:53:09 2024 (r21460) @@ -568,7 +568,7 @@ <PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeaderFile>PCH.h</PrecompiledHeaderFile> <WarningLevel>Level4</WarningLevel> - <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000A;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\asiomodern\include;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ForcedIncludeFiles>PCH.h</ForcedIncludeFiles> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> @@ -582,7 +582,7 @@ <UseStandardPreprocessor>true</UseStandardPreprocessor> </ClCompile> <ResourceCompile> - <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000A;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"x86\";%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"x86\";%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\asiomodern\include;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> @@ -605,7 +605,7 @@ <PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeaderFile>PCH.h</PrecompiledHeaderFile> <WarningLevel>Level4</WarningLevel> - <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000A;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\asiomodern\include;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ForcedIncludeFiles>PCH.h</ForcedIncludeFiles> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> @@ -619,7 +619,7 @@ <UseStandardPreprocessor>true</UseStandardPreprocessor> </ClCompile> <ResourceCompile> - <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000A;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"amd64\";%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"amd64\";%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\asiomodern\include;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> @@ -642,7 +642,7 @@ <PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeaderFile>PCH.h</PrecompiledHeaderFile> <WarningLevel>Level4</WarningLevel> - <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000A;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\asiomodern\include;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ForcedIncludeFiles>PCH.h</ForcedIncludeFiles> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> @@ -656,7 +656,7 @@ <UseStandardPreprocessor>true</UseStandardPreprocessor> </ClCompile> <ResourceCompile> - <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000A;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"arm\";%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"arm\";%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\asiomodern\include;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> @@ -678,7 +678,7 @@ <PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeaderFile>PCH.h</PrecompiledHeaderFile> <WarningLevel>Level4</WarningLevel> - <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000A;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\asiomodern\include;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ForcedIncludeFiles>PCH.h</ForcedIncludeFiles> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> @@ -692,7 +692,7 @@ <UseStandardPreprocessor>true</UseStandardPreprocessor> </ClCompile> <ResourceCompile> - <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000A;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"arm64\";%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"arm64\";%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\asiomodern\include;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> @@ -714,7 +714,7 @@ <PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeaderFile>PCH.h</PrecompiledHeaderFile> <WarningLevel>Level4</WarningLevel> - <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000A;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\asiomodern\include;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ForcedIncludeFiles>PCH.h</ForcedIncludeFiles> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> @@ -732,7 +732,7 @@ <UseStandardPreprocessor>true</UseStandardPreprocessor> </ClCompile> <ResourceCompile> - <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000A;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"x86\";%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"x86\";%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\asiomodern\include;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> @@ -756,7 +756,7 @@ <PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeaderFile>PCH.h</PrecompiledHeaderFile> <WarningLevel>Level4</WarningLevel> - <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000A;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\asiomodern\include;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ForcedIncludeFiles>PCH.h</ForcedIncludeFiles> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> @@ -773,7 +773,7 @@ <UseStandardPreprocessor>true</UseStandardPreprocessor> </ClCompile> <ResourceCompile> - <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000A;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"amd64\";%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"amd64\";%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\asiomodern\include;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> @@ -797,7 +797,7 @@ <PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeaderFile>PCH.h</PrecompiledHeaderFile> <WarningLevel>Level4</WarningLevel> - <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000A;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\asiomodern\include;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ForcedIncludeFiles>PCH.h</ForcedIncludeFiles> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> @@ -814,7 +814,7 @@ <UseStandardPreprocessor>true</UseStandardPreprocessor> </ClCompile> <ResourceCompile> - <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000A;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"arm\";%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"arm\";%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\asiomodern\include;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> @@ -838,7 +838,7 @@ <PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeaderFile>PCH.h</PrecompiledHeaderFile> <WarningLevel>Level4</WarningLevel> - <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000A;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\asiomodern\include;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ForcedIncludeFiles>PCH.h</ForcedIncludeFiles> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> @@ -855,7 +855,7 @@ <UseStandardPreprocessor>true</UseStandardPreprocessor> </ClCompile> <ResourceCompile> - <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000A;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"arm64\";%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"arm64\";%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\asiomodern\include;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> @@ -879,7 +879,7 @@ <PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeaderFile>PCH.h</PrecompiledHeaderFile> <WarningLevel>Level4</WarningLevel> - <PreprocessorDefinitions>DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000A;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\asiomodern\include;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ForcedIncludeFiles>PCH.h</ForcedIncludeFiles> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> @@ -898,7 +898,7 @@ <UseStandardPreprocessor>true</UseStandardPreprocessor> </ClCompile> <ResourceCompile> - <PreprocessorDefinitions>DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000A;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"x86\";%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"x86\";%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\asiomodern\include;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> @@ -922,7 +922,7 @@ <PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeaderFile>PCH.h</PrecompiledHeaderFile> <WarningLevel>Level4</WarningLevel> - <PreprocessorDefinitions>DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000A;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_ANCIENT;MPT_WITH_ASIO;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\asiomodern\include;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirect... [truncated message content] |
|
From: <sv...@op...> - 2024-08-15 18:50:35
|
Author: manx Date: Thu Aug 15 20:50:23 2024 New Revision: 21459 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21459 Log: Merged revision(s) 21456 from trunk/OpenMPT: [Fix] build: premake: Windows 10 21H2 is actually NTDDI_VERSION 0x0A00000C. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/build/premake/premake-defaults.lua Modified: branches/OpenMPT-1.31/build/premake/premake-defaults.lua ============================================================================== --- branches/OpenMPT-1.31/build/premake/premake-defaults.lua Thu Aug 15 20:49:55 2024 (r21458) +++ branches/OpenMPT-1.31/build/premake/premake-defaults.lua Thu Aug 15 20:50:23 2024 (r21459) @@ -374,16 +374,16 @@ defines { "_WIN32_WINNT=0x0A00" } filter {} filter { "architecture:x86" } - defines { "NTDDI_VERSION=0x0A00000A" } -- Windows 10 21H2 Build 19044 + defines { "NTDDI_VERSION=0x0A00000C" } -- Windows 10 21H2 Build 19044 filter {} filter { "architecture:x86_64" } - defines { "NTDDI_VERSION=0x0A00000A" } -- Windows 10 21H2 Build 19044 + defines { "NTDDI_VERSION=0x0A00000C" } -- Windows 10 21H2 Build 19044 filter {} filter { "architecture:ARM" } - defines { "NTDDI_VERSION=0x0A00000A" } -- Windows 10 21H2 Build 19044 + defines { "NTDDI_VERSION=0x0A00000C" } -- Windows 10 21H2 Build 19044 filter {} filter { "architecture:ARM64" } - defines { "NTDDI_VERSION=0x0A00000A" } -- Windows 10 21H2 Build 19044 + defines { "NTDDI_VERSION=0x0A00000C" } -- Windows 10 21H2 Build 19044 filter {} elseif _OPTIONS["windows-version"] == "win81" then filter {} |
|
From: <sv...@op...> - 2024-08-15 18:50:08
|
Author: manx Date: Thu Aug 15 20:49:55 2024 New Revision: 21458 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21458 Log: Merged revision(s) 21455 from trunk/OpenMPT: [Imp] mptOS: Add Windows 11 24H2. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/misc/mptOS.cpp Modified: branches/OpenMPT-1.31/misc/mptOS.cpp ============================================================================== --- branches/OpenMPT-1.31/misc/mptOS.cpp Thu Aug 15 20:49:29 2024 (r21457) +++ branches/OpenMPT-1.31/misc/mptOS.cpp Thu Aug 15 20:49:55 2024 (r21458) @@ -35,7 +35,8 @@ static constexpr struct { mpt::osinfo::windows::Version version; const mpt::uchar * name; bool showDetails; } versionMap[] = { - { mpt::osinfo::windows::Version{ mpt::osinfo::windows::Version::WinNewer, mpt::osinfo::windows::Version::ServicePack{ 0, 0 }, 22631, 0 }, UL_("Windows 11 (or newer)"), false }, + { mpt::osinfo::windows::Version{ mpt::osinfo::windows::Version::WinNewer, mpt::osinfo::windows::Version::ServicePack{ 0, 0 }, 26100, 0 }, UL_("Windows 11 (or newer)"), false }, + { mpt::osinfo::windows::Version{ mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack{ 0, 0 }, 26100, 0 }, UL_("Windows 11 24H2"), true }, { mpt::osinfo::windows::Version{ mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack{ 0, 0 }, 22631, 0 }, UL_("Windows 11 23H2"), true }, { mpt::osinfo::windows::Version{ mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack{ 0, 0 }, 22621, 0 }, UL_("Windows 11 22H2"), true }, { mpt::osinfo::windows::Version{ mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack{ 0, 0 }, 22000, 0 }, UL_("Windows 11 21H2"), true }, |
|
From: <sv...@op...> - 2024-08-15 18:49:41
|
Author: manx Date: Thu Aug 15 20:49:29 2024 New Revision: 21457 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21457 Log: Merged revision(s) 21454 from trunk/OpenMPT: [Fix] mpt/base/detect_os.hpp: Apparently during the transition period from Windows 10 to Windows 11, Microsoft missed adding properly distinguishing NTDDI version macros for the versions of Windows 10 and Windows 11 with the same year version moniker. This caused us to be confused which NTDDI version is meant to imply Windows 10 vs Windows 11. This appears to be cleaned up in the latest SDK. Adjust our macros accordingly. [Fix] mpt/osinfo/windows_version.hpp: Support all intermediate Windows 10 and Windows 11 versions. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/src/mpt/base/detect_os.hpp branches/OpenMPT-1.31/src/mpt/osinfo/windows_version.hpp Modified: branches/OpenMPT-1.31/src/mpt/base/detect_os.hpp ============================================================================== --- branches/OpenMPT-1.31/src/mpt/base/detect_os.hpp Thu Aug 15 20:48:57 2024 (r21456) +++ branches/OpenMPT-1.31/src/mpt/base/detect_os.hpp Thu Aug 15 20:49:29 2024 (r21457) @@ -52,13 +52,14 @@ #define MPT_WIN_10_1903 MPT_WIN_MAKE_VERSION(0x0a, 0x00, 0x00, 0x07) // NTDDI_WIN10_19H1 1903/19H1 #define MPT_WIN_10_1909 MPT_WIN_MAKE_VERSION(0x0a, 0x00, 0x00, 0x08) // NTDDI_WIN10_VB 1909/19H2 #define MPT_WIN_10_2004 MPT_WIN_MAKE_VERSION(0x0a, 0x00, 0x00, 0x09) // NTDDI_WIN10_MN 2004/20H1 - // 20H2 - // 21H1 -#define MPT_WIN_10_21H2 MPT_WIN_MAKE_VERSION(0x0a, 0x00, 0x00, 0x0a) // NTDDI_WIN10_FE 21H2 - // 22H2 - -#define MPT_WIN_11 MPT_WIN_MAKE_VERSION(0x0a, 0x00, 0x00, 0x0b) // NTDDI_WIN10_CO 21H2 -#define MPT_WIN_11_22H2 MPT_WIN_MAKE_VERSION(0x0a, 0x00, 0x00, 0x0c) // NTDDI_WIN10_NI 22H2 +#define MPT_WIN_10_20H2 MPT_WIN_MAKE_VERSION(0x0a, 0x00, 0x00, 0x0a) // NTDDI_WIN10_FE 20H2 +#define MPT_WIN_10_21H1 MPT_WIN_MAKE_VERSION(0x0a, 0x00, 0x00, 0x0b) // NTDDI_WIN10_CO 21H1 +#define MPT_WIN_10_21H2 MPT_WIN_MAKE_VERSION(0x0a, 0x00, 0x00, 0x0c) // NTDDI_WIN10_NI 21H2 +#define MPT_WIN_10_22H2 MPT_WIN_MAKE_VERSION(0x0a, 0x00, 0x00, 0x0d) // NTDDI_WIN10_CU 22H2 + +#define MPT_WIN_11 MPT_WIN_MAKE_VERSION(0x0a, 0x00, 0x00, 0x0e) // NTDDI_WIN11_ZN 21H2 +#define MPT_WIN_11_22H2 MPT_WIN_MAKE_VERSION(0x0a, 0x00, 0x00, 0x0f) // NTDDI_WIN11_GA 22H2 +#define MPT_WIN_11_23H2 MPT_WIN_MAKE_VERSION(0x0a, 0x00, 0x00, 0x10) // NTDDI_WIN11_GE 23H2 // MPT_WIN_API_DESKTOP : Windows 8/10 Desktop Application (Win32) // MPT_WIN_API_UNIVERSAL : Windows 10 Store App / Universal App @@ -227,13 +228,25 @@ static_assert(NTDDI_WIN10_MN == MPT_WIN_10_2004); #endif #ifdef NTDDI_WIN10_FE -static_assert(NTDDI_WIN10_FE == MPT_WIN_10_21H2); +static_assert(NTDDI_WIN10_FE == MPT_WIN_10_20H2); #endif #ifdef NTDDI_WIN10_CO -static_assert(NTDDI_WIN10_CO == MPT_WIN_11); +static_assert(NTDDI_WIN10_CO == MPT_WIN_10_21H1); #endif #ifdef NTDDI_WIN10_NI -static_assert(NTDDI_WIN10_NI == MPT_WIN_11_22H2); +static_assert(NTDDI_WIN10_NI == MPT_WIN_10_21H2); +#endif +#ifdef NTDDI_WIN10_CU +static_assert(NTDDI_WIN10_CU == MPT_WIN_10_22H2); +#endif +#ifdef NTDDI_WIN11_ZN +static_assert(NTDDI_WIN11_ZN == MPT_WIN_11); +#endif +#ifdef NTDDI_WIN11_GA +static_assert(NTDDI_WIN11_GA == MPT_WIN_11_22H2); +#endif +#ifdef NTDDI_WIN11_GE +static_assert(NTDDI_WIN11_GE == MPT_WIN_11_23H2); #endif #endif #if defined(WINAPI_FAMILY) Modified: branches/OpenMPT-1.31/src/mpt/osinfo/windows_version.hpp ============================================================================== --- branches/OpenMPT-1.31/src/mpt/osinfo/windows_version.hpp Thu Aug 15 20:48:57 2024 (r21456) +++ branches/OpenMPT-1.31/src/mpt/osinfo/windows_version.hpp Thu Aug 15 20:49:29 2024 (r21457) @@ -131,18 +131,20 @@ static mpt::osinfo::windows::Version FromSDK() noexcept { // Initialize to used SDK version -#if MPT_WINNT_AT_LEAST(MPT_WIN_11_22H2) +#if MPT_WINNT_AT_LEAST(MPT_WIN_11_23H2) + return mpt::osinfo::windows::Version(mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack(0, 0), 22631, 0); +#elif MPT_WINNT_AT_LEAST(MPT_WIN_11_22H2) return mpt::osinfo::windows::Version(mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack(0, 0), 22621, 0); #elif MPT_WINNT_AT_LEAST(MPT_WIN_11) // 21H2 return mpt::osinfo::windows::Version(mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack(0, 0), 22000, 0); -//#elif // 22H2 -// return mpt::osinfo::windows::Version(mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack(0, 0), 19045, 0); +#elif MPT_WINNT_AT_LEAST(MPT_WIN_10_22H2) + return mpt::osinfo::windows::Version(mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack(0, 0), 19045, 0); #elif MPT_WINNT_AT_LEAST(MPT_WIN_10_21H2) return mpt::osinfo::windows::Version(mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack(0, 0), 19044, 0); -//#elif // 21H1 -// return mpt::osinfo::windows::Version(mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack(0, 0), 19043, 0); -//#elif // 20H2 -// return mpt::osinfo::windows::Version(mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack(0, 0), 19042, 0); +#elif MPT_WINNT_AT_LEAST(MPT_WIN_10_21H1) + return mpt::osinfo::windows::Version(mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack(0, 0), 19043, 0); +#elif MPT_WINNT_AT_LEAST(MPT_WIN_10_20H2) + return mpt::osinfo::windows::Version(mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack(0, 0), 19042, 0); #elif MPT_WINNT_AT_LEAST(MPT_WIN_10_2004) return mpt::osinfo::windows::Version(mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack(0, 0), 19041, 0); #elif MPT_WINNT_AT_LEAST(MPT_WIN_10_1909) |
|
From: <sv...@op...> - 2024-08-15 18:49:04
|
Author: manx Date: Thu Aug 15 20:48:57 2024 New Revision: 21456 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21456 Log: [Fix] build: premake: Windows 10 21H2 is actually NTDDI_VERSION 0x0A00000C. Modified: trunk/OpenMPT/build/premake/premake-defaults.lua Modified: trunk/OpenMPT/build/premake/premake-defaults.lua ============================================================================== --- trunk/OpenMPT/build/premake/premake-defaults.lua Thu Aug 15 20:47:08 2024 (r21455) +++ trunk/OpenMPT/build/premake/premake-defaults.lua Thu Aug 15 20:48:57 2024 (r21456) @@ -395,16 +395,16 @@ defines { "_WIN32_WINNT=0x0A00" } filter {} filter { "architecture:x86" } - defines { "NTDDI_VERSION=0x0A00000A" } -- Windows 10 21H2 Build 19044 + defines { "NTDDI_VERSION=0x0A00000C" } -- Windows 10 21H2 Build 19044 filter {} filter { "architecture:x86_64" } - defines { "NTDDI_VERSION=0x0A00000A" } -- Windows 10 21H2 Build 19044 + defines { "NTDDI_VERSION=0x0A00000C" } -- Windows 10 21H2 Build 19044 filter {} filter { "architecture:ARM" } - defines { "NTDDI_VERSION=0x0A00000A" } -- Windows 10 21H2 Build 19044 + defines { "NTDDI_VERSION=0x0A00000C" } -- Windows 10 21H2 Build 19044 filter {} filter { "architecture:ARM64" } - defines { "NTDDI_VERSION=0x0A00000A" } -- Windows 10 21H2 Build 19044 + defines { "NTDDI_VERSION=0x0A00000C" } -- Windows 10 21H2 Build 19044 filter {} elseif _OPTIONS["windows-version"] == "win81" then filter {} |
|
From: <sv...@op...> - 2024-08-15 18:47:15
|
Author: manx Date: Thu Aug 15 20:47:08 2024 New Revision: 21455 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21455 Log: [Imp] mptOS: Add Windows 11 24H2. Modified: trunk/OpenMPT/misc/mptOS.cpp Modified: trunk/OpenMPT/misc/mptOS.cpp ============================================================================== --- trunk/OpenMPT/misc/mptOS.cpp Thu Aug 15 20:45:56 2024 (r21454) +++ trunk/OpenMPT/misc/mptOS.cpp Thu Aug 15 20:47:08 2024 (r21455) @@ -35,7 +35,8 @@ static constexpr struct { mpt::osinfo::windows::Version version; const mpt::uchar * name; bool showDetails; } versionMap[] = { - { mpt::osinfo::windows::Version{ mpt::osinfo::windows::Version::WinNewer, mpt::osinfo::windows::Version::ServicePack{ 0, 0 }, 22631, 0 }, UL_("Windows 11 (or newer)"), false }, + { mpt::osinfo::windows::Version{ mpt::osinfo::windows::Version::WinNewer, mpt::osinfo::windows::Version::ServicePack{ 0, 0 }, 26100, 0 }, UL_("Windows 11 (or newer)"), false }, + { mpt::osinfo::windows::Version{ mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack{ 0, 0 }, 26100, 0 }, UL_("Windows 11 24H2"), true }, { mpt::osinfo::windows::Version{ mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack{ 0, 0 }, 22631, 0 }, UL_("Windows 11 23H2"), true }, { mpt::osinfo::windows::Version{ mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack{ 0, 0 }, 22621, 0 }, UL_("Windows 11 22H2"), true }, { mpt::osinfo::windows::Version{ mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack{ 0, 0 }, 22000, 0 }, UL_("Windows 11 21H2"), true }, |
|
From: <sv...@op...> - 2024-08-15 18:46:11
|
Author: manx Date: Thu Aug 15 20:45:56 2024 New Revision: 21454 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21454 Log: [Fix] mpt/base/detect_os.hpp: Apparently during the transition period from Windows 10 to Windows 11, Microsoft missed adding properly distinguishing NTDDI version macros for the versions of Windows 10 and Windows 11 with the same year version moniker. This caused us to be confused which NTDDI version is meant to imply Windows 10 vs Windows 11. This appears to be cleaned up in the latest SDK. Adjust our macros accordingly. [Fix] mpt/osinfo/windows_version.hpp: Support all intermediate Windows 10 and Windows 11 versions. Modified: trunk/OpenMPT/src/mpt/base/detect_os.hpp trunk/OpenMPT/src/mpt/osinfo/windows_version.hpp Modified: trunk/OpenMPT/src/mpt/base/detect_os.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/base/detect_os.hpp Thu Aug 15 19:57:17 2024 (r21453) +++ trunk/OpenMPT/src/mpt/base/detect_os.hpp Thu Aug 15 20:45:56 2024 (r21454) @@ -52,13 +52,14 @@ #define MPT_WIN_10_1903 MPT_WIN_MAKE_VERSION(0x0a, 0x00, 0x00, 0x07) // NTDDI_WIN10_19H1 1903/19H1 #define MPT_WIN_10_1909 MPT_WIN_MAKE_VERSION(0x0a, 0x00, 0x00, 0x08) // NTDDI_WIN10_VB 1909/19H2 #define MPT_WIN_10_2004 MPT_WIN_MAKE_VERSION(0x0a, 0x00, 0x00, 0x09) // NTDDI_WIN10_MN 2004/20H1 - // 20H2 - // 21H1 -#define MPT_WIN_10_21H2 MPT_WIN_MAKE_VERSION(0x0a, 0x00, 0x00, 0x0a) // NTDDI_WIN10_FE 21H2 - // 22H2 - -#define MPT_WIN_11 MPT_WIN_MAKE_VERSION(0x0a, 0x00, 0x00, 0x0b) // NTDDI_WIN10_CO 21H2 -#define MPT_WIN_11_22H2 MPT_WIN_MAKE_VERSION(0x0a, 0x00, 0x00, 0x0c) // NTDDI_WIN10_NI 22H2 +#define MPT_WIN_10_20H2 MPT_WIN_MAKE_VERSION(0x0a, 0x00, 0x00, 0x0a) // NTDDI_WIN10_FE 20H2 +#define MPT_WIN_10_21H1 MPT_WIN_MAKE_VERSION(0x0a, 0x00, 0x00, 0x0b) // NTDDI_WIN10_CO 21H1 +#define MPT_WIN_10_21H2 MPT_WIN_MAKE_VERSION(0x0a, 0x00, 0x00, 0x0c) // NTDDI_WIN10_NI 21H2 +#define MPT_WIN_10_22H2 MPT_WIN_MAKE_VERSION(0x0a, 0x00, 0x00, 0x0d) // NTDDI_WIN10_CU 22H2 + +#define MPT_WIN_11 MPT_WIN_MAKE_VERSION(0x0a, 0x00, 0x00, 0x0e) // NTDDI_WIN11_ZN 21H2 +#define MPT_WIN_11_22H2 MPT_WIN_MAKE_VERSION(0x0a, 0x00, 0x00, 0x0f) // NTDDI_WIN11_GA 22H2 +#define MPT_WIN_11_23H2 MPT_WIN_MAKE_VERSION(0x0a, 0x00, 0x00, 0x10) // NTDDI_WIN11_GE 23H2 // MPT_WIN_API_DESKTOP : Windows 8/10 Desktop Application (Win32) // MPT_WIN_API_UNIVERSAL : Windows 10 Store App / Universal App @@ -227,13 +228,25 @@ static_assert(NTDDI_WIN10_MN == MPT_WIN_10_2004); #endif #ifdef NTDDI_WIN10_FE -static_assert(NTDDI_WIN10_FE == MPT_WIN_10_21H2); +static_assert(NTDDI_WIN10_FE == MPT_WIN_10_20H2); #endif #ifdef NTDDI_WIN10_CO -static_assert(NTDDI_WIN10_CO == MPT_WIN_11); +static_assert(NTDDI_WIN10_CO == MPT_WIN_10_21H1); #endif #ifdef NTDDI_WIN10_NI -static_assert(NTDDI_WIN10_NI == MPT_WIN_11_22H2); +static_assert(NTDDI_WIN10_NI == MPT_WIN_10_21H2); +#endif +#ifdef NTDDI_WIN10_CU +static_assert(NTDDI_WIN10_CU == MPT_WIN_10_22H2); +#endif +#ifdef NTDDI_WIN11_ZN +static_assert(NTDDI_WIN11_ZN == MPT_WIN_11); +#endif +#ifdef NTDDI_WIN11_GA +static_assert(NTDDI_WIN11_GA == MPT_WIN_11_22H2); +#endif +#ifdef NTDDI_WIN11_GE +static_assert(NTDDI_WIN11_GE == MPT_WIN_11_23H2); #endif #endif #if defined(WINAPI_FAMILY) Modified: trunk/OpenMPT/src/mpt/osinfo/windows_version.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/osinfo/windows_version.hpp Thu Aug 15 19:57:17 2024 (r21453) +++ trunk/OpenMPT/src/mpt/osinfo/windows_version.hpp Thu Aug 15 20:45:56 2024 (r21454) @@ -131,18 +131,20 @@ static mpt::osinfo::windows::Version FromSDK() noexcept { // Initialize to used SDK version -#if MPT_WINNT_AT_LEAST(MPT_WIN_11_22H2) +#if MPT_WINNT_AT_LEAST(MPT_WIN_11_23H2) + return mpt::osinfo::windows::Version(mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack(0, 0), 22631, 0); +#elif MPT_WINNT_AT_LEAST(MPT_WIN_11_22H2) return mpt::osinfo::windows::Version(mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack(0, 0), 22621, 0); #elif MPT_WINNT_AT_LEAST(MPT_WIN_11) // 21H2 return mpt::osinfo::windows::Version(mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack(0, 0), 22000, 0); -//#elif // 22H2 -// return mpt::osinfo::windows::Version(mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack(0, 0), 19045, 0); +#elif MPT_WINNT_AT_LEAST(MPT_WIN_10_22H2) + return mpt::osinfo::windows::Version(mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack(0, 0), 19045, 0); #elif MPT_WINNT_AT_LEAST(MPT_WIN_10_21H2) return mpt::osinfo::windows::Version(mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack(0, 0), 19044, 0); -//#elif // 21H1 -// return mpt::osinfo::windows::Version(mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack(0, 0), 19043, 0); -//#elif // 20H2 -// return mpt::osinfo::windows::Version(mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack(0, 0), 19042, 0); +#elif MPT_WINNT_AT_LEAST(MPT_WIN_10_21H1) + return mpt::osinfo::windows::Version(mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack(0, 0), 19043, 0); +#elif MPT_WINNT_AT_LEAST(MPT_WIN_10_20H2) + return mpt::osinfo::windows::Version(mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack(0, 0), 19042, 0); #elif MPT_WINNT_AT_LEAST(MPT_WIN_10_2004) return mpt::osinfo::windows::Version(mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack(0, 0), 19041, 0); #elif MPT_WINNT_AT_LEAST(MPT_WIN_10_1909) |
|
From: <sv...@op...> - 2024-08-15 17:57:29
|
Author: manx Date: Thu Aug 15 19:57:17 2024 New Revision: 21453 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21453 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 19:56:09 2024 (r21452) +++ branches/OpenMPT-1.31/doc/libopenmpt/changelog.md Thu Aug 15 19:57:17 2024 (r21453) @@ -11,8 +11,8 @@ * mpg123: Update to v1.32.7 (2024-08-07). * minimp3: Update to fork - <https://github.com/manxorist/minimp3/releases/tag/openmpt-2024-08-15-v3> - commit 2811a29e4115199209fe91ae5217c9c5fc611fa6 (2024-08-15). + <https://github.com/manxorist/minimp3/releases/tag/openmpt-2024-08-15-v4> + commit 2116754771b79347ad2f39127abace2a093c383e (2024-08-15). ### libopenmpt 0.7.9 (2024-07-21) |
3 messages has been excluded from this view by a project administrator.
