Menu
▾
▴
[OMPT-svn-commit] OpenMPT r21608 - in trunk/OpenMPT: build/auto build/premake build/vs2017winxp build/vs2017winxp/ext build/vs2017winxpansi build/vs2017winxpansi/ext build/vs2019win7 build/vs2019win7/ext build/vs2022win10 build/vs2022win10/ext build/vs2022win10clang build/vs2022win10clang/ext build/vs2022win7 build/vs2022win7/ext build/vs2022win8 build/vs2022win8/ext build/vs2022win81 build/vs2022win81/ext common include/SignalsmithStretch include/SignalsmithStretch/SignalsmithStretch include/SignalsmithStretch/SignalsmithStretch/dsp include/smbPitchShift include/soundtouch installer mptrack tracklib
Author: sagamusix Date: Wed Sep 18 23:27:33 2024 New Revision: 21608 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21608 Log: [Imp] Replace smbPitchShift and Soundtouch with Signalsmith Stretch and a custom "Akai"-like implementation. Both of the new implementations can handle any pitch shifting and time stretching amounts, and apply both changes simultaneously (https://bugs.openmpt.org/view.php?id=1808). [Mod] OpenMPT: Version is now 1.32.00.24 Added: trunk/OpenMPT/build/premake/ext-SignalsmithStretch.lua (contents, props changed) trunk/OpenMPT/include/SignalsmithStretch/ trunk/OpenMPT/include/SignalsmithStretch/OpenMPT.txt (contents, props changed) trunk/OpenMPT/include/SignalsmithStretch/SignalsmithStretch/ trunk/OpenMPT/include/SignalsmithStretch/SignalsmithStretch/LICENSE.txt (contents, props changed) trunk/OpenMPT/include/SignalsmithStretch/SignalsmithStretch/README.md (contents, props changed) trunk/OpenMPT/include/SignalsmithStretch/SignalsmithStretch/dsp/ trunk/OpenMPT/include/SignalsmithStretch/SignalsmithStretch/dsp/LICENSE.txt (contents, props changed) trunk/OpenMPT/include/SignalsmithStretch/SignalsmithStretch/dsp/README.md (contents, props changed) trunk/OpenMPT/include/SignalsmithStretch/SignalsmithStretch/dsp/common.h (contents, props changed) trunk/OpenMPT/include/SignalsmithStretch/SignalsmithStretch/dsp/curves.h (contents, props changed) trunk/OpenMPT/include/SignalsmithStretch/SignalsmithStretch/dsp/delay.h (contents, props changed) trunk/OpenMPT/include/SignalsmithStretch/SignalsmithStretch/dsp/envelopes.h (contents, props changed) trunk/OpenMPT/include/SignalsmithStretch/SignalsmithStretch/dsp/fft.h (contents, props changed) trunk/OpenMPT/include/SignalsmithStretch/SignalsmithStretch/dsp/filters.h (contents, props changed) trunk/OpenMPT/include/SignalsmithStretch/SignalsmithStretch/dsp/mix.h (contents, props changed) trunk/OpenMPT/include/SignalsmithStretch/SignalsmithStretch/dsp/perf.h (contents, props changed) trunk/OpenMPT/include/SignalsmithStretch/SignalsmithStretch/dsp/rates.h (contents, props changed) trunk/OpenMPT/include/SignalsmithStretch/SignalsmithStretch/dsp/spectral.h (contents, props changed) trunk/OpenMPT/include/SignalsmithStretch/SignalsmithStretch/dsp/windows.h (contents, props changed) trunk/OpenMPT/include/SignalsmithStretch/SignalsmithStretch/signalsmith-stretch.h (contents, props changed) trunk/OpenMPT/tracklib/TimeStretchPitchShift.cpp (contents, props changed) trunk/OpenMPT/tracklib/TimeStretchPitchShift.h (contents, props changed) Deleted: trunk/OpenMPT/build/premake/ext-smbPitchShift.lua trunk/OpenMPT/build/premake/ext-soundtouch.lua trunk/OpenMPT/build/vs2017winxp/ext/smbPitchShift.vcxproj trunk/OpenMPT/build/vs2017winxp/ext/soundtouch.vcxproj trunk/OpenMPT/build/vs2017winxp/ext/soundtouch.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/ext/smbPitchShift.vcxproj trunk/OpenMPT/build/vs2017winxpansi/ext/soundtouch.vcxproj trunk/OpenMPT/build/vs2017winxpansi/ext/soundtouch.vcxproj.filters trunk/OpenMPT/build/vs2019win7/ext/smbPitchShift.vcxproj trunk/OpenMPT/build/vs2019win7/ext/soundtouch.vcxproj trunk/OpenMPT/build/vs2019win7/ext/soundtouch.vcxproj.filters trunk/OpenMPT/build/vs2022win10/ext/smbPitchShift.vcxproj trunk/OpenMPT/build/vs2022win10/ext/soundtouch.vcxproj trunk/OpenMPT/build/vs2022win10/ext/soundtouch.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/ext/smbPitchShift.vcxproj trunk/OpenMPT/build/vs2022win10clang/ext/soundtouch.vcxproj trunk/OpenMPT/build/vs2022win10clang/ext/soundtouch.vcxproj.filters trunk/OpenMPT/build/vs2022win7/ext/smbPitchShift.vcxproj trunk/OpenMPT/build/vs2022win7/ext/soundtouch.vcxproj trunk/OpenMPT/build/vs2022win7/ext/soundtouch.vcxproj.filters trunk/OpenMPT/build/vs2022win8/ext/smbPitchShift.vcxproj trunk/OpenMPT/build/vs2022win8/ext/soundtouch.vcxproj trunk/OpenMPT/build/vs2022win8/ext/soundtouch.vcxproj.filters trunk/OpenMPT/build/vs2022win81/ext/smbPitchShift.vcxproj trunk/OpenMPT/build/vs2022win81/ext/soundtouch.vcxproj trunk/OpenMPT/build/vs2022win81/ext/soundtouch.vcxproj.filters trunk/OpenMPT/include/smbPitchShift/ trunk/OpenMPT/include/soundtouch/ Modified: trunk/OpenMPT/build/auto/build_openmpt_release_packages_multiarch.py trunk/OpenMPT/build/auto/build_openmpt_release_packages_retro.py trunk/OpenMPT/build/auto/package_libopenmpt_multi_args.cmd trunk/OpenMPT/build/auto/package_libopenmpt_retro_winxp.cmd trunk/OpenMPT/build/auto/update_package_template.cmd trunk/OpenMPT/build/auto/update_package_template_retro.cmd trunk/OpenMPT/build/premake/mpt-OpenMPT.lua trunk/OpenMPT/build/premake/premake.lua trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.sln trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.sln trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/OpenMPT.sln trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.sln trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.sln trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.sln trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.sln trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.sln trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2019win7/OpenMPT.sln trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.sln trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.sln trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2022win10/OpenMPT.sln trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.sln trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.sln trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/OpenMPT.sln trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.sln trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2022win7/OpenMPT-UTF8.sln trunk/OpenMPT/build/vs2022win7/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win7/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2022win7/OpenMPT.sln trunk/OpenMPT/build/vs2022win7/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win7/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2022win8/OpenMPT-ANSI.sln trunk/OpenMPT/build/vs2022win8/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win8/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2022win8/OpenMPT-UTF8.sln trunk/OpenMPT/build/vs2022win8/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win8/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2022win8/OpenMPT.sln trunk/OpenMPT/build/vs2022win8/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win8/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2022win81/OpenMPT-ANSI.sln trunk/OpenMPT/build/vs2022win81/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win81/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2022win81/OpenMPT-UTF8.sln trunk/OpenMPT/build/vs2022win81/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win81/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2022win81/OpenMPT.sln trunk/OpenMPT/build/vs2022win81/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win81/OpenMPT.vcxproj.filters trunk/OpenMPT/common/version.cpp trunk/OpenMPT/common/versionNumber.h trunk/OpenMPT/installer/install-multi-arch-retro.iss trunk/OpenMPT/installer/install-multi-arch.iss trunk/OpenMPT/mptrack/CDecimalSupport.cpp trunk/OpenMPT/mptrack/Ctrl_smp.cpp trunk/OpenMPT/mptrack/Ctrl_smp.h trunk/OpenMPT/mptrack/PSRatioCalc.cpp trunk/OpenMPT/mptrack/PSRatioCalc.h trunk/OpenMPT/mptrack/mptrack.rc Modified: trunk/OpenMPT/build/auto/build_openmpt_release_packages_multiarch.py ============================================================================== --- trunk/OpenMPT/build/auto/build_openmpt_release_packages_multiarch.py Wed Sep 18 17:14:07 2024 (r21607) +++ trunk/OpenMPT/build/auto/build_openmpt_release_packages_multiarch.py Wed Sep 18 23:27:33 2024 (r21608) @@ -92,7 +92,6 @@ copy_file(from_path, to_path, "OpenMPT.exe") copy_file(from_path, to_path, "openmpt-lame.dll") copy_file(from_path, to_path, "openmpt-mpg123.dll") - copy_file(from_path, to_path, "openmpt-soundtouch.dll") copy_file(from_path, to_path, "openmpt-wine-support.zip") def copy_pluginbridge(from_path, arch, to_path): @@ -104,7 +103,6 @@ copy_file(from_path, to_path, "OpenMPT.pdb") copy_file(from_path, to_path, "openmpt-lame.pdb") copy_file(from_path, to_path, "openmpt-mpg123.pdb") - copy_file(from_path, to_path, "openmpt-soundtouch.pdb") def copy_symbols_pluginbridge(from_path, to_path, arch): copy_file(from_path, to_path, "PluginBridge-" + arch + ".pdb") Modified: trunk/OpenMPT/build/auto/build_openmpt_release_packages_retro.py ============================================================================== --- trunk/OpenMPT/build/auto/build_openmpt_release_packages_retro.py Wed Sep 18 17:14:07 2024 (r21607) +++ trunk/OpenMPT/build/auto/build_openmpt_release_packages_retro.py Wed Sep 18 23:27:33 2024 (r21608) @@ -84,7 +84,6 @@ copy_file(from_path, to_path, "OpenMPT.exe") copy_file(from_path, to_path, "openmpt-lame.dll") copy_file(from_path, to_path, "openmpt-mpg123.dll") - copy_file(from_path, to_path, "openmpt-soundtouch.dll") copy_file(from_path, to_path, "openmpt-wine-support.zip") def copy_pluginbridge(from_path, arch, to_path): @@ -96,7 +95,6 @@ copy_file(from_path, to_path, "OpenMPT.pdb") copy_file(from_path, to_path, "openmpt-lame.pdb") copy_file(from_path, to_path, "openmpt-mpg123.pdb") - copy_file(from_path, to_path, "openmpt-soundtouch.pdb") def copy_symbols_pluginbridge(from_path, to_path, arch): copy_file(from_path, to_path, "PluginBridge-" + arch + ".pdb") Modified: trunk/OpenMPT/build/auto/package_libopenmpt_multi_args.cmd ============================================================================== --- trunk/OpenMPT/build/auto/package_libopenmpt_multi_args.cmd Wed Sep 18 17:14:07 2024 (r21607) +++ trunk/OpenMPT/build/auto/package_libopenmpt_multi_args.cmd Wed Sep 18 23:27:33 2024 (r21608) @@ -70,8 +70,7 @@ rem copy /y ..\..\include\r8brain\LICENSE .\Licenses\License.R8Brain.txt || goto error rem copy /y ..\..\include\rtaudio\README.md .\Licenses\License.RtAudio.txt || goto error rem copy /y ..\..\include\rtmidi\LICENSE .\Licenses\License.RtMidi.txt || goto error -rem copy /y ..\..\include\smbPitchShift\smbPitchShift.cpp .\Licenses\License.smbPitchShift.txt || goto error -rem copy /y ..\..\include\soundtouch\COPYING.TXT .\Licenses\License.SoundTouch.txt || goto error +rem copy /y ..\include\SignalsmithStretch\SignalsmithStretch\LICENSE.txt .\Licenses\License.SignalsmithStretch.txt || goto error rem copy /y ..\..\include\stb_vorbis\stb_vorbis.c .\Licenses\License.stb_vorbis.txt || goto error rem copy /y ..\..\include\unrar\license.txt .\Licenses\License.UnRAR.txt || goto error copy /y ..\..\include\vorbis\COPYING .\Licenses\License.Vorbis.txt || goto error @@ -191,8 +190,7 @@ rem copy /y ..\..\include\r8brain\LICENSE .\Licenses\License.R8Brain.txt || goto error rem copy /y ..\..\include\rtaudio\README.md .\Licenses\License.RtAudio.txt || goto error rem copy /y ..\..\include\rtmidi\LICENSE .\Licenses\License.RtMidi.txt || goto error -rem copy /y ..\..\include\smbPitchShift\smbPitchShift.cpp .\Licenses\License.smbPitchShift.txt || goto error -rem copy /y ..\..\include\soundtouch\COPYING.TXT .\Licenses\License.SoundTouch.txt || goto error +rem copy /y ..\include\SignalsmithStretch\SignalsmithStretch\LICENSE.txt .\Licenses\License.SignalsmithStretch.txt || goto error rem copy /y ..\..\include\stb_vorbis\stb_vorbis.c .\Licenses\License.stb_vorbis.txt || goto error rem copy /y ..\..\include\unrar\license.txt .\Licenses\License.UnRAR.txt || goto error copy /y ..\..\include\vorbis\COPYING .\Licenses\License.Vorbis.txt || goto error Modified: trunk/OpenMPT/build/auto/package_libopenmpt_retro_winxp.cmd ============================================================================== --- trunk/OpenMPT/build/auto/package_libopenmpt_retro_winxp.cmd Wed Sep 18 17:14:07 2024 (r21607) +++ trunk/OpenMPT/build/auto/package_libopenmpt_retro_winxp.cmd Wed Sep 18 23:27:33 2024 (r21608) @@ -64,8 +64,7 @@ rem copy /y ..\..\include\r8brain\LICENSE .\Licenses\License.R8Brain.txt || goto error rem copy /y ..\..\include\rtaudio\README.md .\Licenses\License.RtAudio.txt || goto error rem copy /y ..\..\include\rtmidi\LICENSE .\Licenses\License.RtMidi.txt || goto error -rem copy /y ..\..\include\smbPitchShift\smbPitchShift.cpp .\Licenses\License.smbPitchShift.txt || goto error -rem copy /y ..\..\include\soundtouch\COPYING.TXT .\Licenses\License.SoundTouch.txt || goto error +rem copy /y ..\include\SignalsmithStretch\SignalsmithStretch\LICENSE.txt .\Licenses\License.SignalsmithStretch.txt || goto error rem copy /y ..\..\include\stb_vorbis\stb_vorbis.c .\Licenses\License.stb_vorbis.txt || goto error rem copy /y ..\..\include\unrar\license.txt .\Licenses\License.UnRAR.txt || goto error copy /y ..\..\include\vorbis\COPYING .\Licenses\License.Vorbis.txt || goto error @@ -149,8 +148,7 @@ rem copy /y ..\..\include\r8brain\LICENSE .\Licenses\License.R8Brain.txt || goto error rem copy /y ..\..\include\rtaudio\README.md .\Licenses\License.RtAudio.txt || goto error rem copy /y ..\..\include\rtmidi\LICENSE .\Licenses\License.RtMidi.txt || goto error -rem copy /y ..\..\include\smbPitchShift\smbPitchShift.cpp .\Licenses\License.smbPitchShift.txt || goto error -rem copy /y ..\..\include\soundtouch\COPYING.TXT .\Licenses\License.SoundTouch.txt || goto error +rem copy /y ..\include\SignalsmithStretch\SignalsmithStretch\LICENSE.txt .\Licenses\License.SignalsmithStretch.txt || goto error rem copy /y ..\..\include\stb_vorbis\stb_vorbis.c .\Licenses\License.stb_vorbis.txt || goto error rem copy /y ..\..\include\unrar\license.txt .\Licenses\License.UnRAR.txt || goto error copy /y ..\..\include\vorbis\COPYING .\Licenses\License.Vorbis.txt || goto error Modified: trunk/OpenMPT/build/auto/update_package_template.cmd ============================================================================== --- trunk/OpenMPT/build/auto/update_package_template.cmd Wed Sep 18 17:14:07 2024 (r21607) +++ trunk/OpenMPT/build/auto/update_package_template.cmd Wed Sep 18 23:27:33 2024 (r21608) @@ -31,8 +31,7 @@ copy /y ..\include\rtaudio\README.md .\Licenses\License.RtAudio.txt || goto error copy /y ..\include\rtkit\rtkit.h .\Licenses\License.RealtimeKit.txt || goto error copy /y ..\include\rtmidi\LICENSE .\Licenses\License.RtMidi.txt || goto error -copy /y ..\include\smbPitchShift\smbPitchShift.cpp .\Licenses\License.smbPitchShift.txt || goto error -copy /y ..\include\soundtouch\COPYING.TXT .\Licenses\License.SoundTouch.txt || goto error +copy /y ..\include\SignalsmithStretch\SignalsmithStretch\LICENSE.txt .\Licenses\License.SignalsmithStretch.txt || goto error rem copy /y ..\include\stb_vorbis\stb_vorbis.c .\Licenses\License.stb_vorbis.txt || goto error copy /y ..\include\unrar\license.txt .\Licenses\License.UnRAR.txt || goto error copy /y ..\include\vorbis\COPYING .\Licenses\License.Vorbis.txt || goto error Modified: trunk/OpenMPT/build/auto/update_package_template_retro.cmd ============================================================================== --- trunk/OpenMPT/build/auto/update_package_template_retro.cmd Wed Sep 18 17:14:07 2024 (r21607) +++ trunk/OpenMPT/build/auto/update_package_template_retro.cmd Wed Sep 18 23:27:33 2024 (r21608) @@ -31,8 +31,7 @@ copy /y ..\include\rtaudio\README.md .\Licenses\License.RtAudio.txt || goto error copy /y ..\include\rtkit\rtkit.h .\Licenses\License.RealtimeKit.txt || goto error copy /y ..\include\rtmidi\LICENSE .\Licenses\License.RtMidi.txt || goto error -copy /y ..\include\smbPitchShift\smbPitchShift.cpp .\Licenses\License.smbPitchShift.txt || goto error -copy /y ..\include\soundtouch\COPYING.TXT .\Licenses\License.SoundTouch.txt || goto error +copy /y ..\include\SignalsmithStretch\SignalsmithStretch\LICENSE.txt Licenses\License.SignalsmithStretch.txt || goto error rem copy /y ..\include\stb_vorbis\stb_vorbis.c .\Licenses\License.stb_vorbis.txt || goto error copy /y ..\include\unrar\license.txt .\Licenses\License.UnRAR.txt || goto error copy /y ..\include\vorbis\COPYING .\Licenses\License.Vorbis.txt || goto error Added: trunk/OpenMPT/build/premake/ext-SignalsmithStretch.lua ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/OpenMPT/build/premake/ext-SignalsmithStretch.lua Wed Sep 18 23:27:33 2024 (r21608) @@ -0,0 +1,9 @@ + +function mpt_use_signalsmith_stretch () + -- header-only library + filter {} + includedirs { + "../../include/SignalsmithStretch", + } + filter {} +end Modified: trunk/OpenMPT/build/premake/mpt-OpenMPT.lua ============================================================================== --- trunk/OpenMPT/build/premake/mpt-OpenMPT.lua Wed Sep 18 17:14:07 2024 (r21607) +++ trunk/OpenMPT/build/premake/mpt-OpenMPT.lua Wed Sep 18 23:27:33 2024 (r21608) @@ -69,10 +69,8 @@ defines { "MPT_WITH_RTAUDIO" } mpt_use_rtmidi() defines { "MPT_WITH_RTMIDI" } - mpt_use_smbpitchshift() - defines { "MPT_WITH_SMBPITCHSHIFT" } - mpt_use_soundtouch() - defines { "MPT_WITH_SOUNDTOUCH" } + mpt_use_signalsmith_stretch() + defines { "MPT_WITH_SIGNALSMITH_STRETCH" } mpt_use_unrar() defines { "MPT_WITH_UNRAR" } mpt_use_vorbis() Modified: trunk/OpenMPT/build/premake/premake.lua ============================================================================== --- trunk/OpenMPT/build/premake/premake.lua Wed Sep 18 17:14:07 2024 (r21607) +++ trunk/OpenMPT/build/premake/premake.lua Wed Sep 18 23:27:33 2024 (r21608) @@ -314,8 +314,7 @@ dofile "../../build/premake/ext-r8brain.lua" dofile "../../build/premake/ext-rtaudio.lua" dofile "../../build/premake/ext-rtmidi.lua" - dofile "../../build/premake/ext-smbPitchShift.lua" - dofile "../../build/premake/ext-soundtouch.lua" + dofile "../../build/premake/ext-SignalsmithStretch.lua" dofile "../../build/premake/ext-UnRAR.lua" dofile "../../build/premake/ext-vorbis.lua" dofile "../../build/premake/ext-zlib.lua" @@ -350,8 +349,7 @@ dofile "../../build/premake/ext-r8brain.lua" dofile "../../build/premake/ext-rtaudio.lua" dofile "../../build/premake/ext-rtmidi.lua" - dofile "../../build/premake/ext-smbPitchShift.lua" - dofile "../../build/premake/ext-soundtouch.lua" + dofile "../../build/premake/ext-SignalsmithStretch.lua" dofile "../../build/premake/ext-UnRAR.lua" dofile "../../build/premake/ext-vorbis.lua" dofile "../../build/premake/ext-zlib.lua" @@ -386,8 +384,7 @@ dofile "../../build/premake/ext-r8brain.lua" dofile "../../build/premake/ext-rtaudio.lua" dofile "../../build/premake/ext-rtmidi.lua" - dofile "../../build/premake/ext-smbPitchShift.lua" - dofile "../../build/premake/ext-soundtouch.lua" + dofile "../../build/premake/ext-SignalsmithStretch.lua" dofile "../../build/premake/ext-UnRAR.lua" dofile "../../build/premake/ext-vorbis.lua" dofile "../../build/premake/ext-zlib.lua" Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.sln ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.sln Wed Sep 18 17:14:07 2024 (r21607) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.sln Wed Sep 18 23:27:33 2024 (r21608) @@ -43,10 +43,6 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rtmidi", "ext\rtmidi.vcxproj", "{05BBD03D-0985-4D76-8DDD-534DA631C3A8}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "smbPitchShift", "ext\smbPitchShift.vcxproj", "{89AF16DD-32CC-4A7E-B219-5F117D761F9F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "soundtouch", "ext\soundtouch.vcxproj", "{F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "updatesigntool", "updatesigntool.vcxproj", "{89B3630F-5728-4902-8258-D4DBC532E185}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vorbis", "ext\vorbis.vcxproj", "{B544DCB7-16E5-41BC-B51B-7EAD8CFDFA05}" @@ -573,54 +569,6 @@ {05BBD03D-0985-4D76-8DDD-534DA631C3A8}.Release|Win32.Build.0 = Release|Win32 {05BBD03D-0985-4D76-8DDD-534DA631C3A8}.Release|x64.ActiveCfg = Release|x64 {05BBD03D-0985-4D76-8DDD-534DA631C3A8}.Release|x64.Build.0 = Release|x64 - {89AF16DD-32CC-4A7E-B219-5F117D761F9F}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32 - {89AF16DD-32CC-4A7E-B219-5F117D761F9F}.CheckedShared|Win32.Build.0 = CheckedShared|Win32 - {89AF16DD-32CC-4A7E-B219-5F117D761F9F}.CheckedShared|x64.ActiveCfg = CheckedShared|x64 - {89AF16DD-32CC-4A7E-B219-5F117D761F9F}.CheckedShared|x64.Build.0 = CheckedShared|x64 - {89AF16DD-32CC-4A7E-B219-5F117D761F9F}.Checked|Win32.ActiveCfg = Checked|Win32 - {89AF16DD-32CC-4A7E-B219-5F117D761F9F}.Checked|Win32.Build.0 = Checked|Win32 - {89AF16DD-32CC-4A7E-B219-5F117D761F9F}.Checked|x64.ActiveCfg = Checked|x64 - {89AF16DD-32CC-4A7E-B219-5F117D761F9F}.Checked|x64.Build.0 = Checked|x64 - {89AF16DD-32CC-4A7E-B219-5F117D761F9F}.DebugShared|Win32.ActiveCfg = DebugShared|Win32 - {89AF16DD-32CC-4A7E-B219-5F117D761F9F}.DebugShared|Win32.Build.0 = DebugShared|Win32 - {89AF16DD-32CC-4A7E-B219-5F117D761F9F}.DebugShared|x64.ActiveCfg = DebugShared|x64 - {89AF16DD-32CC-4A7E-B219-5F117D761F9F}.DebugShared|x64.Build.0 = DebugShared|x64 - {89AF16DD-32CC-4A7E-B219-5F117D761F9F}.Debug|Win32.ActiveCfg = Debug|Win32 - {89AF16DD-32CC-4A7E-B219-5F117D761F9F}.Debug|Win32.Build.0 = Debug|Win32 - {89AF16DD-32CC-4A7E-B219-5F117D761F9F}.Debug|x64.ActiveCfg = Debug|x64 - {89AF16DD-32CC-4A7E-B219-5F117D761F9F}.Debug|x64.Build.0 = Debug|x64 - {89AF16DD-32CC-4A7E-B219-5F117D761F9F}.ReleaseShared|Win32.ActiveCfg = ReleaseShared|Win32 - {89AF16DD-32CC-4A7E-B219-5F117D761F9F}.ReleaseShared|Win32.Build.0 = ReleaseShared|Win32 - {89AF16DD-32CC-4A7E-B219-5F117D761F9F}.ReleaseShared|x64.ActiveCfg = ReleaseShared|x64 - {89AF16DD-32CC-4A7E-B219-5F117D761F9F}.ReleaseShared|x64.Build.0 = ReleaseShared|x64 - {89AF16DD-32CC-4A7E-B219-5F117D761F9F}.Release|Win32.ActiveCfg = Release|Win32 - {89AF16DD-32CC-4A7E-B219-5F117D761F9F}.Release|Win32.Build.0 = Release|Win32 - {89AF16DD-32CC-4A7E-B219-5F117D761F9F}.Release|x64.ActiveCfg = Release|x64 - {89AF16DD-32CC-4A7E-B219-5F117D761F9F}.Release|x64.Build.0 = Release|x64 - {F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32 - {F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.CheckedShared|Win32.Build.0 = CheckedShared|Win32 - {F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.CheckedShared|x64.ActiveCfg = CheckedShared|x64 - {F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.CheckedShared|x64.Build.0 = CheckedShared|x64 - {F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.Checked|Win32.ActiveCfg = Checked|Win32 - {F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.Checked|Win32.Build.0 = Checked|Win32 - {F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.Checked|x64.ActiveCfg = Checked|x64 - {F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.Checked|x64.Build.0 = Checked|x64 - {F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.DebugShared|Win32.ActiveCfg = DebugShared|Win32 - {F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.DebugShared|Win32.Build.0 = DebugShared|Win32 - {F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.DebugShared|x64.ActiveCfg = DebugShared|x64 - {F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.DebugShared|x64.Build.0 = DebugShared|x64 - {F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.Debug|Win32.ActiveCfg = Debug|Win32 - {F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.Debug|Win32.Build.0 = Debug|Win32 - {F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.Debug|x64.ActiveCfg = Debug|x64 - {F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.Debug|x64.Build.0 = Debug|x64 - {F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.ReleaseShared|Win32.ActiveCfg = ReleaseShared|Win32 - {F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.ReleaseShared|Win32.Build.0 = ReleaseShared|Win32 - {F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.ReleaseShared|x64.ActiveCfg = ReleaseShared|x64 - {F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.ReleaseShared|x64.Build.0 = ReleaseShared|x64 - {F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.Release|Win32.ActiveCfg = Release|Win32 - {F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.Release|Win32.Build.0 = Release|Win32 - {F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.Release|x64.ActiveCfg = Release|x64 - {F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.Release|x64.Build.0 = Release|x64 {89B3630F-5728-4902-8258-D4DBC532E185}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32 {89B3630F-5728-4902-8258-D4DBC532E185}.CheckedShared|Win32.Build.0 = CheckedShared|Win32 {89B3630F-5728-4902-8258-D4DBC532E185}.CheckedShared|x64.ActiveCfg = CheckedShared|x64 Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj Wed Sep 18 17:14:07 2024 (r21607) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj Wed Sep 18 23:27:33 2024 (r21608) @@ -313,8 +313,8 @@ <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;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(Prepr ocessorDefinitions)</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;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <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;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;%(PreprocessorDefinit ions)</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> <Optimization>Disabled</Optimization> @@ -326,8 +326,8 @@ <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;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARC HNAME=\"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;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <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;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> + <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> <SubSystem>Windows</SubSystem> @@ -348,8 +348,8 @@ <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;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(Prepr ocessorDefinitions)</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;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <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;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;%(PreprocessorDefinit ions)</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> <Optimization>Disabled</Optimization> @@ -360,8 +360,8 @@ <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;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARC HNAME=\"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;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <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;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> + <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> <SubSystem>Windows</SubSystem> @@ -382,8 +382,8 @@ <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;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefiniti ons)</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;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <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;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;%(PreprocessorDefinitions)</Preproce ssorDefinitions> + <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> <Optimization>MaxSpeed</Optimization> @@ -398,8 +398,8 @@ <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;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"x86\";% (PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <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;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\";%(PreprocessorD efinitions)</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> <SubSystem>Windows</SubSystem> @@ -421,8 +421,8 @@ <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;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefiniti ons)</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;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <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;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;%(PreprocessorDefinitions)</Preproce ssorDefinitions> + <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> <Optimization>MaxSpeed</Optimization> @@ -436,8 +436,8 @@ <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;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"amd64\" ;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <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;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\";%(Preprocesso rDefinitions)</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> <SubSystem>Windows</SubSystem> @@ -459,8 +459,8 @@ <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;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(Pre processorDefinitions)</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;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <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;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;%(PreprocessorDefin itions)</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> <Optimization>Full</Optimization> @@ -476,8 +476,8 @@ <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;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_A RCHNAME=\"x86\";%(PreprocessorDefinitio... [truncated message content] |
