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
(115) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <sv...@op...> - 2024-12-30 16:24:11
|
Author: manx Date: Mon Dec 30 17:24:03 2024 New Revision: 22641 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22641 Log: [Mod] build: mpg123: Enable Unicode support only for UNICODE MSVC builds. [Imp] build: mpg123: Enable Unicode support also for UNICODE Makefile builds. Modified: trunk/OpenMPT/include/mpg123/ports/MSVC++/config.h trunk/OpenMPT/include/mpg123/ports/makefile/config.h Modified: trunk/OpenMPT/include/mpg123/ports/MSVC++/config.h ============================================================================== --- trunk/OpenMPT/include/mpg123/ports/MSVC++/config.h Mon Dec 30 17:21:32 2024 (r22640) +++ trunk/OpenMPT/include/mpg123/ports/MSVC++/config.h Mon Dec 30 17:24:03 2024 (r22641) @@ -80,4 +80,8 @@ /* Platform */ /* use the unicode support within libmpg123 */ +#if defined(_WIN32) +#if defined(UNICODE) #define WANT_WIN32_UNICODE 1 +#endif +#endif Modified: trunk/OpenMPT/include/mpg123/ports/makefile/config.h ============================================================================== --- trunk/OpenMPT/include/mpg123/ports/makefile/config.h Mon Dec 30 17:21:32 2024 (r22640) +++ trunk/OpenMPT/include/mpg123/ports/makefile/config.h Mon Dec 30 17:24:03 2024 (r22641) @@ -91,3 +91,10 @@ #define ACCURATE_ROUNDING 1 /* Platform */ + +/* use the unicode support within libmpg123 */ +#if defined(_WIN32) +#if defined(UNICODE) +#define WANT_WIN32_UNICODE 1 +#endif +#endif |
|
From: <sv...@op...> - 2024-12-30 16:21:46
|
Author: manx Date: Mon Dec 30 17:21:32 2024 New Revision: 22640 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22640 Log: [Mod] mpg123: Modify compat.c to exclude all functionality that is not actually used by libmpg123. This solves a lot of the portability build problems with a single approach. Modified: trunk/OpenMPT/include/mpg123/OpenMPT.txt trunk/OpenMPT/include/mpg123/ports/MSVC++/config.h trunk/OpenMPT/include/mpg123/ports/makefile/config.h trunk/OpenMPT/include/mpg123/src/compat/compat.c trunk/OpenMPT/include/mpg123/src/compat/compat.h Modified: trunk/OpenMPT/include/mpg123/OpenMPT.txt ============================================================================== --- trunk/OpenMPT/include/mpg123/OpenMPT.txt Sun Dec 29 00:01:50 2024 (r22639) +++ trunk/OpenMPT/include/mpg123/OpenMPT.txt Mon Dec 30 17:21:32 2024 (r22640) @@ -6,9 +6,10 @@ * `ports/Xcode/config.h` has been modified to let the build system set `OPT_*`. * `ports/Xcode/config.h` has been modified to `#define HAVE_DIRENT_H`. - * `src/compat/compat.c` has been modified for DJGPP compatibility. * `src/compat/compat.c` has been modified to silence MSVC static analyzer warnings. + * `src/compat/compat.c` and `src/compat/compat.c` have been modified for to + exclude unneeded functionality. * Modifications are marked by `// OpenMPT` or `/* OpenMPT */`. * Obviously, unnecessary folders and files have been removed. * For building, premake is used to generate Visual Studio project files. Modified: trunk/OpenMPT/include/mpg123/ports/MSVC++/config.h ============================================================================== --- trunk/OpenMPT/include/mpg123/ports/MSVC++/config.h Sun Dec 29 00:01:50 2024 (r22639) +++ trunk/OpenMPT/include/mpg123/ports/MSVC++/config.h Mon Dec 30 17:21:32 2024 (r22640) @@ -34,14 +34,23 @@ #define strncasecmp _strnicmp /* Windows/DOS */ -#define HAVE__SETMODE /* Features */ /* #define LFS_LARGEFILE_64 1 */ +/* libmpg123 does not care about signals */ #define NO_CATCHSIGNAL +/* libmpg123 does not care about directories */ +#define NO_DIR + +/* libmpg123 does not care about environment variables */ +#define NO_ENV + +/* libmpg123 does not care about file mode */ +#define NO_FILEMODE + /* We want some frame index, eh? */ #define FRAME_INDEX 1 #define INDEX_SIZE 1000 Modified: trunk/OpenMPT/include/mpg123/ports/makefile/config.h ============================================================================== --- trunk/OpenMPT/include/mpg123/ports/makefile/config.h Sun Dec 29 00:01:50 2024 (r22639) +++ trunk/OpenMPT/include/mpg123/ports/makefile/config.h Mon Dec 30 17:21:32 2024 (r22640) @@ -17,7 +17,6 @@ #if !defined(__DJGPP__) #define HAVE_SYS_SIGNAL_H 1 #endif -#define HAVE_SYS_STAT_H 1 #define HAVE_SYS_TIME_H 1 #define HAVE_SYS_TYPES_H 1 #define HAVE_UNISTD_H 1 @@ -48,18 +47,23 @@ #endif /* Windows/DOS */ -#if defined(__DJGPP__) -#define HAVE_SETMODE -#elif defined(_WIN32) -#define HAVE__SETMODE -#endif /* Features */ /* #define LFS_LARGEFILE_64 1 */ +/* libmpg123 does not care about signals */ #define NO_CATCHSIGNAL +/* libmpg123 does not care about directories */ +#define NO_DIR + +/* libmpg123 does not care about environment variables */ +#define NO_ENV + +/* libmpg123 does not care about file mode */ +#define NO_FILEMODE + /* We want some frame index, eh? */ #define FRAME_INDEX 1 #define INDEX_SIZE 1000 @@ -85,3 +89,5 @@ /* use rounding instead of trunction */ #define ACCURATE_ROUNDING 1 + +/* Platform */ Modified: trunk/OpenMPT/include/mpg123/src/compat/compat.c ============================================================================== --- trunk/OpenMPT/include/mpg123/src/compat/compat.c Sun Dec 29 00:01:50 2024 (r22639) +++ trunk/OpenMPT/include/mpg123/src/compat/compat.c Mon Dec 30 17:21:32 2024 (r22640) @@ -10,10 +10,10 @@ */ #include "config.h" -#if !defined(__DJGPP__) /* OpenMPT */ +#ifndef NO_CATCHSIGNAL /* OpenMPT */ /* This source file does need _POSIX_SOURCE to get some sigaction. */ #define _POSIX_SOURCE -#endif /* OpenMPT */ +#endif // NO_CATCHSIGNAL /* OpenMPT */ #include "compat.h" #ifdef _MSC_VER @@ -24,12 +24,14 @@ #endif #endif +#ifndef NO_DIR /* OpenMPT */ #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> #endif #ifdef HAVE_DIRENT_H # include <dirent.h> #endif +#endif // NO_DIR /* OpenMPT */ /* Win32 is only supported with unicode now. These headers also cover module stuff. The WANT_WIN32_UNICODE macro is synonymous with @@ -43,6 +45,8 @@ #include "../common/debug.h" +#ifndef NO_ENV /* OpenMPT */ + #ifndef WINDOWS_UWP char *INT123_compat_getenv(const char* name) @@ -68,6 +72,8 @@ #endif +#endif // NO_ENV /* OpenMPT */ + #include "wpathconv.h" /* Always add a default permission mask in case of flags|O_CREAT. */ @@ -161,6 +167,8 @@ return fclose(stream); } +#ifndef NO_FILEMODE /* OpenMPT */ + void INT123_compat_binmode(int fd, int enable) { #if defined(HAVE__SETMODE) @@ -172,6 +180,10 @@ #endif } +#endif // NO_FILEMODE /* OpenMPT */ + +#ifndef NO_DIR /* OpenMPT */ + #ifndef WINDOWS_UWP /* @@ -431,6 +443,8 @@ #endif +#endif // NO_DIR /* OpenMPT */ + // Revisit logic of write(): // Return -1 if interrupted before any data was written, // set errno to EINTR. Any other error value is serious Modified: trunk/OpenMPT/include/mpg123/src/compat/compat.h ============================================================================== --- trunk/OpenMPT/include/mpg123/src/compat/compat.h Sun Dec 29 00:01:50 2024 (r22639) +++ trunk/OpenMPT/include/mpg123/src/compat/compat.h Mon Dec 30 17:21:32 2024 (r22640) @@ -189,12 +189,14 @@ int INT123_compat_close(int infd); int INT123_compat_fclose(FILE* stream); +#ifndef NO_FILEMODE /* OpenMPT */ /** * Setting binary mode on a descriptor, where necessary. * We do not bother with errors. This has to work. * You can enable or disable binary mode. */ void INT123_compat_binmode(int fd, int enable); +#endif // NO_FILEMODE /* OpenMPT */ /* Those do make sense in a separate file, but I chose to include them in compat.c because that's the one source whose object is shared between mpg123 and libmpg123 -- and both need the functionality internally. */ @@ -240,6 +242,8 @@ int INT123_win32_utf8_wide(const char *const mbptr, wchar_t **wptr, size_t *buflen); #endif +#ifndef NO_DIR /* OpenMPT */ + /* A little bit of path abstraction: We always work with plain char strings that usually represent POSIX-ish UTF-8 paths (something like c:/some/file @@ -288,6 +292,8 @@ The returned string is a copy that needs to be freed after use. */ char* INT123_compat_nextdir (struct compat_dir*); +#endif // NO_DIR /* OpenMPT */ + #ifdef USE_MODULES /* For keeping the path mess local, a system-specific dlopen() variant @@ -316,9 +322,11 @@ #include "../common/true.h" +#ifndef NO_CATCHSIGNAL /* OpenMPT */ #if (!defined(WIN32) || defined (__CYGWIN__)) && defined(HAVE_SIGNAL_H) void (*INT123_catchsignal(int signum, void(*handler)(int)))(int); #endif +#endif // NO_CATCHSIGNAL /* OpenMPT */ // Some ancient toolchains miss the documented errno value. #if defined(_WIN32) && !defined(EOVERFLOW) |
|
From: <sv...@op...> - 2024-12-28 23:02:02
|
Author: sagamusix Date: Sun Dec 29 00:01:50 2024 New Revision: 22639 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22639 Log: [Fix] Plugin notes played live were no longer cleaning their channel status correctly with the new plugin NNA logic, causing unused NNA channels to pile up (https://bugs.openmpt.org/view.php?id=1853). Modified: trunk/OpenMPT/mptrack/Moddoc.cpp Modified: trunk/OpenMPT/mptrack/Moddoc.cpp ============================================================================== --- trunk/OpenMPT/mptrack/Moddoc.cpp Sat Dec 28 21:10:22 2024 (r22638) +++ trunk/OpenMPT/mptrack/Moddoc.cpp Sun Dec 29 00:01:50 2024 (r22639) @@ -1085,8 +1085,9 @@ // Set instrument (or sample if there are no instruments) chn.ResetEnvelopes(); m_SndFile.InstrumentChange(chn, params.m_instr); - } else if(params.m_sample > 0 && params.m_sample <= GetNumSamples()) // Or set sample explicitely + } else if(params.m_sample > 0 && params.m_sample <= GetNumSamples()) { + // Or set sample explicitly ModSample &sample = m_SndFile.GetSample(params.m_sample); chn.pCurrentSample = sample.samplev(); chn.pModInstrument = nullptr; @@ -1118,8 +1119,6 @@ chn.nnaChannelAge = 0; // Handle sample looping. - // Changed line to fix http://forum.openmpt.org/index.php?topic=1700.0 - //if ((loopstart + 16 < loopend) && (loopstart >= 0) && (loopend <= (LONG)pchn.nLength)) if ((params.m_loopStart + 16 < params.m_loopEnd) && (params.m_loopStart >= 0) && (chn.pModSample != nullptr)) { chn.position.Set(params.m_loopStart); @@ -1199,13 +1198,15 @@ { CriticalSection cs; + const ModInstrument *pIns = nullptr; + IMixPlugin *pPlugin = nullptr; if(ins != INSTRUMENTINDEX_INVALID && ins <= m_SndFile.GetNumInstruments() && ModCommand::IsNote(ModCommand::NOTE(note))) { - const ModInstrument *pIns = m_SndFile.Instruments[ins]; - if(pIns && pIns->HasValidMIDIChannel()) // instro sends to a midi chan + pIns = m_SndFile.Instruments[ins]; + if(pIns && pIns->HasValidMIDIChannel()) { - PLUGINDEX plug = pIns->nMixPlug; // First try intrument VST - if((!plug || plug > MAX_MIXPLUGINS) // No good plug yet + PLUGINDEX plug = pIns->nMixPlug; // First try instrument VST + if((!plug || plug > MAX_MIXPLUGINS) // No good plug yet && currentChn < m_SndFile.ChnSettings.size()) { plug = m_SndFile.ChnSettings[currentChn].nMixPlugin; // Then try Channel VST @@ -1213,11 +1214,7 @@ if(plug && plug <= MAX_MIXPLUGINS) { - IMixPlugin *pPlugin = m_SndFile.m_MixPlugins[plug - 1].pMixPlugin; - if(pPlugin) - { - pPlugin->MidiCommand(*pIns, pIns->NoteMap[note - NOTE_MIN] | IMixPlugin::MIDI_NOTE_OFF, 0, currentChn); - } + pPlugin = m_SndFile.m_MixPlugins[plug - 1].pMixPlugin; } } } @@ -1226,25 +1223,33 @@ const CHANNELINDEX startChn = currentChn != CHANNELINDEX_INVALID ? currentChn : m_SndFile.GetNumChannels(); const CHANNELINDEX endChn = currentChn != CHANNELINDEX_INVALID ? currentChn + 1 : MAX_CHANNELS; ModChannel *pChn = &m_SndFile.m_PlayState.Chn[startChn]; - for(CHANNELINDEX i = startChn; i < endChn; i++, pChn++) + bool found = false; + for(CHANNELINDEX i = startChn; i < endChn && !found; i++, pChn++) { // Fade all channels > m_nChannels which are playing this note and aren't NNA channels. + if(pPlugin && pChn->pModInstrument == pIns && (currentChn == CHANNELINDEX_INVALID || currentChn == i) && pChn->lastMidiNoteWithoutArp == pIns->NoteMap[note - NOTE_MIN]) + { + pPlugin->MidiCommand(*pIns, pIns->NoteMap[note - NOTE_MIN] | IMixPlugin::MIDI_NOTE_OFF, 0, currentChn); + pChn->lastMidiNoteWithoutArp = NOTE_NONE; + found = true; + } if((pChn->isPreviewNote || i < m_SndFile.GetNumChannels()) && !pChn->dwFlags[mask] && (pChn->nLength || pChn->dwFlags[CHN_ADLIB]) && (note == pChn->nNewNote || note == NOTE_NONE)) { m_SndFile.KeyOff(*pChn); - if (!m_SndFile.m_nInstruments) pChn->dwFlags.reset(CHN_LOOP | CHN_PINGPONGFLAG); - if (fade) pChn->dwFlags.set(CHN_NOTEFADE); + if(!m_SndFile.m_nInstruments) pChn->dwFlags.reset(CHN_LOOP | CHN_PINGPONGFLAG); + if(fade) pChn->dwFlags.set(CHN_NOTEFADE); // Instantly stop samples that would otherwise play forever - if (pChn->pModInstrument && !pChn->pModInstrument->nFadeOut) + if(pChn->pModInstrument && !pChn->pModInstrument->nFadeOut) pChn->nFadeOutVol = 0; if(pChn->dwFlags[CHN_ADLIB] && m_SndFile.m_opl) { m_SndFile.m_opl->NoteOff(i); } - if (note) break; + if(note) + found = true; } } |
|
From: <sv...@op...> - 2024-12-28 20:10:29
|
Author: manx Date: Sat Dec 28 21:10:22 2024 New Revision: 22638 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22638 Log: [Ref] mpt/crypto/jwk.hpp: Do not rely on nlohmann::json implicit conversions. Modified: trunk/OpenMPT/src/mpt/crypto/jwk.hpp Modified: trunk/OpenMPT/src/mpt/crypto/jwk.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/crypto/jwk.hpp Sat Dec 28 20:19:05 2024 (r22637) +++ trunk/OpenMPT/src/mpt/crypto/jwk.hpp Sat Dec 28 21:10:22 2024 (r22638) @@ -588,7 +588,7 @@ std::vector<mpt::ustring> result; nlohmann::json jws = nlohmann::json::parse(mpt::transcode<std::string>(mpt::common_encoding::utf8, jws_)); for (const auto & s : jws["signatures"]) { - result.push_back(s["header"]["kid"]); + result.push_back(s["header"]["kid"].get<mpt::ustring>()); } return result; } @@ -648,8 +648,8 @@ throw std::runtime_error("Cannot parse RSA public key JWK."); } result.name = json["kid"].get<mpt::ustring>(); - result.public_exp = mpt::decode_base64url(json["e"]); - result.modulus = mpt::decode_base64url(json["n"]); + result.public_exp = mpt::decode_base64url(json["e"].get<mpt::ustring>()); + result.modulus = mpt::decode_base64url(json["n"].get<mpt::ustring>()); result.length = mpt::saturate_cast<uint32>(result.modulus.size() * 8); } catch (mpt::out_of_memory e) { mpt::rethrow_out_of_memory(e); @@ -737,7 +737,7 @@ std::vector<std::byte> jws_verify(const mpt::ustring & jws_) { nlohmann::json jws = nlohmann::json::parse(mpt::transcode<std::string>(mpt::common_encoding::utf8, jws_)); - std::vector<std::byte> payload = mpt::decode_base64url(jws["payload"]); + std::vector<std::byte> payload = mpt::decode_base64url(jws["payload"].get<mpt::ustring>()); nlohmann::json jsignature = nlohmann::json::object(); bool sigfound = false; for (const auto & s : jws["signatures"]) { @@ -749,8 +749,8 @@ if (!sigfound) { throw signature_verification_failed(); } - std::vector<std::byte> protectedheaderraw = mpt::decode_base64url(jsignature["protected"]); - std::vector<std::byte> signature = mpt::decode_base64url(jsignature["signature"]); + std::vector<std::byte> protectedheaderraw = mpt::decode_base64url(jsignature["protected"].get<mpt::ustring>()); + std::vector<std::byte> signature = mpt::decode_base64url(jsignature["signature"].get<mpt::ustring>()); nlohmann::json header = nlohmann::json::parse(mpt::buffer_cast<std::string>(protectedheaderraw)); if (header["typ"] != "JWT") { throw signature_verification_failed(); |
|
From: <sv...@op...> - 2024-12-28 19:19:19
|
Author: manx Date: Sat Dec 28 20:19:05 2024 New Revision: 22637 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22637 Log: [Ref] mpt/json/json.hpp: Prepare for official std::optional support. See <https://github.com/nlohmann/json/issues/1749>. Modified: trunk/OpenMPT/src/mpt/json/json.hpp Modified: trunk/OpenMPT/src/mpt/json/json.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/json/json.hpp Sat Dec 28 20:13:27 2024 (r22636) +++ trunk/OpenMPT/src/mpt/json/json.hpp Sat Dec 28 20:19:05 2024 (r22637) @@ -12,10 +12,6 @@ #endif // MPT_DETECTED_NLOHMANN_JSON #if MPT_DETECTED_NLOHMANN_JSON -#include <optional> -#endif // MPT_DETECTED_NLOHMANN_JSON - -#if MPT_DETECTED_NLOHMANN_JSON #if MPT_COMPILER_MSVC #pragma warning(push) #pragma warning(disable : 28020) @@ -26,9 +22,28 @@ #endif // MPT_COMPILER_MSVC #endif // MPT_DETECTED_NLOHMANN_JSON +#if 0 +// The precise version when std::optional support will be included is still unknown. +#if NLOHMANN_JSON_VERSION_MAJOR < 3 +#define MPT_JSON_JSON_NLOHMANN_JSON_QUIRK_NO_STD_OPTIONAL +#elif (NLOHMANN_JSON_VERSION_MAJOR == 3) && (NLOHMANN_JSON_VERSION_MINOR < 11) +#define MPT_JSON_JSON_NLOHMANN_JSON_QUIRK_NO_STD_OPTIONAL +#elif (NLOHMANN_JSON_VERSION_MAJOR == 3) && (NLOHMANN_JSON_VERSION_MINOR == 11) && (NLOHMANN_JSON_VERSION_PATCH < 4) +#define MPT_JSON_JSON_NLOHMANN_JSON_QUIRK_NO_STD_OPTIONAL +#endif +#else +#define MPT_JSON_JSON_NLOHMANN_JSON_QUIRK_NO_STD_OPTIONAL +#endif + +#ifdef MPT_JSON_JSON_NLOHMANN_JSON_QUIRK_NO_STD_OPTIONAL +#include <optional> +#endif // MPT_JSON_JSON_NLOHMANN_JSON_QUIRK_NO_STD_OPTIONAL namespace nlohmann { + + + template <> struct adl_serializer<mpt::ustring> { static void to_json(json & j, const mpt::ustring & val) { @@ -38,6 +53,7 @@ val = mpt::transcode<mpt::ustring>(mpt::common_encoding::utf8, j.get<std::string>()); } }; + template <typename Tvalue> struct adl_serializer<std::map<mpt::ustring, Tvalue>> { static void to_json(json & j, const std::map<mpt::ustring, Tvalue> & val) { @@ -56,6 +72,11 @@ val = std::move(result); } }; + + + +#ifdef MPT_JSON_JSON_NLOHMANN_JSON_QUIRK_NO_STD_OPTIONAL + template <typename Tvalue> struct adl_serializer<std::optional<Tvalue>> { static void to_json(json & j, const std::optional<Tvalue> & val) { @@ -69,6 +90,11 @@ } } }; + +#endif // MPT_JSON_JSON_NLOHMANN_JSON_QUIRK_NO_STD_OPTIONAL + + + } // namespace nlohmann |
|
From: <sv...@op...> - 2024-12-28 19:13:41
|
Author: manx Date: Sat Dec 28 20:13:27 2024 New Revision: 22636 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22636 Log: [Mod] nlohmann-json: Set JSON_USE_IMPLICIT_CONVERSIONS=0 as is announced as the next major release default. See <https://json.nlohmann.me/api/macros/json_use_implicit_conversions/>. Modified: trunk/OpenMPT/build/premake/ext-nlohmann-json.lua trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2019win7/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj trunk/OpenMPT/build/vs2019win7/updatesigntool.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.vcxproj trunk/OpenMPT/build/vs2022win10/updatesigntool.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.vcxproj trunk/OpenMPT/build/vs2022win10clang/updatesigntool.vcxproj trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win7/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2022win7/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win7/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win7/updatesigntool.vcxproj trunk/OpenMPT/build/vs2022win8/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win8/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2022win8/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win8/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win8/updatesigntool.vcxproj trunk/OpenMPT/build/vs2022win81/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win81/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2022win81/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win81/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win81/updatesigntool.vcxproj Modified: trunk/OpenMPT/build/premake/ext-nlohmann-json.lua ============================================================================== --- trunk/OpenMPT/build/premake/ext-nlohmann-json.lua Sat Dec 28 20:09:05 2024 (r22635) +++ trunk/OpenMPT/build/premake/ext-nlohmann-json.lua Sat Dec 28 20:13:27 2024 (r22636) @@ -7,5 +7,8 @@ files { "../../include/nlohmann-json/include/**.hpp", } + defines { + "JSON_USE_IMPLICIT_CONVERSIONS=0", + } filter {} end Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj Sat Dec 28 20:09:05 2024 (r22635) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj Sat Dec 28 20:13:27 2024 (r22636) @@ -313,7 +313,7 @@ <PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeaderFile>PCH.h</PrecompiledHeaderFile> <WarningLevel>Level4</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;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_SIGNALSMITH_STRETCH;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;%(Pre processorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;MPT_WITH_MPG123;JSON_USE_IMPLICIT_CONVERSIONS=0;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_SIGNALSMITH_STRETCH;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\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\SignalsmithStretch;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ForcedIncludeFiles>PCH.h</ForcedIncludeFiles> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> @@ -326,7 +326,7 @@ <LanguageStandard>stdcpp17</LanguageStandard> </ClCompile> <ResourceCompile> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;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_SIGNALSMITH_STRETCH;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_A RCHNAME=\"x86\";%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;MPT_WITH_MPG123;JSON_USE_IMPLICIT_CONVERSIONS=0;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_SIGNALSMITH_STRETCH;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\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\SignalsmithStretch;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> @@ -348,7 +348,7 @@ <PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeaderFile>PCH.h</PrecompiledHeaderFile> <WarningLevel>Level4</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;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_SIGNALSMITH_STRETCH;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;%(Pre processorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;MPT_WITH_MPG123;JSON_USE_IMPLICIT_CONVERSIONS=0;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_SIGNALSMITH_STRETCH;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\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\SignalsmithStretch;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ForcedIncludeFiles>PCH.h</ForcedIncludeFiles> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> @@ -360,7 +360,7 @@ <LanguageStandard>stdcpp17</LanguageStandard> </ClCompile> <ResourceCompile> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;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_SIGNALSMITH_STRETCH;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_A RCHNAME=\"amd64\";%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;MPT_WITH_MPG123;JSON_USE_IMPLICIT_CONVERSIONS=0;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_SIGNALSMITH_STRETCH;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\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\SignalsmithStretch;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> @@ -382,7 +382,7 @@ <PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeaderFile>PCH.h</PrecompiledHeaderFile> <WarningLevel>Level4</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;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_SIGNALSMITH_STRETCH;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;%(PreprocessorDefini tions)</PreprocessorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;MPT_WITH_MPG123;JSON_USE_IMPLICIT_CONVERSIONS=0;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_SIGNALSMITH_STRETCH;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\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\SignalsmithStretch;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ForcedIncludeFiles>PCH.h</ForcedIncludeFiles> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> @@ -398,7 +398,7 @@ <LanguageStandard>stdcpp17</LanguageStandard> </ClCompile> <ResourceCompile> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;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_SIGNALSMITH_STRETCH;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>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;MPT_WITH_MPG123;JSON_USE_IMPLICIT_CONVERSIONS=0;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_SIGNALSMITH_STRETCH;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\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\SignalsmithStretch;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> @@ -421,7 +421,7 @@ <PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeaderFile>PCH.h</PrecompiledHeaderFile> <WarningLevel>Level4</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;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_SIGNALSMITH_STRETCH;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;%(PreprocessorDefini tions)</PreprocessorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;MPT_WITH_MPG123;JSON_USE_IMPLICIT_CONVERSIONS=0;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_SIGNALSMITH_STRETCH;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\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\SignalsmithStretch;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ForcedIncludeFiles>PCH.h</ForcedIncludeFiles> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> @@ -436,7 +436,7 @@ <LanguageStandard>stdcpp17</LanguageStandard> </ClCompile> <ResourceCompile> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;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_SIGNALSMITH_STRETCH;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>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;MPT_WITH_MPG123;JSON_USE_IMPLICIT_CONVERSIONS=0;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_SIGNALSMITH_STRETCH;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\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\SignalsmithStretch;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> @@ -459,7 +459,7 @@ <PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeaderFile>PCH.h</PrecompiledHeaderFile> <WarningLevel>Level4</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;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_SIGNALSMITH_STRETCH;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;%(P reprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;MPT_WITH_MPG123;JSON_USE_IMPLICIT_CONVERSIONS=0;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_SIGNALSMITH_STRETCH;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_WINDO WS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\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\SignalsmithStretch;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ForcedIncludeFiles>PCH.h</ForcedIncludeFiles> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> @@ -476,7 +476,7 @@ <LanguageStandard>stdcpp17</LanguageStandard> </ClCompile> <ResourceCompile> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;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_SIGNALSMITH_STRETCH;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>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;MPT_WITH_MPG123;JSON_USE_IMPLICIT_CONVERSIONS=0;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_SIGNALSMITH_STRETCH;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_WINDO WS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"x86\";%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\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\SignalsmithStretch;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> @@ -499,7 +499,7 @@ <PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeaderFile>PCH.h</PrecompiledHeaderFile> <WarningLevel>Level4</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;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_SIGNALSMITH_STRETCH;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;%(P reprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;MPT_WITH_MPG123;JSON_USE_IMPLICIT_CONVERSIONS=0;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_SIGNALSMITH_STRETCH;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_WINDO WS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\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\SignalsmithStretch;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ForcedIncludeFiles>PCH.h</ForcedIncludeFiles> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> @@ -515,7 +515,7 @@ <LanguageStandard>stdcpp17</LanguageStandard> </ClCompile> <ResourceCompile> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;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_SIGNALSMITH_STRETCH;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>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;MPT_WITH_MPG123;JSON_USE_IMPLICIT_CONVERSIONS=0;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_SIGNALSMITH_STRETCH;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_WINDO WS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"amd64\";%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\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\SignalsmithStretch;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> @@ -538,7 +538,7 @@ <PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeaderFile>PCH.h</PrecompiledHeaderFile> <WarningLevel>Level4</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;ANCIENT_API_DECLSPEC_DLLIMPORT;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;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_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;ZLIB_DLL;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNO RE_WARNING_NO_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;ANCIENT_API_DECLSPEC_DLLIMPORT;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;MPT_WITH_MPG123;JSON_USE_IMPLICIT_CONVERSIONS=0;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_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;ZLIB_DLL;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DE PRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\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\SignalsmithStretch;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ForcedIncludeFiles>PCH.h</ForcedIncludeFiles> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> @@ -551,7 +551,7 @@ <LanguageStandard>stdcpp17</LanguageStandard> </ClCompile> <ResourceCompile> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;ANCIENT_API_DECLSPEC_DLLIMPORT;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;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_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;ZLIB_DLL;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNO RE_WARNING_NO_UNICODE;VER_ARCHNAME=\"x86\";%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;ANCIENT_API_DECLSPEC_DLLIMPORT;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;MPT_WITH_MPG123;JSON_USE_IMPLICIT_CONVERSIONS=0;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_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;ZLIB_DLL;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DE PRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"x86\";%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\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\SignalsmithStretch;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> @@ -572,7 +572,7 @@ <PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeaderFile>PCH.h</PrecompiledHeaderFile> <WarningLevel>Level4</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;ANCIENT_API_DECLSPEC_DLLIMPORT;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;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_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;ZLIB_DLL;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNO RE_WARNING_NO_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;ANCIENT_API_DECLSPEC_DLLIMPORT;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;MPT_WITH_MPG123;JSON_USE_IMPLICIT_CONVERSIONS=0;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_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;ZLIB_DLL;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DE PRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\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\SignalsmithStretch;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ForcedIncludeFiles>PCH.h</ForcedIncludeFiles> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> @@ -584,7 +584,7 @@ <LanguageStandard>stdcpp17</LanguageStandard> </ClCompile> <ResourceCompile> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;ANCIENT_API_DECLSPEC_DLLIMPORT;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;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_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;ZLIB_DLL;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNO RE_WARNING_NO_UNICODE;VER_ARCHNAME=\"amd64\";%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;ANCIENT_API_DECLSPEC_DLLIMPORT;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;MPT_WITH_MPG123;JSON_USE_IMPLICIT_CONVERSIONS=0;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_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;ZLIB_DLL;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DE PRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"amd64\";%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\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\SignalsmithStretch;..\..\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>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;ANCIENT_API_DECLSPEC_DLLIMPORT;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;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_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;ZLIB_DLL;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_U NICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;ANCIENT_API_DECLSPEC_DLLIMPORT;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;MPT_WITH_MPG123;JSON_USE_IMPLICIT_CONVERSIONS=0;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_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;ZLIB_DLL;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_C HECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\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\SignalsmithStretch;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ForcedIncludeFiles>PCH.h</ForcedIncludeFiles> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> @@ -621,7 +621,7 @@ <LanguageStandard>stdcpp17</LanguageStandard> </ClCompile> <ResourceCompile> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;ANCIENT_API_DECLSPEC_DLLIMPORT;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;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_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;ZLIB_DLL;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_U NICODE;VER_ARCHNAME=\"x86\";%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;ANCIENT_API_DECLSPEC_DLLIMPORT;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;MPT_WITH_MPG123;JSON_USE_IMPLICIT_CONVERSIONS=0;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_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;ZLIB_DLL;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_C HECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"x86\";%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\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\SignalsmithStretch;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> @@ -644,7 +644,7 @@ <PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeaderFile>PCH.h</PrecompiledHeaderFile> <WarningLevel>Level4</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;ANCIENT_API_DECLSPEC_DLLIMPORT;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;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_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;ZLIB_DLL;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_U NICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;ANCIENT_API_DECLSPEC_DLLIMPORT;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;LINK_MPG123_DLL;MPT_WITH_MPG123;JSON_USE_IMPLICIT_CONVERSIONS=0;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_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;ZLIB_DLL;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_C HECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\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\SignalsmithStretch;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ForcedIncludeFiles>PCH.h</ForcedIncludeFiles> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> @@ -659,7 +659,7 @@ <LanguageStandard>stdcpp17</LanguageStandard> </ClCompile> <ResourceCompile> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CR... [truncated message content] |
|
From: <sv...@op...> - 2024-12-28 19:09:17
|
Author: manx Date: Sat Dec 28 20:09:05 2024 New Revision: 22635 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22635 Log: [Mod] build: Makefile: DJGPP: Small cleanup for 686 3dNow. Modified: trunk/OpenMPT/build/make/config-djgpp.mk Modified: trunk/OpenMPT/build/make/config-djgpp.mk ============================================================================== --- trunk/OpenMPT/build/make/config-djgpp.mk Sat Dec 28 20:03:47 2024 (r22634) +++ trunk/OpenMPT/build/make/config-djgpp.mk Sat Dec 28 20:09:05 2024 (r22635) @@ -170,8 +170,10 @@ TUNE_586 :=-mtune=pentium TUNE_586MMX :=-mtune=pentium-mmx +TUNE_5863DN :=-mtune=k6-2 TUNE_686 :=-mtune=pentiumpro TUNE_686MMX :=-mtune=pentium2 +TUNE_6863DN :=-mtune=athlon TUNE_686SSE :=-mtune=pentium3 TUNE_686SSE2:=-mtune=pentium-m TUNE_686SSE3:=-mtune=pentium-m @@ -222,7 +224,7 @@ generic/686 := $(___) -march=pentiumpro $(FPU_387) -mtune=pentiumpro $(OPT_UARCH_OOOE) # Intel Pentium-Pro generic/686-mmx := $(XXX) -march=i686 $(FPU_MMX) -mtune=pentium2 $(OPT_UARCH_OOOE_64) # Intel Pentium-2.., AMD Bulldozer.., VIA C3-Nehemiah.., Cyrix 6x86MX.., Transmeta Crusoe.., NSC Geode-GX1.. -generic/686-3dnow := $(___) -march=i686 $(FPU_3DNOW) -mtune=pentium2 $(OPT_UARCH_OOOE_64) # VIA Cyrix-3-Joshua +generic/686-3dnow := $(___) -march=i686 $(FPU_3DNOW) -mtune=athlon $(OPT_UARCH_OOOE_64) # VIA Cyrix-3-Joshua generic/686-3dnowa := $(XX_) -march=athlon $(FPU_3DNOWA) -mtune=athlon $(OPT_UARCH_OOOE_64) # AMD Athlon..K10 generic/sse := $(___) -march=i686 $(FPU_SSE) -mtune=pentium3 $(OPT_UARCH_OOOE_128) # Intel Pentium-3, AMD Athlon-XP, VIA C3-Nehemiah, DM&P Vortex86DX3.. @@ -343,7 +345,7 @@ -via/cyrix3-joshua := $(___) -march=i686 $(FPU_3DNOW) $(TUNE_686MMX) $(OPT_UARCH_OOOE_64) --param l1-cache-size=48 --param l2-cache-size=256 +via/cyrix3-joshua := $(___) -march=i686 $(FPU_3DNOW) $(TUNE_6863DN) $(OPT_UARCH_OOOE_64) --param l1-cache-size=48 --param l2-cache-size=256 via/c3-samuel := $(___) -march=c3 $(FPU_3DNOW) -mtune=c3 $(OPT_UARCH_SCAL_64) --param l1-cache-size=64 --param l2-cache-size=0 via/c3-samuel2 := $(___) -march=samuel-2 $(FPU_3DNOW) -mtune=samuel-2 $(OPT_UARCH_SCAL_64) --param l1-cache-size=64 --param l2-cache-size=64 via/c3-ezra := $(___) -march=samuel-2 $(FPU_3DNOW) -mtune=samuel-2 $(OPT_UARCH_SCAL_64) --param l1-cache-size=64 --param l2-cache-size=64 |
|
From: <sv...@op...> - 2024-12-28 19:03:58
|
Author: manx Date: Sat Dec 28 20:03:47 2024 New Revision: 22634 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22634 Log: [Ref] build: premake: nlohmann-json: Add source files to projects. Modified: trunk/OpenMPT/build/premake/ext-nlohmann-json.lua 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/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/updatesigntool.vcxproj trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.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/updatesigntool.vcxproj trunk/OpenMPT/build/vs2019win7/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/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/updatesigntool.vcxproj trunk/OpenMPT/build/vs2022win10clang/updatesigntool.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/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/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/updatesigntool.vcxproj trunk/OpenMPT/build/vs2022win81/updatesigntool.vcxproj.filters Modified: trunk/OpenMPT/build/premake/ext-nlohmann-json.lua ============================================================================== --- trunk/OpenMPT/build/premake/ext-nlohmann-json.lua Sat Dec 28 19:59:40 2024 (r22633) +++ trunk/OpenMPT/build/premake/ext-nlohmann-json.lua Sat Dec 28 20:03:47 2024 (r22634) @@ -4,5 +4,8 @@ includedirs { "../../include/nlohmann-json/include", } + files { + "../../include/nlohmann-json/include/**.hpp", + } filter {} end Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj Sat Dec 28 19:59:40 2024 (r22633) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj Sat Dec 28 20:03:47 2024 (r22634) @@ -785,6 +785,51 @@ <ClInclude Include="..\..\common\stdafx.h" /> <ClInclude Include="..\..\common\version.h" /> <ClInclude Include="..\..\common\versionNumber.h" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\adl_serializer.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\byte_container_with_subtype.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\abi_macros.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\conversions\from_json.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\conversions\to_chars.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\conversions\to_json.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\exceptions.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\hash.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\input\binary_reader.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\input\input_adapters.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\input\json_sax.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\input\lexer.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\input\parser.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\input\position_t.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\iterators\internal_iterator.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\iterators\iter_impl.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\iterators\iteration_proxy.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\iterators\iterator_traits.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\iterators\json_reverse_iterator.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\iterators\primitive_iterator.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\json_custom_base_class.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\json_pointer.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\json_ref.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\macro_scope.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\macro_unscope.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\call_std\begin.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\call_std\end.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\cpp_future.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\detected.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\identity_tag.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\is_sax.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\std_fs.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\type_traits.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\void_t.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\output\binary_writer.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\output\output_adapters.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\output\serializer.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\string_concat.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\string_escape.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\value_t.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\json.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\json_fwd.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\ordered_map.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" /> <ClInclude Include="..\..\misc\WriteMemoryDump.h" /> <ClInclude Include="..\..\misc\mptColor.h" /> <ClInclude Include="..\..\misc\mptLibrary.h" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters Sat Dec 28 19:59:40 2024 (r22633) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters Sat Dec 28 20:03:47 2024 (r22634) @@ -16,6 +16,45 @@ <Filter Include="common"> <UniqueIdentifier>{AEFEE3F6-9AA0-0ECD-835B-22216F9C951D}</UniqueIdentifier> </Filter> + <Filter Include="include"> + <UniqueIdentifier>{89AF369E-F58E-B539-FEA6-40106A051C9B}</UniqueIdentifier> + </Filter> + <Filter Include="include\nlohmann-json"> + <UniqueIdentifier>{5A0436C9-C670-F1C3-8F64-8921FB8F132C}</UniqueIdentifier> + </Filter> + <Filter Include="include\nlohmann-json\include"> + <UniqueIdentifier>{CDE5467F-39FE-2DA9-02AB-BD426E82C242}</UniqueIdentifier> + </Filter> + <Filter Include="include\nlohmann-json\include\nlohmann"> + <UniqueIdentifier>{77988629-63EA-5D19-4C09-9B2938FA7602}</UniqueIdentifier> + </Filter> + <Filter Include="include\nlohmann-json\include\nlohmann\detail"> + <UniqueIdentifier>{59845F72-C5F4-61EB-8E13-DC73FA429AEC}</UniqueIdentifier> + </Filter> + <Filter Include="include\nlohmann-json\include\nlohmann\detail\conversions"> + <UniqueIdentifier>{A136C046-0DA9-0263-563D-38E7C2EECC5B}</UniqueIdentifier> + </Filter> + <Filter Include="include\nlohmann-json\include\nlohmann\detail\input"> + <UniqueIdentifier>{38633EBD-A474-E663-2DC6-78A399D66F9D}</UniqueIdentifier> + </Filter> + <Filter Include="include\nlohmann-json\include\nlohmann\detail\iterators"> + <UniqueIdentifier>{05D86162-71BF-4C58-7AAD-4ED4E613F01A}</UniqueIdentifier> + </Filter> + <Filter Include="include\nlohmann-json\include\nlohmann\detail\meta"> + <UniqueIdentifier>{EF25DD81-DBB9-D229-447E-2CDE30310D1C}</UniqueIdentifier> + </Filter> + <Filter Include="include\nlohmann-json\include\nlohmann\detail\meta\call_std"> + <UniqueIdentifier>{04E53826-70A2-E15C-F96C-CDC4652954B1}</UniqueIdentifier> + </Filter> + <Filter Include="include\nlohmann-json\include\nlohmann\detail\output"> + <UniqueIdentifier>{59868A73-45C5-34EF-EE47-1121DA65EA59}</UniqueIdentifier> + </Filter> + <Filter Include="include\nlohmann-json\include\nlohmann\thirdparty"> + <UniqueIdentifier>{110D8A6D-7DD3-E689-C62E-75EC323455EE}</UniqueIdentifier> + </Filter> + <Filter Include="include\nlohmann-json\include\nlohmann\thirdparty\hedley"> + <UniqueIdentifier>{7B925EB2-6767-A665-9016-E6617C4AB47C}</UniqueIdentifier> + </Filter> <Filter Include="misc"> <UniqueIdentifier>{B1A29A7C-9DD9-9B0D-46C6-811032DC170F}</UniqueIdentifier> </Filter> @@ -318,6 +357,141 @@ <ClInclude Include="..\..\common\versionNumber.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\adl_serializer.hpp"> + <Filter>include\nlohmann-json\include\nlohmann</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\byte_container_with_subtype.hpp"> + <Filter>include\nlohmann-json\include\nlohmann</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\abi_macros.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\conversions\from_json.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\conversions</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\conversions\to_chars.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\conversions</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\conversions\to_json.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\conversions</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\exceptions.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\hash.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\input\binary_reader.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\input</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\input\input_adapters.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\input</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\input\json_sax.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\input</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\input\lexer.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\input</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\input\parser.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\input</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\input\position_t.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\input</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\iterators\internal_iterator.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\iterators</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\iterators\iter_impl.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\iterators</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\iterators\iteration_proxy.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\iterators</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\iterators\iterator_traits.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\iterators</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\iterators\json_reverse_iterator.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\iterators</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\iterators\primitive_iterator.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\iterators</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\json_custom_base_class.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\json_pointer.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\json_ref.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\macro_scope.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\macro_unscope.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\call_std\begin.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\meta\call_std</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\call_std\end.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\meta\call_std</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\cpp_future.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\meta</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\detected.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\meta</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\identity_tag.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\meta</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\is_sax.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\meta</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\std_fs.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\meta</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\type_traits.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\meta</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\void_t.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\meta</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\output\binary_writer.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\output</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\output\output_adapters.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\output</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\output\serializer.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\output</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\string_concat.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\string_escape.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\value_t.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\json.hpp"> + <Filter>include\nlohmann-json\include\nlohmann</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\json_fwd.hpp"> + <Filter>include\nlohmann-json\include\nlohmann</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\ordered_map.hpp"> + <Filter>include\nlohmann-json\include\nlohmann</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\thirdparty\hedley</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\thirdparty\hedley</Filter> + </ClInclude> <ClInclude Include="..\..\misc\WriteMemoryDump.h"> <Filter>misc</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj Sat Dec 28 19:59:40 2024 (r22633) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj Sat Dec 28 20:03:47 2024 (r22634) @@ -665,6 +665,51 @@ <ClInclude Include="..\..\common\stdafx.h" /> <ClInclude Include="..\..\common\version.h" /> <ClInclude Include="..\..\common\versionNumber.h" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\adl_serializer.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\byte_container_with_subtype.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\abi_macros.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\conversions\from_json.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\conversions\to_chars.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\conversions\to_json.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\exceptions.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\hash.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\input\binary_reader.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\input\input_adapters.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\input\json_sax.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\input\lexer.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\input\parser.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\input\position_t.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\iterators\internal_iterator.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\iterators\iter_impl.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\iterators\iteration_proxy.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\iterators\iterator_traits.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\iterators\json_reverse_iterator.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\iterators\primitive_iterator.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\json_custom_base_class.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\json_pointer.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\json_ref.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\macro_scope.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\macro_unscope.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\call_std\begin.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\call_std\end.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\cpp_future.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\detected.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\identity_tag.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\is_sax.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\std_fs.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\type_traits.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\void_t.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\output\binary_writer.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\output\output_adapters.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\output\serializer.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\string_concat.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\string_escape.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\value_t.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\json.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\json_fwd.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\ordered_map.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" /> <ClInclude Include="..\..\misc\WriteMemoryDump.h" /> <ClInclude Include="..\..\misc\mptColor.h" /> <ClInclude Include="..\..\misc\mptLibrary.h" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj.filters Sat Dec 28 19:59:40 2024 (r22633) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj.filters Sat Dec 28 20:03:47 2024 (r22634) @@ -4,6 +4,45 @@ <Filter Include="common"> <UniqueIdentifier>{AEFEE3F6-9AA0-0ECD-835B-22216F9C951D}</UniqueIdentifier> </Filter> + <Filter Include="include"> + <UniqueIdentifier>{89AF369E-F58E-B539-FEA6-40106A051C9B}</UniqueIdentifier> + </Filter> + <Filter Include="include\nlohmann-json"> + <UniqueIdentifier>{5A0436C9-C670-F1C3-8F64-8921FB8F132C}</UniqueIdentifier> + </Filter> + <Filter Include="include\nlohmann-json\include"> + <UniqueIdentifier>{CDE5467F-39FE-2DA9-02AB-BD426E82C242}</UniqueIdentifier> + </Filter> + <Filter Include="include\nlohmann-json\include\nlohmann"> + <UniqueIdentifier>{77988629-63EA-5D19-4C09-9B2938FA7602}</UniqueIdentifier> + </Filter> + <Filter Include="include\nlohmann-json\include\nlohmann\detail"> + <UniqueIdentifier>{59845F72-C5F4-61EB-8E13-DC73FA429AEC}</UniqueIdentifier> + </Filter> + <Filter Include="include\nlohmann-json\include\nlohmann\detail\conversions"> + <UniqueIdentifier>{A136C046-0DA9-0263-563D-38E7C2EECC5B}</UniqueIdentifier> + </Filter> + <Filter Include="include\nlohmann-json\include\nlohmann\detail\input"> + <UniqueIdentifier>{38633EBD-A474-E663-2DC6-78A399D66F9D}</UniqueIdentifier> + </Filter> + <Filter Include="include\nlohmann-json\include\nlohmann\detail\iterators"> + <UniqueIdentifier>{05D86162-71BF-4C58-7AAD-4ED4E613F01A}</UniqueIdentifier> + </Filter> + <Filter Include="include\nlohmann-json\include\nlohmann\detail\meta"> + <UniqueIdentifier>{EF25DD81-DBB9-D229-447E-2CDE30310D1C}</UniqueIdentifier> + </Filter> + <Filter Include="include\nlohmann-json\include\nlohmann\detail\meta\call_std"> + <UniqueIdentifier>{04E53826-70A2-E15C-F96C-CDC4652954B1}</UniqueIdentifier> + </Filter> + <Filter Include="include\nlohmann-json\include\nlohmann\detail\output"> + <UniqueIdentifier>{59868A73-45C5-34EF-EE47-1121DA65EA59}</UniqueIdentifier> + </Filter> + <Filter Include="include\nlohmann-json\include\nlohmann\thirdparty"> + <UniqueIdentifier>{110D8A6D-7DD3-E689-C62E-75EC323455EE}</UniqueIdentifier> + </Filter> + <Filter Include="include\nlohmann-json\include\nlohmann\thirdparty\hedley"> + <UniqueIdentifier>{7B925EB2-6767-A665-9016-E6617C4AB47C}</UniqueIdentifier> + </Filter> <Filter Include="misc"> <UniqueIdentifier>{B1A29A7C-9DD9-9B0D-46C6-811032DC170F}</UniqueIdentifier> </Filter> @@ -267,6 +306,141 @@ <ClInclude Include="..\..\common\versionNumber.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\adl_serializer.hpp"> + <Filter>include\nlohmann-json\include\nlohmann</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\byte_container_with_subtype.hpp"> + <Filter>include\nlohmann-json\include\nlohmann</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\abi_macros.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\conversions\from_json.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\conversions</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\conversions\to_chars.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\conversions</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\conversions\to_json.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\conversions</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\exceptions.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\hash.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\input\binary_reader.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\input</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\input\input_adapters.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\input</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\input\json_sax.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\input</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\input\lexer.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\input</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\input\parser.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\input</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\input\position_t.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\input</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\iterators\internal_iterator.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\iterators</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\iterators\iter_impl.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\iterators</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\iterators\iteration_proxy.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\iterators</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\iterators\iterator_traits.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\iterators</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\iterators\json_reverse_iterator.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\iterators</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\iterators\primitive_iterator.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\iterators</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\json_custom_base_class.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\json_pointer.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\json_ref.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\macro_scope.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\macro_unscope.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\call_std\begin.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\meta\call_std</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\call_std\end.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\meta\call_std</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\cpp_future.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\meta</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\detected.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\meta</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\identity_tag.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\meta</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\is_sax.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\meta</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\std_fs.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\meta</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\type_traits.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\meta</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\void_t.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\meta</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\output\binary_writer.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\output</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\output\output_adapters.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\output</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\output\serializer.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\output</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\string_concat.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\string_escape.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\value_t.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\json.hpp"> + <Filter>include\nlohmann-json\include\nlohmann</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\json_fwd.hpp"> + <Filter>include\nlohmann-json\include\nlohmann</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\ordered_map.hpp"> + <Filter>include\nlohmann-json\include\nlohmann</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\thirdparty\hedley</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\thirdparty\hedley</Filter> + </ClInclude> <ClInclude Include="..\..\misc\WriteMemoryDump.h"> <Filter>misc</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj Sat Dec 28 19:59:40 2024 (r22633) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj Sat Dec 28 20:03:47 2024 (r22634) @@ -785,6 +785,51 @@ <ClInclude Include="..\..\common\stdafx.h" /> <ClInclude Include="..\..\common\version.h" /> <ClInclude Include="..\..\common\versionNumber.h" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\adl_serializer.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\byte_container_with_subtype.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\abi_macros.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\conversions\from_json.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\conversions\to_chars.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\conversions\to_json.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\exceptions.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\hash.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\input\binary_reader.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\input\input_adapters.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\input\json_sax.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\input\lexer.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\input\parser.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\input\position_t.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\iterators\internal_iterator.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\iterators\iter_impl.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\iterators\iteration_proxy.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\iterators\iterator_traits.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\iterators\json_reverse_iterator.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\iterators\primitive_iterator.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\json_custom_base_class.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\json_pointer.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\json_ref.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\macro_scope.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\macro_unscope.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\call_std\begin.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\call_std\end.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\cpp_future.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\detected.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\identity_tag.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\is_sax.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\std_fs.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\type_traits.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\void_t.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\output\binary_writer.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\output\output_adapters.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\output\serializer.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\string_concat.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\string_escape.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\value_t.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\json.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\json_fwd.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\ordered_map.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" /> <ClInclude Include="..\..\misc\WriteMemoryDump.h" /> <ClInclude Include="..\..\misc\mptColor.h" /> <ClInclude Include="..\..\misc\mptLibrary.h" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters Sat Dec 28 19:59:40 2024 (r22633) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters Sat Dec 28 20:03:47 2024 (r22634) @@ -16,6 +16,45 @@ <Filter Include="common"> <UniqueIdentifier>{AEFEE3F6-9AA0-0ECD-835B-22216F9C951D}</UniqueIdentifier> </Filter> + <Filter Include="include"> + <UniqueIdentifier>{89AF369E-F58E-B539-FEA6-40106A051C9B}</UniqueIdentifier> + </Filter> + <Filter Include="include\nlohmann-json"> + <UniqueIdentifier>{5A0436C9-C670-F1C3-8F64-8921FB8F132C}</UniqueIdentifier> + </Filter> + <Filter Include="include\nlohmann-json\include"> + <UniqueIdentifier>{CDE5467F-39FE-2DA9-02AB-BD426E82C242}</UniqueIdentifier> + </Filter> + <Filter Include="include\nlohmann-json\include\nlohmann"> + <UniqueIdentifier>{77988629-63EA-5D19-4C09-9B2938FA7602}</UniqueIdentifier> + </Filter> + <Filter Include="include\nlohmann-json\include\nlohmann\detail"> + <UniqueIdentifier>{59845F72-C5F4-61EB-8E13-DC73FA429AEC}</UniqueIdentifier> + </Filter> + <Filter Include="include\nlohmann-json\include\nlohmann\detail\conversions"> + <UniqueIdentifier>{A136C046-0DA9-0263-563D-38E7C2EECC5B}</UniqueIdentifier> + </Filter> + <Filter Include="include\nlohmann-json\include\nlohmann\detail\input"> + <UniqueIdentifier>{38633EBD-A474-E663-2DC6-78A399D66F9D}</UniqueIdentifier> + </Filter> + <Filter Include="include\nlohmann-json\include\nlohmann\detail\iterators"> + <UniqueIdentifier>{05D86162-71BF-4C58-7AAD-4ED4E613F01A}</UniqueIdentifier> + </Filter> + <Filter Include="include\nlohmann-json\include\nlohmann\detail\meta"> + <UniqueIdentifier>{EF25DD81-DBB9-D229-447E-2CDE30310D1C}</UniqueIdentifier> + </Filter> + <Filter Include="include\nlohmann-json\include\nlohmann\detail\meta\call_std"> + <UniqueIdentifier>{04E53826-70A2-E15C-F96C-CDC4652954B1}</UniqueIdentifier> + </Filter> + <Filter Include="include\nlohmann-json\include\nlohmann\detail\output"> + <UniqueIdentifier>{59868A73-45C5-34EF-EE47-1121DA65EA59}</UniqueIdentifier> + </Filter> + <Filter Include="include\nlohmann-json\include\nlohmann\thirdparty"> + <UniqueIdentifier>{110D8A6D-7DD3-E689-C62E-75EC323455EE}</UniqueIdentifier> + </Filter> + <Filter Include="include\nlohmann-json\include\nlohmann\thirdparty\hedley"> + <UniqueIdentifier>{7B925EB2-6767-A665-9016-E6617C4AB47C}</UniqueIdentifier> + </Filter> <Filter Include="misc"> <UniqueIdentifier>{B1A29A7C-9DD9-9B0D-46C6-811032DC170F}</UniqueIdentifier> </Filter> @@ -318,6 +357,141 @@ <ClInclude Include="..\..\common\versionNumber.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\adl_serializer.hpp"> + <Filter>include\nlohmann-json\include\nlohmann</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\byte_container_with_subtype.hpp"> + <Filter>include\nlohmann-json\include\nlohmann</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\abi_macros.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\conversions\from_json.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\conversions</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\conversions\to_chars.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\conversions</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\conversions\to_json.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\conversions</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\exceptions.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\hash.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\input\binary_reader.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\input</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\input\input_adapters.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\input</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\input\json_sax.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\input</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\input\lexer.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\input</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\input\parser.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\input</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\input\position_t.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\input</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\iterators\internal_iterator.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\iterators</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\iterators\iter_impl.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\iterators</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\iterators\iteration_proxy.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\iterators</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\iterators\iterator_traits.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\iterators</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\iterators\json_reverse_iterator.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\iterators</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\iterators\primitive_iterator.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\iterators</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\json_custom_base_class.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\json_pointer.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\json_ref.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\macro_scope.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\macro_unscope.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\call_std\begin.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\meta\call_std</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\call_std\end.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\meta\call_std</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\cpp_future.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\meta</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\detected.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\meta</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\identity_tag.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\meta</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\is_sax.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\meta</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\std_fs.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\meta</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\type_traits.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\meta</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\void_t.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\meta</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\output\binary_writer.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\output</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\output\output_adapters.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\output</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\output\serializer.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail\output</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\string_concat.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\string_escape.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\value_t.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\detail</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\json.hpp"> + <Filter>include\nlohmann-json\include\nlohmann</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\json_fwd.hpp"> + <Filter>include\nlohmann-json\include\nlohmann</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\ordered_map.hpp"> + <Filter>include\nlohmann-json\include\nlohmann</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\thirdparty\hedley</Filter> + </ClInclude> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp"> + <Filter>include\nlohmann-json\include\nlohmann\thirdparty\hedley</Filter> + </ClInclude> <ClInclude Include="..\..\misc\WriteMemoryDump.h"> <Filter>misc</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj Sat Dec 28 19:59:40 2024 (r22633) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj Sat Dec 28 20:03:47 2024 (r22634) @@ -785,6 +785,51 @@ <ClInclude Include="..\..\common\stdafx.h" /> <ClInclude Include="..\..\common\version.h" /> <ClInclude Include="..\..\common\versionNumber.h" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\adl_serializer.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\byte_container_with_subtype.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\abi_macros.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\conversions\from_json.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\conversions\to_chars.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\conversions\to_json.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\exceptions.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\hash.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\input\binary_reader.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\input\input_adapters.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\input\json_sax.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\input\lexer.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\input\parser.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\input\position_t.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\iterators\internal_iterator.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\iterators\iter_impl.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\iterators\iteration_proxy.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\iterators\iterator_traits.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\iterators\json_reverse_iterator.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\iterators\primitive_iterator.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\json_custom_base_class.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\json_pointer.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\json_ref.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\macro_scope.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\macro_unscope.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\call_std\begin.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\call_std\end.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\cpp_future.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\detected.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\identity_tag.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\is_sax.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\std_fs.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\type_traits.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\meta\void_t.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\output\binary_writer.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\output\output_adapters.hpp" /> + <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\output\serializer.hpp" /> + <ClInclude Include="..\..\include\n... [truncated message content] |
|
From: <sv...@op...> - 2024-12-28 18:59:52
|
Author: manx Date: Sat Dec 28 19:59:40 2024 New Revision: 22633 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22633 Log: [Ref] mpt/crypto/jwk.hpp: Do not rely on nlohmann::json implicit conversions. Modified: trunk/OpenMPT/src/mpt/crypto/jwk.hpp Modified: trunk/OpenMPT/src/mpt/crypto/jwk.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/crypto/jwk.hpp Sat Dec 28 19:59:25 2024 (r22632) +++ trunk/OpenMPT/src/mpt/crypto/jwk.hpp Sat Dec 28 19:59:40 2024 (r22633) @@ -149,7 +149,7 @@ std::vector<mpt::ustring> result; nlohmann::json jws = nlohmann::json::parse(mpt::transcode<std::string>(mpt::common_encoding::utf8, jws_)); for (const auto & s : jws["signatures"]) { - result.push_back(s["header"]["kid"]); + result.push_back(s["header"]["kid"].get<mpt::ustring>()); } return result; } @@ -215,8 +215,8 @@ throw std::runtime_error("Cannot parse RSA public key JWK."); } result.name = json["kid"].get<mpt::ustring>(); - result.public_exp = mpt::decode_base64url(json["e"]); - result.modulus = mpt::decode_base64url(json["n"]); + result.public_exp = mpt::decode_base64url(json["e"].get<mpt::ustring>()); + result.modulus = mpt::decode_base64url(json["n"].get<mpt::ustring>()); result.length = mpt::saturate_cast<uint32>(result.modulus.size() * 8); } catch (mpt::out_of_memory e) { mpt::rethrow_out_of_memory(e); @@ -352,7 +352,7 @@ std::vector<std::byte> jws_verify(const mpt::ustring & jws_) { nlohmann::json jws = nlohmann::json::parse(mpt::transcode<std::string>(mpt::common_encoding::utf8, jws_)); - std::vector<std::byte> payload = mpt::decode_base64url(jws["payload"]); + std::vector<std::byte> payload = mpt::decode_base64url(jws["payload"].get<mpt::ustring>()); nlohmann::json jsignature = nlohmann::json::object(); bool sigfound = false; for (const auto & s : jws["signatures"]) { @@ -364,8 +364,8 @@ if (!sigfound) { throw signature_verification_failed(); } - std::vector<std::byte> protectedheaderraw = mpt::decode_base64url(jsignature["protected"]); - std::vector<std::byte> signature = mpt::decode_base64url(jsignature["signature"]); + std::vector<std::byte> protectedheaderraw = mpt::decode_base64url(jsignature["protected"].get<mpt::ustring>()); + std::vector<std::byte> signature = mpt::decode_base64url(jsignature["signature"].get<mpt::ustring>()); nlohmann::json header = nlohmann::json::parse(mpt::buffer_cast<std::string>(protectedheaderraw)); if (header["typ"] != "JWT") { throw signature_verification_failed(); |
|
From: <sv...@op...> - 2024-12-28 18:59:37
|
Author: manx Date: Sat Dec 28 19:59:25 2024 New Revision: 22632 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22632 Log: [Ref] Wine Integration: Do not rely on nlohmann::json implicit conversions. Modified: trunk/OpenMPT/mptrack/wine/NativeSoundDeviceMarshalling.h Modified: trunk/OpenMPT/mptrack/wine/NativeSoundDeviceMarshalling.h ============================================================================== --- trunk/OpenMPT/mptrack/wine/NativeSoundDeviceMarshalling.h Sat Dec 28 16:52:26 2024 (r22631) +++ trunk/OpenMPT/mptrack/wine/NativeSoundDeviceMarshalling.h Sat Dec 28 19:59:25 2024 (r22632) @@ -35,7 +35,7 @@ } inline void from_json(const nlohmann::json &j, SampleFormat &val) { - val = SampleFormat::FromInt(j); + val = SampleFormat::FromInt(j.get<int>()); } namespace SoundDevice @@ -47,7 +47,7 @@ } inline void from_json(const nlohmann::json &j, SoundDevice::ChannelMapping &val) { - val = SoundDevice::ChannelMapping::FromString(j); + val = SoundDevice::ChannelMapping::FromString(j.get<mpt::ustring>()); } inline void to_json(nlohmann::json &j, const SoundDevice::Info::Default &val) |
|
From: <sv...@op...> - 2024-12-28 15:52:33
|
Author: sagamusix Date: Sat Dec 28 16:52:26 2024 New Revision: 22631 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22631 Log: [Ref] Add CTrackApp::GetUserTemplatesPath and CTrackApp::GetExampleSongsPath. Modified: trunk/OpenMPT/mptrack/GeneralConfigDlg.cpp trunk/OpenMPT/mptrack/MainFrm.cpp trunk/OpenMPT/mptrack/Moddoc.cpp trunk/OpenMPT/mptrack/Mptrack.cpp trunk/OpenMPT/mptrack/Mptrack.h trunk/OpenMPT/mptrack/TrackerSettings.cpp trunk/OpenMPT/mptrack/TrackerSettings.h Modified: trunk/OpenMPT/mptrack/GeneralConfigDlg.cpp ============================================================================== --- trunk/OpenMPT/mptrack/GeneralConfigDlg.cpp Sat Dec 28 16:40:46 2024 (r22630) +++ trunk/OpenMPT/mptrack/GeneralConfigDlg.cpp Sat Dec 28 16:52:26 2024 (r22631) @@ -123,7 +123,7 @@ } } - const mpt::PathString basePath = theApp.GetConfigPath() + P_("TemplateModules\\"); + const mpt::PathString basePath = theApp.GetUserTemplatesPath(); FolderScanner scanner(basePath, FolderScanner::kOnlyFiles | FolderScanner::kFindInSubDirectories); mpt::PathString file; while(scanner.Next(file)) @@ -207,7 +207,7 @@ void COptionsGeneral::OnBrowseTemplate() { - mpt::PathString basePath = theApp.GetConfigPath() + P_("TemplateModules\\"); + mpt::PathString basePath = theApp.GetUserTemplatesPath(); mpt::PathString defaultFile = mpt::PathString::FromCString(GetWindowTextString(m_defaultTemplate)); if(defaultFile.empty()) defaultFile = TrackerSettings::Instance().defaultTemplateFile; Modified: trunk/OpenMPT/mptrack/MainFrm.cpp ============================================================================== --- trunk/OpenMPT/mptrack/MainFrm.cpp Sat Dec 28 16:40:46 2024 (r22630) +++ trunk/OpenMPT/mptrack/MainFrm.cpp Sat Dec 28 16:52:26 2024 (r22631) @@ -2383,7 +2383,7 @@ { MPT_ASSERT(nId == UINT(isTemplateFile ? ID_FILE_OPENTEMPLATE_LASTINRANGE : ID_EXAMPLE_MODULES_LASTINRANGE)); FileDialog::PathList files; - theApp.OpenModulesDialog(files, isTemplateFile ? theApp.GetConfigPath() + P_("TemplateModules") : theApp.GetInstallPath() + P_("ExampleSongs")); + theApp.OpenModulesDialog(files, isTemplateFile ? theApp.GetUserTemplatesPath() : theApp.GetExampleSongsPath()); for(const auto &file : files) { theApp.OpenDocumentFile(file.ToCString()); Modified: trunk/OpenMPT/mptrack/Moddoc.cpp ============================================================================== --- trunk/OpenMPT/mptrack/Moddoc.cpp Sat Dec 28 16:40:46 2024 (r22630) +++ trunk/OpenMPT/mptrack/Moddoc.cpp Sat Dec 28 16:52:26 2024 (r22631) @@ -3112,7 +3112,7 @@ void CModDoc::OnSaveTemplateModule() { // Create template folder if doesn't exist already. - const mpt::PathString templateFolder = TrackerSettings::Instance().PathUserTemplates.GetDefaultDir(); + const mpt::PathString templateFolder = theApp.GetUserTemplatesPath(); if (!mpt::native_fs{}.is_directory(templateFolder)) { if (!CreateDirectory(templateFolder.AsNative().c_str(), nullptr)) Modified: trunk/OpenMPT/mptrack/Mptrack.cpp ============================================================================== --- trunk/OpenMPT/mptrack/Mptrack.cpp Sat Dec 28 16:40:46 2024 (r22630) +++ trunk/OpenMPT/mptrack/Mptrack.cpp Sat Dec 28 16:52:26 2024 (r22631) @@ -1018,7 +1018,7 @@ void CTrackApp::CreatePaths() { - // Create missing diretories + // Create missing directories if(!IsPortableMode()) { if(!mpt::native_fs{}.is_directory(m_ConfigPath)) @@ -1048,7 +1048,18 @@ RemoveDirectory(oldTunings.AsNative().c_str()); } } +} + +mpt::PathString CTrackApp::GetUserTemplatesPath() const +{ + return GetConfigPath() + P_("TemplateModules\\"); +} + + +mpt::PathString CTrackApp::GetExampleSongsPath() const +{ + return GetInstallPath() + P_("ExampleSongs\\"); } @@ -1669,7 +1680,7 @@ if(TrackerSettings::Instance().defaultNewFileAction == nfDefaultTemplate && !templateFile.empty()) { // Template file can be either a filename inside one of the preset and user TemplateModules folders, or a full path. - const mpt::PathString dirs[] = { GetConfigPath() + P_("TemplateModules\\"), GetInstallPath() + P_("TemplateModules\\"), mpt::PathString() }; + const mpt::PathString dirs[] = { GetUserTemplatesPath(), GetInstallPath() + P_("TemplateModules\\"), mpt::PathString() }; for(const auto &dir : dirs) { if(mpt::native_fs{}.is_file(dir + templateFile)) Modified: trunk/OpenMPT/mptrack/Mptrack.h ============================================================================== --- trunk/OpenMPT/mptrack/Mptrack.h Sat Dec 28 16:40:46 2024 (r22630) +++ trunk/OpenMPT/mptrack/Mptrack.h Sat Dec 28 16:52:26 2024 (r22631) @@ -294,6 +294,8 @@ /// Returns path to config folder including trailing '\'. mpt::PathString GetConfigPath() const { return m_ConfigPath; } + mpt::PathString GetUserTemplatesPath() const; + mpt::PathString GetExampleSongsPath() const; void SetupPaths(bool overridePortable); void CreatePaths(); Modified: trunk/OpenMPT/mptrack/TrackerSettings.cpp ============================================================================== --- trunk/OpenMPT/mptrack/TrackerSettings.cpp Sat Dec 28 16:40:46 2024 (r22630) +++ trunk/OpenMPT/mptrack/TrackerSettings.cpp Sat Dec 28 16:52:26 2024 (r22631) @@ -329,7 +329,6 @@ , PathPluginPresets(conf, UL_("Paths"), UL_("Plugin_Presets_Directory"), mpt::PathString()) , PathExport(conf, UL_("Paths"), UL_("Export_Directory"), mpt::PathString()) , PathTunings(theApp.GetConfigPath() + P_("tunings\\")) - , PathUserTemplates(theApp.GetConfigPath() + P_("TemplateModules\\")) // Default template , defaultTemplateFile(conf, UL_("Paths"), UL_("DefaultTemplate"), mpt::PathString()) , defaultArtist(conf, UL_("Misc"), UL_("DefaultArtist"), mpt::getenv(UL_("USERNAME")).value_or(UL_(""))) Modified: trunk/OpenMPT/mptrack/TrackerSettings.h ============================================================================== --- trunk/OpenMPT/mptrack/TrackerSettings.h Sat Dec 28 16:40:46 2024 (r22630) +++ trunk/OpenMPT/mptrack/TrackerSettings.h Sat Dec 28 16:52:26 2024 (r22631) @@ -909,7 +909,6 @@ ConfigurableDirectory PathPluginPresets; ConfigurableDirectory PathExport; DefaultAndWorkingDirectory PathTunings; - DefaultAndWorkingDirectory PathUserTemplates; mpt::PathString m_szKbdFile; // Default template |
|
From: <sv...@op...> - 2024-12-28 15:40:59
|
Author: sagamusix Date: Sat Dec 28 16:40:46 2024 New Revision: 22630 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22630 Log: [Fix] Config Dialog: Browsing for a template file used the wrong base path. Modified: trunk/OpenMPT/mptrack/GeneralConfigDlg.cpp Modified: trunk/OpenMPT/mptrack/GeneralConfigDlg.cpp ============================================================================== --- trunk/OpenMPT/mptrack/GeneralConfigDlg.cpp Fri Dec 27 14:31:54 2024 (r22629) +++ trunk/OpenMPT/mptrack/GeneralConfigDlg.cpp Sat Dec 28 16:40:46 2024 (r22630) @@ -207,7 +207,7 @@ void COptionsGeneral::OnBrowseTemplate() { - mpt::PathString basePath = theApp.GetInstallPath() + P_("TemplateModules\\"); + mpt::PathString basePath = theApp.GetConfigPath() + P_("TemplateModules\\"); mpt::PathString defaultFile = mpt::PathString::FromCString(GetWindowTextString(m_defaultTemplate)); if(defaultFile.empty()) defaultFile = TrackerSettings::Instance().defaultTemplateFile; |
|
From: <sv...@op...> - 2024-12-27 13:32:06
|
Author: manx Date: Fri Dec 27 14:31:54 2024 New Revision: 22629 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22629 Log: [Ref] libopenmpt: Plugin GUI: Move About box to shared code. Modified: trunk/OpenMPT/libopenmpt/in_openmpt/in_openmpt.cpp trunk/OpenMPT/libopenmpt/plugin-common/libopenmpt_plugin_gui.cpp trunk/OpenMPT/libopenmpt/plugin-common/libopenmpt_plugin_gui.hpp trunk/OpenMPT/libopenmpt/xmp-openmpt/xmp-openmpt.cpp Modified: trunk/OpenMPT/libopenmpt/in_openmpt/in_openmpt.cpp ============================================================================== --- trunk/OpenMPT/libopenmpt/in_openmpt/in_openmpt.cpp Fri Dec 27 13:26:06 2024 (r22628) +++ trunk/OpenMPT/libopenmpt/in_openmpt/in_openmpt.cpp Fri Dec 27 14:31:54 2024 (r22629) @@ -212,11 +212,7 @@ } static void config( HWND hwndParent ) { -#if 1 libopenmpt::plugin::gui_edit_settings( &self->settings, hwndParent, TEXT(SHORT_TITLE) ); -#else - static_cast<void>(hwndParent); -#endif apply_options(); } @@ -227,18 +223,9 @@ about << " OpenMPT version " << openmpt::string::get( "core_version" ) << std::endl; about << std::endl; about << openmpt::string::get( "contact" ) << std::endl; - about << std::endl; - about << "Show full credits?" << std::endl; - if ( MessageBox( hwndParent, StringToWINAPI( StringDecode( about.str(), CP_UTF8 ) ).c_str(), TEXT(SHORT_TITLE), MB_ICONINFORMATION | MB_YESNOCANCEL | MB_DEFBUTTON1 ) != IDYES ) { - return; - } std::ostringstream credits; - credits << openmpt::string::get( "credits" ); -#if 1 - libopenmpt::plugin::gui_show_file_info( hwndParent, TEXT(SHORT_TITLE), StringToWINAPI( StringReplace( StringDecode( credits.str(), CP_UTF8 ), L"\n", L"\r\n" ) ) ); -#else - MessageBox( hwndParent, StringToWINAPI( StringReplace(StringDecode(credits.str(), CP_UTF8 ), L"\n", L"\r\n" ) ).c_str(), TEXT(SHORT_TITLE), MB_OK ); -#endif + credits << openmpt::string::get( "credits" ) << std::endl; + libopenmpt::plugin::gui_show_about( hwndParent, TEXT(SHORT_TITLE), StringReplace( StringToWINAPI( StringDecode( about.str(), CP_UTF8 ) ), TEXT("\n"), TEXT("\r\n") ), StringReplace( StringToWINAPI( StringDecode( credits.str(), CP_UTF8 ) ), TEXT("\n"), TEXT("\r\n") ) ); } static void init() { Modified: trunk/OpenMPT/libopenmpt/plugin-common/libopenmpt_plugin_gui.cpp ============================================================================== --- trunk/OpenMPT/libopenmpt/plugin-common/libopenmpt_plugin_gui.cpp Fri Dec 27 13:26:06 2024 (r22628) +++ trunk/OpenMPT/libopenmpt/plugin-common/libopenmpt_plugin_gui.cpp Fri Dec 27 14:31:54 2024 (r22629) @@ -365,6 +365,7 @@ #if defined(MPT_WITH_MFC) + void gui_edit_settings( libopenmpt_settings * s, HWND parent, std::wstring title ) { AFX_MANAGE_STATE( AfxGetStaticModuleState() ); CSettingsDialog dlg( s, title.c_str(), parent ? CWnd::FromHandle( parent ) : nullptr ); @@ -374,7 +375,25 @@ void gui_show_file_info( HWND parent, std::wstring title, std::wstring info ) { AFX_MANAGE_STATE( AfxGetStaticModuleState() ); - CInfoDialog dlg( title.c_str(), info.c_str(), parent ? CWnd::FromHandle( parent ) : nullptr); + CInfoDialog dlg( title.c_str(), info.c_str(), parent ? CWnd::FromHandle( parent ) : nullptr ); + dlg.DoModal(); +} + + +void gui_show_about( HWND parent, std::basic_string<TCHAR> title, std::basic_string<TCHAR> about, std::basic_string<TCHAR> credits ) { + AFX_MANAGE_STATE( AfxGetStaticModuleState() ); + about += TEXT("\r\n"); + about += TEXT("Show full credits?\r\n"); + if ( parent ) { + if ( CWnd::FromHandle( parent )->MessageBox( about.c_str(), title.c_str(), MB_ICONINFORMATION | MB_YESNOCANCEL | MB_DEFBUTTON1 ) != IDYES ) { + return; + } + } else { + if ( MessageBox( parent, about.c_str(), title.c_str(), MB_ICONINFORMATION | MB_YESNOCANCEL | MB_DEFBUTTON1 ) != IDYES ) { + return; + } + } + CInfoDialog dlg( title.c_str(), credits.c_str(), parent ? CWnd::FromHandle( parent ) : nullptr ); dlg.DoModal(); } @@ -469,6 +488,14 @@ } +void gui_show_about( HWND parent, std::basic_string<TCHAR> title, std::basic_string<TCHAR> about, std::basic_string<TCHAR> credits ) { + if ( MessageBox( parent, about.c_str(), title.c_str(), MB_ICONINFORMATION | MB_YESNOCANCEL | MB_DEFBUTTON1 ) != IDYES ) { + return; + } + gui_show_file_info( parent, title, credits ); +} + + #endif // MPT_WITH_MFC Modified: trunk/OpenMPT/libopenmpt/plugin-common/libopenmpt_plugin_gui.hpp ============================================================================== --- trunk/OpenMPT/libopenmpt/plugin-common/libopenmpt_plugin_gui.hpp Fri Dec 27 13:26:06 2024 (r22628) +++ trunk/OpenMPT/libopenmpt/plugin-common/libopenmpt_plugin_gui.hpp Fri Dec 27 14:31:54 2024 (r22629) @@ -30,6 +30,8 @@ void gui_show_file_info( HWND parent, std::basic_string<TCHAR> title, std::basic_string<TCHAR> info ); +void gui_show_about( HWND parent, std::basic_string<TCHAR> title, std::basic_string<TCHAR> about, std::basic_string<TCHAR> credits ); + } // namespace plugin } // namespace libopenmpt Modified: trunk/OpenMPT/libopenmpt/xmp-openmpt/xmp-openmpt.cpp ============================================================================== --- trunk/OpenMPT/libopenmpt/xmp-openmpt/xmp-openmpt.cpp Fri Dec 27 13:26:06 2024 (r22628) +++ trunk/OpenMPT/libopenmpt/xmp-openmpt/xmp-openmpt.cpp Fri Dec 27 14:31:54 2024 (r22629) @@ -483,30 +483,17 @@ about << " OpenMPT version " << openmpt::string::get( "core_version" ) << std::endl; about << std::endl; about << openmpt::string::get( "contact" ) << std::endl; - about << std::endl; - about << "Show full credits?" << std::endl; - if ( MessageBox( win, StringToWINAPI( StringDecode( about.str(), CP_UTF8 ) ).c_str(), TEXT(SHORT_TITLE), MB_ICONINFORMATION | MB_YESNOCANCEL | MB_DEFBUTTON1 ) != IDYES ) { - return; - } std::ostringstream credits; credits << openmpt::string::get( "credits" ); credits << "Additional thanks to:" << std::endl; credits << std::endl; credits << "Arseny Kapoulkine for pugixml" << std::endl; credits << "https://pugixml.org/" << std::endl; -#if 1 - libopenmpt::plugin::gui_show_file_info( win, TEXT(SHORT_TITLE), StringToWINAPI( StringReplace( StringDecode( credits.str(), CP_UTF8 ), L"\n", L"\r\n" ) ) ); -#else - MessageBox( win, StringToWINAPI( StringReplace( StringDecode( credits.str(), CP_UTF8 ), L"\n", L"\r\n" ) ).c_str(), TEXT(SHORT_TITLE), MB_OK ); -#endif + libopenmpt::plugin::gui_show_about( win, TEXT(SHORT_TITLE), StringReplace( StringToWINAPI( StringDecode( about.str(), CP_UTF8 ) ), TEXT("\n"), TEXT("\r\n") ), StringReplace( StringToWINAPI( StringDecode( credits.str(), CP_UTF8 ) ), TEXT("\n"), TEXT("\r\n") ) ); } static void WINAPI openmpt_Config( HWND win ) { -#if 1 libopenmpt::plugin::gui_edit_settings( &self->settings, win, TEXT(SHORT_TITLE) ); -#else - static_cast<void>(win); -#endif apply_and_save_options(); } |
|
From: <sv...@op...> - 2024-12-27 12:26:19
|
Author: manx Date: Fri Dec 27 13:26:06 2024 New Revision: 22628 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22628 Log: [Imp] build: Makefile: DJGPP: Add VIA Isaiah CPUs. Modified: trunk/OpenMPT/build/make/config-djgpp.mk Modified: trunk/OpenMPT/build/make/config-djgpp.mk ============================================================================== --- trunk/OpenMPT/build/make/config-djgpp.mk Fri Dec 27 13:13:54 2024 (r22627) +++ trunk/OpenMPT/build/make/config-djgpp.mk Fri Dec 27 13:26:06 2024 (r22628) @@ -349,8 +349,17 @@ via/c3-ezra := $(___) -march=samuel-2 $(FPU_3DNOW) -mtune=samuel-2 $(OPT_UARCH_SCAL_64) --param l1-cache-size=64 --param l2-cache-size=64 via/c3-nehemiah := $(___) -march=nehemiah $(FPU_SSE) -mtune=nehemiah $(OPT_UARCH_SCAL_128) --param l1-cache-size=64 --param l2-cache-size=64 via/c7-esther := $(XX_) -march=esther $(FPU_SSE3) -mtune=esther $(OPT_UARCH_SCAL_128) --param l1-cache-size=64 --param l2-cache-size=128 +via/eden-x2 := $(___) -march=eden-x2 $(FPU_SSE3) -mtune=eden-x2 $(OPT_UARCH_SCAL_128) --param l1-cache-size=64 --param l2-cache-size=64 +via/nano := $(___) -march=nano $(FPU_SSSE3) -mtune=nano $(OPT_UARCH_SCAL_128) --param l1-cache-size=64 --param l2-cache-size=1024 +via/nano-1000 := $(___) -march=nano-1000 $(FPU_SSSE3) -mtune=nano-1000 $(OPT_UARCH_SCAL_128) --param l1-cache-size=64 --param l2-cache-size=1024 +via/nano-2000 := $(___) -march=nano-2000 $(FPU_SSSE3) -mtune=nano-2000 $(OPT_UARCH_SCAL_128) --param l1-cache-size=64 --param l2-cache-size=1024 +via/nano-3000 := $(___) -march=nano-3000 $(FPU_SSE4_1) -mtune=nano-3000 $(OPT_UARCH_SCAL_128) --param l1-cache-size=64 --param l2-cache-size=1024 +via/nano-4000 := $(___) -march=nano-4000 $(FPU_SSE4_1) -mtune=nano-4000 $(OPT_UARCH_SCAL_128) --param l1-cache-size=64 --param l2-cache-size=1024 +via/nano-x2 := $(___) -march=nano-x2 $(FPU_SSE4_1) -mtune=nano-x2 $(OPT_UARCH_SCAL_128) --param l1-cache-size=64 --param l2-cache-size=1024 +via/nano-x4 := $(___) -march=nano-x4 $(FPU_SSE4_1) -mtune=nano-x4 $(OPT_UARCH_SCAL_128) --param l1-cache-size=64 --param l2-cache-size=1024 +via/eden-x4 := $(___) -march=eden-x4 $(FPU_SSE4_2) -mtune=eden-x4 $(OPT_UARCH_SCAL_128) --param l1-cache-size=64 --param l2-cache-size=2048 -via/late := $(XX_) -march=i686 $(FPU_SSE3) -mtune=esther $(OPT_UARCH_SCAL_128) +via/late := $(XX_) -march=eden-x4 $(FPU_SSE4_2) -mtune=eden-x4 $(OPT_UARCH_SCAL_128) |
|
From: <sv...@op...> - 2024-12-27 12:14:01
|
Author: manx Date: Fri Dec 27 13:13:54 2024 New Revision: 22627 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22627 Log: [Imp] xmp-openmpt: Do not show "Default" in settings for sample rate and channels. Show "XMPlay output format" instead, which makes it more clear what this actually does. Modified: trunk/OpenMPT/libopenmpt/plugin-common/libopenmpt_plugin_gui.cpp trunk/OpenMPT/libopenmpt/plugin-common/libopenmpt_plugin_settings.hpp trunk/OpenMPT/libopenmpt/xmp-openmpt/xmp-openmpt.cpp Modified: trunk/OpenMPT/libopenmpt/plugin-common/libopenmpt_plugin_gui.cpp ============================================================================== --- trunk/OpenMPT/libopenmpt/plugin-common/libopenmpt_plugin_gui.cpp Fri Dec 27 12:44:54 2024 (r22626) +++ trunk/OpenMPT/libopenmpt/plugin-common/libopenmpt_plugin_gui.cpp Fri Dec 27 13:13:54 2024 (r22627) @@ -127,7 +127,7 @@ selected = false; if ( !s->no_default_format ) { - m_ComboBoxSamplerate.SetItemData( m_ComboBoxSamplerate.AddString( TEXT("Default") ), 0 ); + m_ComboBoxSamplerate.SetItemData( m_ComboBoxSamplerate.AddString( s->player_setting_name ? s->player_setting_name.value().c_str() : TEXT("Default") ), 0 ); } m_ComboBoxSamplerate.SetItemData( m_ComboBoxSamplerate.AddString( TEXT("6000") ), 6000 ); m_ComboBoxSamplerate.SetItemData( m_ComboBoxSamplerate.AddString( TEXT("8000") ), 8000 ); @@ -154,7 +154,7 @@ selected = false; if ( !s->no_default_format ) { - m_ComboBoxChannels.SetItemData( m_ComboBoxChannels.AddString( TEXT("Default") ), 0 ); + m_ComboBoxChannels.SetItemData( m_ComboBoxChannels.AddString( s->player_setting_name ? s->player_setting_name.value().c_str() : TEXT("Default") ), 0 ); } m_ComboBoxChannels.SetItemData( m_ComboBoxChannels.AddString( TEXT("Mono") ), 1 ); m_ComboBoxChannels.SetItemData( m_ComboBoxChannels.AddString( TEXT("Stereo") ), 2 ); Modified: trunk/OpenMPT/libopenmpt/plugin-common/libopenmpt_plugin_settings.hpp ============================================================================== --- trunk/OpenMPT/libopenmpt/plugin-common/libopenmpt_plugin_settings.hpp Fri Dec 27 12:44:54 2024 (r22626) +++ trunk/OpenMPT/libopenmpt/plugin-common/libopenmpt_plugin_settings.hpp Fri Dec 27 13:13:54 2024 (r22627) @@ -12,6 +12,7 @@ #include <windows.h> +#include <optional> #include <string> @@ -33,6 +34,7 @@ int interpolationfilterlength = 8; int ramping = -1; int vis_allow_scroll = 1; + std::optional<std::basic_string<TCHAR>> player_setting_name = std::nullopt; changed_func changed = nullptr; }; @@ -70,10 +72,11 @@ } } public: - settings( const std::basic_string<TCHAR> & subkey, bool no_default_format_ ) - : subkey(subkey) + settings( const std::basic_string<TCHAR> & subkey_, bool no_default_format_, const std::optional<std::basic_string<TCHAR>> & player_setting_name_ = std::nullopt) + : subkey(subkey_) { no_default_format = no_default_format_; + player_setting_name = player_setting_name_; if (!no_default_format) { samplerate = 0; channels = 0; Modified: trunk/OpenMPT/libopenmpt/xmp-openmpt/xmp-openmpt.cpp ============================================================================== --- trunk/OpenMPT/libopenmpt/xmp-openmpt/xmp-openmpt.cpp Fri Dec 27 12:44:54 2024 (r22626) +++ trunk/OpenMPT/libopenmpt/xmp-openmpt/xmp-openmpt.cpp Fri Dec 27 13:13:54 2024 (r22627) @@ -132,7 +132,7 @@ } public: xmp_openmpt_settings() - : libopenmpt::plugin::settings(TEXT(SHORT_TITLE), false) + : libopenmpt::plugin::settings(TEXT(SHORT_TITLE), false, TEXT("XMPlay output format")) { return; } |
|
From: <sv...@op...> - 2024-12-27 11:45:08
|
Author: manx Date: Fri Dec 27 12:44:54 2024 New Revision: 22626 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22626 Log: [Ref] libopenmpt: Plugin settings: Small cleanup. Modified: trunk/OpenMPT/libopenmpt/plugin-common/libopenmpt_plugin_settings.hpp Modified: trunk/OpenMPT/libopenmpt/plugin-common/libopenmpt_plugin_settings.hpp ============================================================================== --- trunk/OpenMPT/libopenmpt/plugin-common/libopenmpt_plugin_settings.hpp Fri Dec 27 12:44:29 2024 (r22625) +++ trunk/OpenMPT/libopenmpt/plugin-common/libopenmpt_plugin_settings.hpp Fri Dec 27 12:44:54 2024 (r22626) @@ -81,11 +81,7 @@ } void load() { - #ifdef UNICODE - #define read_setting(a,b,c) read_setting( b , L ## b , c) - #else - #define read_setting(a,b,c) read_setting( b , b , c) - #endif + #define read_setting(a,b,c) read_setting( b , TEXT(b) , c) read_setting( subkey, "Samplerate_Hz", samplerate ); read_setting( subkey, "Channels", channels ); read_setting( subkey, "MasterGain_milliBel", mastergain_millibel ); @@ -100,11 +96,7 @@ } void save() { - #ifdef UNICODE - #define write_setting(a,b,c) write_setting( b , L ## b , c) - #else - #define write_setting(a,b,c) write_setting( b , b , c) - #endif + #define write_setting(a,b,c) write_setting( b , TEXT(b) , c) write_setting( subkey, "Samplerate_Hz", samplerate ); write_setting( subkey, "Channels", channels ); write_setting( subkey, "MasterGain_milliBel", mastergain_millibel ); |
|
From: <sv...@op...> - 2024-12-27 11:44:36
|
Author: manx Date: Fri Dec 27 12:44:29 2024 New Revision: 22625 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22625 Log: [Fix] libopenmpt: Plugin GUI: Make MFC code not depend on UNICODE. Modified: trunk/OpenMPT/libopenmpt/plugin-common/libopenmpt_plugin_gui.cpp Modified: trunk/OpenMPT/libopenmpt/plugin-common/libopenmpt_plugin_gui.cpp ============================================================================== --- trunk/OpenMPT/libopenmpt/plugin-common/libopenmpt_plugin_gui.cpp Fri Dec 27 10:38:18 2024 (r22624) +++ trunk/OpenMPT/libopenmpt/plugin-common/libopenmpt_plugin_gui.cpp Fri Dec 27 12:44:29 2024 (r22625) @@ -19,6 +19,10 @@ #include <vector> #endif +#if defined(MPT_WITH_MFC) +#include <tchar.h> +#endif + #if !defined(MPT_WITH_MFC) #include <windows.h> #endif @@ -123,20 +127,20 @@ selected = false; if ( !s->no_default_format ) { - m_ComboBoxSamplerate.SetItemData( m_ComboBoxSamplerate.AddString( L"Default" ), 0 ); + m_ComboBoxSamplerate.SetItemData( m_ComboBoxSamplerate.AddString( TEXT("Default") ), 0 ); } - m_ComboBoxSamplerate.SetItemData( m_ComboBoxSamplerate.AddString( L"6000" ), 6000 ); - m_ComboBoxSamplerate.SetItemData( m_ComboBoxSamplerate.AddString( L"8000" ), 8000 ); - m_ComboBoxSamplerate.SetItemData( m_ComboBoxSamplerate.AddString( L"11025" ), 11025 ); - m_ComboBoxSamplerate.SetItemData( m_ComboBoxSamplerate.AddString( L"16000" ), 16000 ); - m_ComboBoxSamplerate.SetItemData( m_ComboBoxSamplerate.AddString( L"22050" ), 22050 ); - m_ComboBoxSamplerate.SetItemData( m_ComboBoxSamplerate.AddString( L"32000" ), 32000 ); - m_ComboBoxSamplerate.SetItemData( m_ComboBoxSamplerate.AddString( L"44100" ), 44100 ); - m_ComboBoxSamplerate.SetItemData( m_ComboBoxSamplerate.AddString( L"48000" ), 48000 ); - m_ComboBoxSamplerate.SetItemData( m_ComboBoxSamplerate.AddString( L"88200" ), 88200 ); - m_ComboBoxSamplerate.SetItemData( m_ComboBoxSamplerate.AddString( L"96000" ), 96000 ); + m_ComboBoxSamplerate.SetItemData( m_ComboBoxSamplerate.AddString( TEXT("6000") ), 6000 ); + m_ComboBoxSamplerate.SetItemData( m_ComboBoxSamplerate.AddString( TEXT("8000") ), 8000 ); + m_ComboBoxSamplerate.SetItemData( m_ComboBoxSamplerate.AddString( TEXT("11025") ), 11025 ); + m_ComboBoxSamplerate.SetItemData( m_ComboBoxSamplerate.AddString( TEXT("16000") ), 16000 ); + m_ComboBoxSamplerate.SetItemData( m_ComboBoxSamplerate.AddString( TEXT("22050") ), 22050 ); + m_ComboBoxSamplerate.SetItemData( m_ComboBoxSamplerate.AddString( TEXT("32000") ), 32000 ); + m_ComboBoxSamplerate.SetItemData( m_ComboBoxSamplerate.AddString( TEXT("44100") ), 44100 ); + m_ComboBoxSamplerate.SetItemData( m_ComboBoxSamplerate.AddString( TEXT("48000") ), 48000 ); + m_ComboBoxSamplerate.SetItemData( m_ComboBoxSamplerate.AddString( TEXT("88200") ), 88200 ); + m_ComboBoxSamplerate.SetItemData( m_ComboBoxSamplerate.AddString( TEXT("96000") ), 96000 ); if ( !s->no_default_format && s->samplerate == 0 ) { - m_ComboBoxSamplerate.SelectString( 0, L"Default" ); + m_ComboBoxSamplerate.SelectString( 0, TEXT("Default") ); } for ( int index = 0; index < m_ComboBoxSamplerate.GetCount(); ++index ) { if ( static_cast<int>( m_ComboBoxSamplerate.GetItemData( index ) ) == s->samplerate ) { @@ -145,18 +149,18 @@ } } if ( !selected ) { - m_ComboBoxSamplerate.SelectString( 0, L"48000" ); + m_ComboBoxSamplerate.SelectString( 0, TEXT("48000") ); } selected = false; if ( !s->no_default_format ) { - m_ComboBoxChannels.SetItemData( m_ComboBoxChannels.AddString( L"Default" ), 0 ); + m_ComboBoxChannels.SetItemData( m_ComboBoxChannels.AddString( TEXT("Default") ), 0 ); } - m_ComboBoxChannels.SetItemData( m_ComboBoxChannels.AddString( L"Mono" ), 1 ); - m_ComboBoxChannels.SetItemData( m_ComboBoxChannels.AddString( L"Stereo" ), 2 ); - m_ComboBoxChannels.SetItemData( m_ComboBoxChannels.AddString( L"Quad" ), 4 ); + m_ComboBoxChannels.SetItemData( m_ComboBoxChannels.AddString( TEXT("Mono") ), 1 ); + m_ComboBoxChannels.SetItemData( m_ComboBoxChannels.AddString( TEXT("Stereo") ), 2 ); + m_ComboBoxChannels.SetItemData( m_ComboBoxChannels.AddString( TEXT("Quad") ), 4 ); if ( !s->no_default_format && s->channels == 0 ) { - m_ComboBoxChannels.SelectString( 0, L"Default" ); + m_ComboBoxChannels.SelectString( 0, TEXT("Default") ); } for ( int index = 0; index < m_ComboBoxChannels.GetCount(); ++index ) { if ( static_cast<int>( m_ComboBoxChannels.GetItemData( index ) ) == s->channels ) { @@ -165,7 +169,7 @@ } } if ( !selected ) { - m_ComboBoxChannels.SelectString( 0, L"Stereo" ); + m_ComboBoxChannels.SelectString( 0, TEXT("Stereo") ); } m_SliderCtrlGain.SetRange( -1200, 1200 ); @@ -175,10 +179,10 @@ m_SliderCtrlGain.SetPos( s->mastergain_millibel ); selected = false; - m_ComboBoxInterpolation.SetItemData( m_ComboBoxInterpolation.AddString( L"Off / 1 Tap (Nearest)" ), 1 ); - m_ComboBoxInterpolation.SetItemData( m_ComboBoxInterpolation.AddString( L"2 Tap (Linear)" ), 2 ); - m_ComboBoxInterpolation.SetItemData( m_ComboBoxInterpolation.AddString( L"4 Tap (Cubic)" ), 4 ); - m_ComboBoxInterpolation.SetItemData( m_ComboBoxInterpolation.AddString( L"8 Tap (Polyphase FIR)" ), 8 ); + m_ComboBoxInterpolation.SetItemData( m_ComboBoxInterpolation.AddString( TEXT("Off / 1 Tap (Nearest)") ), 1 ); + m_ComboBoxInterpolation.SetItemData( m_ComboBoxInterpolation.AddString( TEXT("2 Tap (Linear)") ), 2 ); + m_ComboBoxInterpolation.SetItemData( m_ComboBoxInterpolation.AddString( TEXT("4 Tap (Cubic)") ), 4 ); + m_ComboBoxInterpolation.SetItemData( m_ComboBoxInterpolation.AddString( TEXT("8 Tap (Polyphase FIR)") ), 8 ); for ( int index = 0; index < m_ComboBoxInterpolation.GetCount(); ++index ) { if ( static_cast<int>( m_ComboBoxInterpolation.GetItemData( index ) ) == s->interpolationfilterlength ) { m_ComboBoxInterpolation.SetCurSel( index ); @@ -186,16 +190,16 @@ } } if ( !selected ) { - m_ComboBoxInterpolation.SelectString( 0, L"8 Tap (Polyphase FIR)" ); + m_ComboBoxInterpolation.SelectString( 0, TEXT("8 Tap (Polyphase FIR)") ); } m_CheckBoxAmigaResampler.SetCheck( s->use_amiga_resampler ? BST_CHECKED : BST_UNCHECKED ); selected = false; m_ComboBoxAmigaFilter.EnableWindow( s->use_amiga_resampler ? TRUE : FALSE ); - m_ComboBoxAmigaFilter.SetItemData( m_ComboBoxAmigaFilter.AddString( L"Default" ), 0 ); - m_ComboBoxAmigaFilter.SetItemData( m_ComboBoxAmigaFilter.AddString( L"A500 Filter" ), 0xA500 ); - m_ComboBoxAmigaFilter.SetItemData( m_ComboBoxAmigaFilter.AddString( L"A1200 Filter" ), 0xA1200 ); - m_ComboBoxAmigaFilter.SetItemData( m_ComboBoxAmigaFilter.AddString( L"Unfiltered" ), 1 ); + m_ComboBoxAmigaFilter.SetItemData( m_ComboBoxAmigaFilter.AddString( TEXT("Default") ), 0 ); + m_ComboBoxAmigaFilter.SetItemData( m_ComboBoxAmigaFilter.AddString( TEXT("A500 Filter") ), 0xA500 ); + m_ComboBoxAmigaFilter.SetItemData( m_ComboBoxAmigaFilter.AddString( TEXT("A1200 Filter") ), 0xA1200 ); + m_ComboBoxAmigaFilter.SetItemData( m_ComboBoxAmigaFilter.AddString( TEXT("Unfiltered") ), 1 ); for ( int index = 0; index < m_ComboBoxAmigaFilter.GetCount(); ++index ) { if ( static_cast<int>( m_ComboBoxAmigaFilter.GetItemData( index ) ) == s->amiga_filter_type ) { m_ComboBoxAmigaFilter.SetCurSel( index ); @@ -203,13 +207,13 @@ } } if ( !selected ) { - m_ComboBoxAmigaFilter.SelectString( 0, L"Default" ); + m_ComboBoxAmigaFilter.SelectString( 0, TEXT("Default") ); } selected = false; - m_ComboBoxRepeat.SetItemData( m_ComboBoxRepeat.AddString( L"Forever" ), static_cast<unsigned int>( -1 ) ); - m_ComboBoxRepeat.SetItemData( m_ComboBoxRepeat.AddString( L"Never" ), 0 ); - m_ComboBoxRepeat.SetItemData( m_ComboBoxRepeat.AddString( L"Once" ), 1 ); + m_ComboBoxRepeat.SetItemData( m_ComboBoxRepeat.AddString( TEXT("Forever") ), static_cast<unsigned int>( -1 ) ); + m_ComboBoxRepeat.SetItemData( m_ComboBoxRepeat.AddString( TEXT("Never") ), 0 ); + m_ComboBoxRepeat.SetItemData( m_ComboBoxRepeat.AddString( TEXT("Once") ), 1 ); for ( int index = 0; index < m_ComboBoxRepeat.GetCount(); ++index ) { if ( static_cast<int>( m_ComboBoxRepeat.GetItemData( index ) ) == s->repeatcount ) { m_ComboBoxRepeat.SetCurSel( index ); @@ -217,7 +221,7 @@ } } if ( !selected ) { - m_ComboBoxRepeat.SelectString( 0, L"Never" ); + m_ComboBoxRepeat.SelectString( 0, TEXT("Never") ); } m_SliderCtrlStereoSeparation.SetRange( 0, 200 ); @@ -227,13 +231,13 @@ m_SliderCtrlStereoSeparation.SetPos( s->stereoseparation ); selected = false; - m_ComboBoxRamping.SetItemData( m_ComboBoxRamping.AddString( L"Default" ), static_cast<unsigned int>( -1 ) ); - m_ComboBoxRamping.SetItemData( m_ComboBoxRamping.AddString( L"Off" ), 0 ); - m_ComboBoxRamping.SetItemData( m_ComboBoxRamping.AddString( L"1 ms" ), 1 ); - m_ComboBoxRamping.SetItemData( m_ComboBoxRamping.AddString( L"2 ms" ), 2 ); - m_ComboBoxRamping.SetItemData( m_ComboBoxRamping.AddString( L"3 ms" ), 3 ); - m_ComboBoxRamping.SetItemData( m_ComboBoxRamping.AddString( L"5 ms" ), 5 ); - m_ComboBoxRamping.SetItemData( m_ComboBoxRamping.AddString( L"10 ms" ), 10 ); + m_ComboBoxRamping.SetItemData( m_ComboBoxRamping.AddString( TEXT("Default") ), static_cast<unsigned int>( -1 ) ); + m_ComboBoxRamping.SetItemData( m_ComboBoxRamping.AddString( TEXT("Off") ), 0 ); + m_ComboBoxRamping.SetItemData( m_ComboBoxRamping.AddString( TEXT("1 ms") ), 1 ); + m_ComboBoxRamping.SetItemData( m_ComboBoxRamping.AddString( TEXT("2 ms") ), 2 ); + m_ComboBoxRamping.SetItemData( m_ComboBoxRamping.AddString( TEXT("3 ms") ), 3 ); + m_ComboBoxRamping.SetItemData( m_ComboBoxRamping.AddString( TEXT("5 ms") ), 5 ); + m_ComboBoxRamping.SetItemData( m_ComboBoxRamping.AddString( TEXT("10 ms") ), 10 ); for ( int index = 0; index < m_ComboBoxRamping.GetCount(); ++index ) { if ( static_cast<int>( m_ComboBoxRamping.GetItemData( index ) ) == s->ramping ) { m_ComboBoxRamping.SetCurSel( index ); @@ -241,7 +245,7 @@ } } if ( !selected ) { - m_ComboBoxRamping.SelectString( 0, L"Default" ); + m_ComboBoxRamping.SelectString( 0, TEXT("Default") ); } return TRUE; @@ -285,11 +289,11 @@ switch ( nID ) { case IDC_SLIDER_GAIN: - swprintf( pTTT->szText, _countof(pTTT->szText), L"%.02f dB", m_SliderCtrlGain.GetPos() * 0.01f ); + _sntprintf( pTTT->szText, _countof(pTTT->szText), TEXT("%.02f dB"), m_SliderCtrlGain.GetPos() * 0.01f ); break; case IDC_SLIDER_STEREOSEPARATION: - swprintf( pTTT->szText, _countof(pTTT->szText), L"%d %%", m_SliderCtrlStereoSeparation.GetPos()); + _sntprintf( pTTT->szText, _countof(pTTT->szText), TEXT("%d %%"), m_SliderCtrlStereoSeparation.GetPos() ); break; default: |
|
From: <sv...@op...> - 2024-12-27 09:38:26
|
Author: manx Date: Fri Dec 27 10:38:18 2024 New Revision: 22624 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22624 Log: Merged revision(s) 22621 from trunk/OpenMPT: [Doc] libopenmpt: File loading strategy documentation was missed in 0.5 when implementing the performance enhancements for seekable std::istream. Update it now. ........ Modified: branches/OpenMPT-1.29/ (props changed) branches/OpenMPT-1.29/libopenmpt/ (props changed) branches/OpenMPT-1.29/libopenmpt/libopenmpt.hpp Modified: branches/OpenMPT-1.29/libopenmpt/libopenmpt.hpp ============================================================================== --- branches/OpenMPT-1.29/libopenmpt/libopenmpt.hpp Fri Dec 27 10:37:50 2024 (r22623) +++ branches/OpenMPT-1.29/libopenmpt/libopenmpt.hpp Fri Dec 27 10:38:18 2024 (r22624) @@ -49,25 +49,25 @@ * * libopenmpt can use 3 different strategies for file I/O. * - * - openmpt::module::module() with any kind of memory buffer as parameter will - * load the module from the provided memory buffer, which will require loading - * all data upfront by the library - * caller. * - openmpt::module::module() with a seekable std::istream as parameter will - * load the module via the stream interface. libopenmpt will not implement an - * additional buffering layer in this case which means the callbacks are assumed - * to be performant even with small i/o sizes. + * load the module via the stream interface. This is the recommended strategy. * - openmpt::module::module() with an unseekable std::istream as parameter * will load the module via the stream interface. libopempt will make an * internal copy as it goes along, and sometimes have to pre-cache the whole * file in case it needs to know the complete file size. This strategy is * intended to be used if the file is located on a high latency network. + * - openmpt::module::module() with any kind of memory buffer as parameter will + * load the module from the provided memory buffer, which will require loading + * all data upfront by the library caller. This strategy has the disadvantage of + * requiring all data to be loaded even when the module loading happens to fail + * after that. It should only be used when the data has already been loaded into + * memory for other reasons. * - * | constructor | speed | memory consumption | - * | ----------------: | :----: | :----------------: | - * | memory buffer | <p style="background-color:green" >fast </p> | <p style="background-color:yellow">medium</p> | - * | seekable stream | <p style="background-color:red" >slow </p> | <p style="background-color:green" >low </p> | + * | constructor | speed | memory consumption | + * | ----------------: | :---: | :----------------: | + * | seekable stream | <p style="background-color:yellow">medium</p> | <p style="background-color:green" >low </p> | * | unseekable stream | <p style="background-color:yellow">medium</p> | <p style="background-color:red" >high </p> | + * | memory buffer | <p style="background-color:green" >fast </p> | <p style="background-color:yellow">medium</p> | * * In all cases, the data or stream passed to the constructor is no longer * needed after the openmpt::module has been constructed and can be destroyed |
|
From: <sv...@op...> - 2024-12-27 09:38:02
|
Author: manx Date: Fri Dec 27 10:37:50 2024 New Revision: 22623 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22623 Log: Merged revision(s) 22621 from trunk/OpenMPT: [Doc] libopenmpt: File loading strategy documentation was missed in 0.5 when implementing the performance enhancements for seekable std::istream. Update it now. ........ Modified: branches/OpenMPT-1.30/ (props changed) branches/OpenMPT-1.30/libopenmpt/ (props changed) branches/OpenMPT-1.30/libopenmpt/libopenmpt.hpp Modified: branches/OpenMPT-1.30/libopenmpt/libopenmpt.hpp ============================================================================== --- branches/OpenMPT-1.30/libopenmpt/libopenmpt.hpp Fri Dec 27 10:37:13 2024 (r22622) +++ branches/OpenMPT-1.30/libopenmpt/libopenmpt.hpp Fri Dec 27 10:37:50 2024 (r22623) @@ -49,25 +49,25 @@ * * libopenmpt can use 3 different strategies for file I/O. * - * - openmpt::module::module() with any kind of memory buffer as parameter will - * load the module from the provided memory buffer, which will require loading - * all data upfront by the library - * caller. * - openmpt::module::module() with a seekable std::istream as parameter will - * load the module via the stream interface. libopenmpt will not implement an - * additional buffering layer in this case which means the callbacks are assumed - * to be performant even with small i/o sizes. + * load the module via the stream interface. This is the recommended strategy. * - openmpt::module::module() with an unseekable std::istream as parameter * will load the module via the stream interface. libopempt will make an * internal copy as it goes along, and sometimes have to pre-cache the whole * file in case it needs to know the complete file size. This strategy is * intended to be used if the file is located on a high latency network. + * - openmpt::module::module() with any kind of memory buffer as parameter will + * load the module from the provided memory buffer, which will require loading + * all data upfront by the library caller. This strategy has the disadvantage of + * requiring all data to be loaded even when the module loading happens to fail + * after that. It should only be used when the data has already been loaded into + * memory for other reasons. * - * | constructor | speed | memory consumption | - * | ----------------: | :----: | :----------------: | - * | memory buffer | <p style="background-color:green" >fast </p> | <p style="background-color:yellow">medium</p> | - * | seekable stream | <p style="background-color:red" >slow </p> | <p style="background-color:green" >low </p> | + * | constructor | speed | memory consumption | + * | ----------------: | :---: | :----------------: | + * | seekable stream | <p style="background-color:yellow">medium</p> | <p style="background-color:green" >low </p> | * | unseekable stream | <p style="background-color:yellow">medium</p> | <p style="background-color:red" >high </p> | + * | memory buffer | <p style="background-color:green" >fast </p> | <p style="background-color:yellow">medium</p> | * * In all cases, the data or stream passed to the constructor is no longer * needed after the openmpt::module has been constructed and can be destroyed |
|
From: <sv...@op...> - 2024-12-27 09:37:24
|
Author: manx Date: Fri Dec 27 10:37:13 2024 New Revision: 22622 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22622 Log: Merged revision(s) 22621 from trunk/OpenMPT: [Doc] libopenmpt: File loading strategy documentation was missed in 0.5 when implementing the performance enhancements for seekable std::istream. Update it now. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/libopenmpt/libopenmpt.hpp Modified: branches/OpenMPT-1.31/libopenmpt/libopenmpt.hpp ============================================================================== --- branches/OpenMPT-1.31/libopenmpt/libopenmpt.hpp Fri Dec 27 10:36:49 2024 (r22621) +++ branches/OpenMPT-1.31/libopenmpt/libopenmpt.hpp Fri Dec 27 10:37:13 2024 (r22622) @@ -49,25 +49,25 @@ * * libopenmpt can use 3 different strategies for file I/O. * - * - openmpt::module::module() with any kind of memory buffer as parameter will - * load the module from the provided memory buffer, which will require loading - * all data upfront by the library - * caller. * - openmpt::module::module() with a seekable std::istream as parameter will - * load the module via the stream interface. libopenmpt will not implement an - * additional buffering layer in this case which means the callbacks are assumed - * to be performant even with small i/o sizes. + * load the module via the stream interface. This is the recommended strategy. * - openmpt::module::module() with an unseekable std::istream as parameter * will load the module via the stream interface. libopempt will make an * internal copy as it goes along, and sometimes have to pre-cache the whole * file in case it needs to know the complete file size. This strategy is * intended to be used if the file is located on a high latency network. + * - openmpt::module::module() with any kind of memory buffer as parameter will + * load the module from the provided memory buffer, which will require loading + * all data upfront by the library caller. This strategy has the disadvantage of + * requiring all data to be loaded even when the module loading happens to fail + * after that. It should only be used when the data has already been loaded into + * memory for other reasons. * - * | constructor | speed | memory consumption | - * | ----------------: | :----: | :----------------: | - * | memory buffer | <p style="background-color:green" >fast </p> | <p style="background-color:yellow">medium</p> | - * | seekable stream | <p style="background-color:red" >slow </p> | <p style="background-color:green" >low </p> | + * | constructor | speed | memory consumption | + * | ----------------: | :---: | :----------------: | + * | seekable stream | <p style="background-color:yellow">medium</p> | <p style="background-color:green" >low </p> | * | unseekable stream | <p style="background-color:yellow">medium</p> | <p style="background-color:red" >high </p> | + * | memory buffer | <p style="background-color:green" >fast </p> | <p style="background-color:yellow">medium</p> | * * In all cases, the data or stream passed to the constructor is no longer * needed after the openmpt::module has been constructed and can be destroyed |
|
From: <sv...@op...> - 2024-12-27 09:37:01
|
Author: manx Date: Fri Dec 27 10:36:49 2024 New Revision: 22621 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22621 Log: [Doc] libopenmpt: File loading strategy documentation was missed in 0.5 when implementing the performance enhancements for seekable std::istream. Update it now. Modified: trunk/OpenMPT/libopenmpt/libopenmpt.hpp Modified: trunk/OpenMPT/libopenmpt/libopenmpt.hpp ============================================================================== --- trunk/OpenMPT/libopenmpt/libopenmpt.hpp Fri Dec 27 10:19:31 2024 (r22620) +++ trunk/OpenMPT/libopenmpt/libopenmpt.hpp Fri Dec 27 10:36:49 2024 (r22621) @@ -49,25 +49,25 @@ * * libopenmpt can use 3 different strategies for file I/O. * - * - openmpt::module::module() with any kind of memory buffer as parameter will - * load the module from the provided memory buffer, which will require loading - * all data upfront by the library - * caller. * - openmpt::module::module() with a seekable std::istream as parameter will - * load the module via the stream interface. libopenmpt will not implement an - * additional buffering layer in this case which means the callbacks are assumed - * to be performant even with small i/o sizes. + * load the module via the stream interface. This is the recommended strategy. * - openmpt::module::module() with an unseekable std::istream as parameter * will load the module via the stream interface. libopempt will make an * internal copy as it goes along, and sometimes have to pre-cache the whole * file in case it needs to know the complete file size. This strategy is * intended to be used if the file is located on a high latency network. + * - openmpt::module::module() with any kind of memory buffer as parameter will + * load the module from the provided memory buffer, which will require loading + * all data upfront by the library caller. This strategy has the disadvantage of + * requiring all data to be loaded even when the module loading happens to fail + * after that. It should only be used when the data has already been loaded into + * memory for other reasons. * - * | constructor | speed | memory consumption | - * | ----------------: | :----: | :----------------: | - * | memory buffer | <p style="background-color:green" >fast </p> | <p style="background-color:yellow">medium</p> | - * | seekable stream | <p style="background-color:red" >slow </p> | <p style="background-color:green" >low </p> | + * | constructor | speed | memory consumption | + * | ----------------: | :---: | :----------------: | + * | seekable stream | <p style="background-color:yellow">medium</p> | <p style="background-color:green" >low </p> | * | unseekable stream | <p style="background-color:yellow">medium</p> | <p style="background-color:red" >high </p> | + * | memory buffer | <p style="background-color:green" >fast </p> | <p style="background-color:yellow">medium</p> | * * In all cases, the data or stream passed to the constructor is no longer * needed after the openmpt::module has been constructed and can be destroyed |
|
From: <sv...@op...> - 2024-12-27 09:19:43
|
Author: manx Date: Fri Dec 27 10:19:31 2024 New Revision: 22620 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22620 Log: Merged revision(s) 22616 from trunk/OpenMPT: [Doc] libopenmpt: Fix typo. ........ Modified: branches/OpenMPT-1.28/ (props changed) branches/OpenMPT-1.28/libopenmpt/ (props changed) branches/OpenMPT-1.28/libopenmpt/libopenmpt.hpp Modified: branches/OpenMPT-1.28/libopenmpt/libopenmpt.hpp ============================================================================== --- branches/OpenMPT-1.28/libopenmpt/libopenmpt.hpp Fri Dec 27 10:19:11 2024 (r22619) +++ branches/OpenMPT-1.28/libopenmpt/libopenmpt.hpp Fri Dec 27 10:19:31 2024 (r22620) @@ -53,7 +53,7 @@ * caller. * - openmpt::module::module() with a seekable std::istream as parameter will * load the module via the stream interface. libopenmpt will not implement an - * additional buffering layer in this case whih means the callbacks are assumed + * additional buffering layer in this case which means the callbacks are assumed * to be performant even with small i/o sizes. * - openmpt::module::module() with an unseekable std::istream as parameter * will load the module via the stream interface. libopempt will make an |
|
From: <sv...@op...> - 2024-12-27 09:19:22
|
Author: manx Date: Fri Dec 27 10:19:11 2024 New Revision: 22619 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22619 Log: Merged revision(s) 22616 from trunk/OpenMPT: [Doc] libopenmpt: Fix typo. ........ Modified: branches/OpenMPT-1.29/ (props changed) branches/OpenMPT-1.29/libopenmpt/ (props changed) branches/OpenMPT-1.29/libopenmpt/libopenmpt.hpp Modified: branches/OpenMPT-1.29/libopenmpt/libopenmpt.hpp ============================================================================== --- branches/OpenMPT-1.29/libopenmpt/libopenmpt.hpp Fri Dec 27 10:18:50 2024 (r22618) +++ branches/OpenMPT-1.29/libopenmpt/libopenmpt.hpp Fri Dec 27 10:19:11 2024 (r22619) @@ -55,7 +55,7 @@ * caller. * - openmpt::module::module() with a seekable std::istream as parameter will * load the module via the stream interface. libopenmpt will not implement an - * additional buffering layer in this case whih means the callbacks are assumed + * additional buffering layer in this case which means the callbacks are assumed * to be performant even with small i/o sizes. * - openmpt::module::module() with an unseekable std::istream as parameter * will load the module via the stream interface. libopempt will make an |
|
From: <sv...@op...> - 2024-12-27 09:18:57
|
Author: manx Date: Fri Dec 27 10:18:50 2024 New Revision: 22618 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22618 Log: Merged revision(s) 22616 from trunk/OpenMPT: [Doc] libopenmpt: Fix typo. ........ Modified: branches/OpenMPT-1.30/ (props changed) branches/OpenMPT-1.30/libopenmpt/ (props changed) branches/OpenMPT-1.30/libopenmpt/libopenmpt.hpp Modified: branches/OpenMPT-1.30/libopenmpt/libopenmpt.hpp ============================================================================== --- branches/OpenMPT-1.30/libopenmpt/libopenmpt.hpp Fri Dec 27 10:18:22 2024 (r22617) +++ branches/OpenMPT-1.30/libopenmpt/libopenmpt.hpp Fri Dec 27 10:18:50 2024 (r22618) @@ -55,7 +55,7 @@ * caller. * - openmpt::module::module() with a seekable std::istream as parameter will * load the module via the stream interface. libopenmpt will not implement an - * additional buffering layer in this case whih means the callbacks are assumed + * additional buffering layer in this case which means the callbacks are assumed * to be performant even with small i/o sizes. * - openmpt::module::module() with an unseekable std::istream as parameter * will load the module via the stream interface. libopempt will make an |
|
From: <sv...@op...> - 2024-12-27 09:18:40
|
Author: manx Date: Fri Dec 27 10:18:22 2024 New Revision: 22617 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22617 Log: Merged revision(s) 22616 from trunk/OpenMPT: [Doc] libopenmpt: Fix typo. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/libopenmpt/libopenmpt.hpp Modified: branches/OpenMPT-1.31/libopenmpt/libopenmpt.hpp ============================================================================== --- branches/OpenMPT-1.31/libopenmpt/libopenmpt.hpp Fri Dec 27 10:17:54 2024 (r22616) +++ branches/OpenMPT-1.31/libopenmpt/libopenmpt.hpp Fri Dec 27 10:18:22 2024 (r22617) @@ -55,7 +55,7 @@ * caller. * - openmpt::module::module() with a seekable std::istream as parameter will * load the module via the stream interface. libopenmpt will not implement an - * additional buffering layer in this case whih means the callbacks are assumed + * additional buffering layer in this case which means the callbacks are assumed * to be performant even with small i/o sizes. * - openmpt::module::module() with an unseekable std::istream as parameter * will load the module via the stream interface. libopempt will make an |
3 messages has been excluded from this view by a project administrator.
