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
(72) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <sv...@op...> - 2025-02-16 07:42:34
|
Author: manx Date: Sun Feb 16 08:42:21 2025 New Revision: 22946 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22946 Log: Merged revision(s) 22942 from trunk/OpenMPT: [Fix] build: CI: GitHub: CPA: NetBSD: Fix subversion install. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/.github/workflows/NetBSD-Autotools.yml branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml Modified: branches/OpenMPT-1.31/.github/workflows/NetBSD-Autotools.yml ============================================================================== --- branches/OpenMPT-1.31/.github/workflows/NetBSD-Autotools.yml Sun Feb 16 08:40:28 2025 (r22945) +++ branches/OpenMPT-1.31/.github/workflows/NetBSD-Autotools.yml Sun Feb 16 08:42:21 2025 (r22946) @@ -47,7 +47,7 @@ run: | sudo pkgin -y update sudo pkgin -y full-upgrade - sudo pkgin -y install subversion-base p5-subversion py311-subversion ruby32-subversion git p5-XML-XPath mawk + sudo pkgin -y install subversion-base p5-subversion py-subversion ruby-subversion git p5-XML-XPath mawk sudo pkgin -y install gmake pkgconf sudo pkgin -y install mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio SDL2 sudo pkgin -y install autoconf autoconf-archive automake libtool libltdl Modified: branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml ============================================================================== --- branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml Sun Feb 16 08:40:28 2025 (r22945) +++ branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml Sun Feb 16 08:42:21 2025 (r22946) @@ -51,7 +51,7 @@ run: | sudo pkgin -y update sudo pkgin -y full-upgrade - sudo pkgin -y install subversion-base p5-subversion py311-subversion ruby32-subversion git p5-XML-XPath mawk + sudo pkgin -y install subversion-base p5-subversion py-subversion ruby-subversion git p5-XML-XPath mawk sudo pkgin -y install gmake pkgconf sudo pkgin -y install mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio SDL2 sudo pkgin -y install autoconf autoconf-archive automake libtool libltdl |
|
From: <sv...@op...> - 2025-02-16 07:40:35
|
Author: manx Date: Sun Feb 16 08:40:28 2025 New Revision: 22945 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22945 Log: [Ref] PlaybackTest: Silence GCC -Wconversion warnings. Modified: trunk/OpenMPT/soundlib/PlaybackTest.cpp Modified: trunk/OpenMPT/soundlib/PlaybackTest.cpp ============================================================================== --- trunk/OpenMPT/soundlib/PlaybackTest.cpp Sun Feb 16 08:31:59 2025 (r22944) +++ trunk/OpenMPT/soundlib/PlaybackTest.cpp Sun Feb 16 08:40:28 2025 (r22945) @@ -477,8 +477,8 @@ << channel.leftVol << "\t" << channel.rightVol << "\t" << ((channel.flags & TestDataChannel::kSurround) ? "yes" : "no") << "\t" - << (channel.increment * positionPrecision * header.mixingFreq) << "\t" - << ((channel.flags & TestDataChannel::kOPL) ? "OPL" : mpt::afmt::fmt(channel.position * positionPrecision, floatFormat)) << "\t" + << (static_cast<double>(channel.increment) * positionPrecision * header.mixingFreq) << "\t" + << ((channel.flags & TestDataChannel::kOPL) ? "OPL" : mpt::afmt::fmt(static_cast<double>(channel.position) * positionPrecision, floatFormat)) << "\t" << filterType << "\t" << channel.filterA0 * filterPrecision << "\t" << channel.filterB0 * filterPrecision << "\t" @@ -607,9 +607,9 @@ MPT_LOG_TEST_WITH_ROW_CHN("Left volume", l, r); if(const auto l = lChn.rightVol * lChannelVolumeScale, r = rChn.rightVol * rChannelVolumeScale; !FuzzyEquals(l, r, epsilon)) MPT_LOG_TEST_WITH_ROW_CHN("Right volume", l, r); - if(const auto l = lChn.increment * lPositionPrecision * header.mixingFreq, r = rChn.increment * rPositionPrecision * other.header.mixingFreq; !FuzzyEquals(l, r, epsilon)) + if(const auto l = static_cast<double>(lChn.increment) * lPositionPrecision * header.mixingFreq, r = static_cast<double>(rChn.increment) * rPositionPrecision * other.header.mixingFreq; !FuzzyEquals(l, r, epsilon)) MPT_LOG_TEST_WITH_ROW_CHN("Speed", l, r); - if(const auto l = lChn.position * lPositionPrecision, r = rChn.position * rPositionPrecision; !FuzzyEquals(l, r, epsilon)) + if(const auto l = static_cast<double>(lChn.position) * lPositionPrecision, r = static_cast<double>(rChn.position) * rPositionPrecision; !FuzzyEquals(l, r, epsilon)) MPT_LOG_TEST_WITH_ROW_CHN("Position", l, r); if(const auto l = lChn.filterA0 * lFilterPrecision, r = rChn.filterA0 * rFilterPrecision; !FuzzyEquals(l, r, epsilon)) MPT_LOG_TEST_WITH_ROW_CHN("Filter A0", l, r); @@ -728,7 +728,7 @@ auto &channel = m_PlayState.Chn[chn]; auto &channelData = row.channels.emplace_back(); - channelData.channel = channel.nMasterChn ? -static_cast<int>(channel.nMasterChn) : (chn + 1); + channelData.channel = static_cast<int16>(channel.nMasterChn ? -static_cast<int>(channel.nMasterChn) : (chn + 1)); channelData.nnaAge = channel.nnaGeneration; if(channel.dwFlags[CHN_SURROUND]) channelData.flags |= TestDataChannel::kSurround; |
|
From: <sv...@op...> - 2025-02-16 07:32:12
|
Author: manx Date: Sun Feb 16 08:31:59 2025 New Revision: 22944 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22944 Log: [Fix] build: Makefile: OpenBSD: Try to fix missing libc and libc++. Modified: trunk/OpenMPT/Makefile trunk/OpenMPT/build/make/config-defaults.mk Modified: trunk/OpenMPT/Makefile ============================================================================== --- trunk/OpenMPT/Makefile Sun Feb 16 08:31:24 2025 (r22943) +++ trunk/OpenMPT/Makefile Sun Feb 16 08:31:59 2025 (r22944) @@ -1329,11 +1329,11 @@ CPPCHECK_FLAGS += $(CPPFLAGS) CPPFLAGS += $(CPPFLAGS_ZLIB) $(CPPFLAGS_MPG123) $(CPPFLAGS_OGG) $(CPPFLAGS_VORBIS) $(CPPFLAGS_VORBISFILE) LDFLAGS += $(LDFLAGS_ZLIB) $(LDFLAGS_MPG123) $(LDFLAGS_OGG) $(LDFLAGS_VORBIS) $(LDFLAGS_VORBISFILE) -LDLIBS += $(LDLIBS_ZLIB) $(LDLIBS_MPG123) $(LDLIBS_OGG) $(LDLIBS_VORBIS) $(LDLIBS_VORBISFILE) +LDLIBS += $(LDLIBS_ZLIB) $(LDLIBS_MPG123) $(LDLIBS_OGG) $(LDLIBS_VORBIS) $(LDLIBS_VORBISFILE) $(LDLIBS_PLATFORM) CPPFLAGS_OPENMPT123 += $(CPPFLAGS_SDL2) $(CPPFLAGS_PORTAUDIO) $(CPPFLAGS_PULSEAUDIO) $(CPPFLAGS_FLAC) $(CPPFLAGS_SNDFILE) $(CPPFLAGS_ALLEGRO42) LDFLAGS_OPENMPT123 += $(LDFLAGS_SDL2) $(LDFLAGS_PORTAUDIO) $(LDFLAGS_PULSEAUDIO) $(LDFLAGS_FLAC) $(LDFLAGS_SNDFILE) $(LDFLAGS_ALLEGRO42) -LDLIBS_OPENMPT123 += $(LDLIBS_SDL2) $(LDLIBS_PORTAUDIO) $(LDLIBS_PULSEAUDIO) $(LDLIBS_FLAC) $(LDLIBS_SNDFILE) $(LDLIBS_ALLEGRO42) +LDLIBS_OPENMPT123 += $(LDLIBS_SDL2) $(LDLIBS_PORTAUDIO) $(LDLIBS_PULSEAUDIO) $(LDLIBS_FLAC) $(LDLIBS_SNDFILE) $(LDLIBS_ALLEGRO42) $(LDLIBS_PLATFORM) %: %$(FLAVOUR_O).o Modified: trunk/OpenMPT/build/make/config-defaults.mk ============================================================================== --- trunk/OpenMPT/build/make/config-defaults.mk Sun Feb 16 08:31:24 2025 (r22943) +++ trunk/OpenMPT/build/make/config-defaults.mk Sun Feb 16 08:31:59 2025 (r22944) @@ -49,6 +49,7 @@ NO_PORTAUDIOCPP?=1 NO_PULSEAUDIO?=1 +LDLIBS_PLATFORM=-lc++ -lc include build/make/config-clang.mk MPT_COMPILER_NOALLOCAH=1 |
|
From: <sv...@op...> - 2025-02-16 07:31:31
|
Author: manx Date: Sun Feb 16 08:31:24 2025 New Revision: 22943 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22943 Log: [Fix] build: Makefile: macOS: Linker does not support --no-undefined. Modified: trunk/OpenMPT/build/make/config-macos.mk Modified: trunk/OpenMPT/build/make/config-macos.mk ============================================================================== --- trunk/OpenMPT/build/make/config-macos.mk Sun Feb 16 08:30:00 2025 (r22942) +++ trunk/OpenMPT/build/make/config-macos.mk Sun Feb 16 08:31:24 2025 (r22943) @@ -1,4 +1,5 @@ +NO_NO_UNDEFINED_LINKER_FLAG=1 NO_PULSEAUDIO?=1 include build/make/config-clang.mk # Mac OS X overrides |
|
From: <sv...@op...> - 2025-02-16 07:30:15
|
Author: manx Date: Sun Feb 16 08:30:00 2025 New Revision: 22942 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22942 Log: [Fix] build: CI: GitHub: CPA: NetBSD: Fix subversion install. Modified: trunk/OpenMPT/.github/workflows/NetBSD-Autotools.yml trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml Modified: trunk/OpenMPT/.github/workflows/NetBSD-Autotools.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/NetBSD-Autotools.yml Sat Feb 15 23:01:10 2025 (r22941) +++ trunk/OpenMPT/.github/workflows/NetBSD-Autotools.yml Sun Feb 16 08:30:00 2025 (r22942) @@ -49,7 +49,7 @@ run: | sudo pkgin -y update sudo pkgin -y full-upgrade - sudo pkgin -y install subversion-base p5-subversion py311-subversion ruby32-subversion git p5-XML-XPath mawk + sudo pkgin -y install subversion-base p5-subversion py-subversion ruby-subversion git p5-XML-XPath mawk sudo pkgin -y install gmake pkgconf sudo pkgin -y install mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio SDL2 sudo pkgin -y install autoconf autoconf-archive automake libtool libltdl Modified: trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml Sat Feb 15 23:01:10 2025 (r22941) +++ trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml Sun Feb 16 08:30:00 2025 (r22942) @@ -53,7 +53,7 @@ run: | sudo pkgin -y update sudo pkgin -y full-upgrade - sudo pkgin -y install subversion-base p5-subversion py311-subversion ruby32-subversion git p5-XML-XPath mawk + sudo pkgin -y install subversion-base p5-subversion py-subversion ruby-subversion git p5-XML-XPath mawk sudo pkgin -y install gmake pkgconf sudo pkgin -y install mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio SDL2 sudo pkgin -y install autoconf autoconf-archive automake libtool libltdl |
|
From: <sv...@op...> - 2025-02-15 22:01:23
|
Author: manx Date: Sat Feb 15 23:01:10 2025 New Revision: 22941 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22941 Log: [Fix] build: Makefile: Emscripten: Fix build. Broken since r22884. Modified: trunk/OpenMPT/build/make/config-emscripten.mk trunk/OpenMPT/build/make/warnings-clang.mk trunk/OpenMPT/build/make/warnings-gcc.mk Modified: trunk/OpenMPT/build/make/config-emscripten.mk ============================================================================== --- trunk/OpenMPT/build/make/config-emscripten.mk Sat Feb 15 22:46:20 2025 (r22940) +++ trunk/OpenMPT/build/make/config-emscripten.mk Sat Feb 15 23:01:10 2025 (r22941) @@ -144,6 +144,8 @@ LDFLAGS += -s DISABLE_EXCEPTION_CATCHING=0 -s ERROR_ON_UNDEFINED_SYMBOLS=1 -s ERROR_ON_MISSING_LIBRARIES=1 -s EXPORT_NAME="'libopenmpt'" SO_LDFLAGS += -s EXPORTED_FUNCTIONS="['_malloc','_free']" +NO_NO_UNDEFINED_LINKER_FLAG=1 + include build/make/warnings-clang.mk REQUIRES_RUNPREFIX=1 Modified: trunk/OpenMPT/build/make/warnings-clang.mk ============================================================================== --- trunk/OpenMPT/build/make/warnings-clang.mk Sat Feb 15 22:46:20 2025 (r22940) +++ trunk/OpenMPT/build/make/warnings-clang.mk Sat Feb 15 23:01:10 2025 (r22941) @@ -15,7 +15,9 @@ #CXXFLAGS_WARNINGS += -Wconversion #CXXFLAGS_WARNINGS += -Weverything -Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-c++98-c++11-c++14-compat -Wno-padded -Wno-weak-vtables -Wno-sign-conversion -Wno-shadow-field-in-constructor -Wno-conversion -Wno-switch-enum -Wno-old-style-cast +ifneq ($(NO_NO_UNDEFINED_LINKER_FLAG),1) LDFLAGS_WARNINGS += -Wl,--no-undefined +endif ifeq ($(MODERN),1) CXXFLAGS_WARNINGS += Modified: trunk/OpenMPT/build/make/warnings-gcc.mk ============================================================================== --- trunk/OpenMPT/build/make/warnings-gcc.mk Sat Feb 15 22:46:20 2025 (r22940) +++ trunk/OpenMPT/build/make/warnings-gcc.mk Sat Feb 15 23:01:10 2025 (r22941) @@ -4,7 +4,9 @@ CXXFLAGS_WARNINGS += -Wno-psabi +ifneq ($(NO_NO_UNDEFINED_LINKER_FLAG),1) LDFLAGS_WARNINGS += -Wl,--no-undefined +endif ifeq ($(MODERN),1) # GCC >= 12 |
|
From: <sv...@op...> - 2025-02-15 21:46:27
|
Author: manx Date: Sat Feb 15 22:46:20 2025 New Revision: 22940 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22940 Log: Merged revision(s) 22939 from trunk/OpenMPT: [Fix] build: CI: GitHub: CPA: NetBSD: Work-around <https://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=58432> again. NetBSD broke it again. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/.github/workflows/NetBSD-Autotools.yml branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml Modified: branches/OpenMPT-1.31/.github/workflows/NetBSD-Autotools.yml ============================================================================== --- branches/OpenMPT-1.31/.github/workflows/NetBSD-Autotools.yml Sat Feb 15 22:45:49 2025 (r22939) +++ branches/OpenMPT-1.31/.github/workflows/NetBSD-Autotools.yml Sat Feb 15 22:46:20 2025 (r22940) @@ -47,7 +47,7 @@ run: | sudo pkgin -y update sudo pkgin -y full-upgrade - sudo pkgin -y install subversion git p5-XML-XPath mawk + sudo pkgin -y install subversion-base p5-subversion py311-subversion ruby32-subversion git p5-XML-XPath mawk sudo pkgin -y install gmake pkgconf sudo pkgin -y install mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio SDL2 sudo pkgin -y install autoconf autoconf-archive automake libtool libltdl Modified: branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml ============================================================================== --- branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml Sat Feb 15 22:45:49 2025 (r22939) +++ branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml Sat Feb 15 22:46:20 2025 (r22940) @@ -51,7 +51,7 @@ run: | sudo pkgin -y update sudo pkgin -y full-upgrade - sudo pkgin -y install subversion git p5-XML-XPath mawk + sudo pkgin -y install subversion-base p5-subversion py311-subversion ruby32-subversion git p5-XML-XPath mawk sudo pkgin -y install gmake pkgconf sudo pkgin -y install mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio SDL2 sudo pkgin -y install autoconf autoconf-archive automake libtool libltdl |
|
From: <sv...@op...> - 2025-02-15 21:46:05
|
Author: manx Date: Sat Feb 15 22:45:49 2025 New Revision: 22939 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22939 Log: [Fix] build: CI: GitHub: CPA: NetBSD: Work-around <https://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=58432> again. NetBSD broke it again. Modified: trunk/OpenMPT/.github/workflows/NetBSD-Autotools.yml trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml Modified: trunk/OpenMPT/.github/workflows/NetBSD-Autotools.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/NetBSD-Autotools.yml Sat Feb 15 20:58:54 2025 (r22938) +++ trunk/OpenMPT/.github/workflows/NetBSD-Autotools.yml Sat Feb 15 22:45:49 2025 (r22939) @@ -49,7 +49,7 @@ run: | sudo pkgin -y update sudo pkgin -y full-upgrade - sudo pkgin -y install subversion git p5-XML-XPath mawk + sudo pkgin -y install subversion-base p5-subversion py311-subversion ruby32-subversion git p5-XML-XPath mawk sudo pkgin -y install gmake pkgconf sudo pkgin -y install mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio SDL2 sudo pkgin -y install autoconf autoconf-archive automake libtool libltdl Modified: trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml Sat Feb 15 20:58:54 2025 (r22938) +++ trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml Sat Feb 15 22:45:49 2025 (r22939) @@ -53,7 +53,7 @@ run: | sudo pkgin -y update sudo pkgin -y full-upgrade - sudo pkgin -y install subversion git p5-XML-XPath mawk + sudo pkgin -y install subversion-base p5-subversion py311-subversion ruby32-subversion git p5-XML-XPath mawk sudo pkgin -y install gmake pkgconf sudo pkgin -y install mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio SDL2 sudo pkgin -y install autoconf autoconf-archive automake libtool libltdl |
|
From: <sv...@op...> - 2025-02-15 19:59:06
|
Author: manx Date: Sat Feb 15 20:58:54 2025 New Revision: 22938 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22938 Log: [Fix] Work-around <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105329> / <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105651>. Modified: trunk/OpenMPT/soundlib/PlaybackTest.cpp Modified: trunk/OpenMPT/soundlib/PlaybackTest.cpp ============================================================================== --- trunk/OpenMPT/soundlib/PlaybackTest.cpp Sat Feb 15 20:10:42 2025 (r22937) +++ trunk/OpenMPT/soundlib/PlaybackTest.cpp Sat Feb 15 20:58:54 2025 (r22938) @@ -226,6 +226,14 @@ return dump; } +#if MPT_GCC_AT_LEAST(12, 0, 0) && MPT_GCC_BEFORE(13, 1, 0) +// Work-around <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105329> / +// <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105651>. +#pragma GCC push_options +#if defined(__OPTIMIZE__) +#pragma GCC optimize("O1") +#endif +#endif static std::string Format(const OPLData &data) { FileReader file(mpt::as_span(data)); @@ -264,6 +272,10 @@ } return result; } +#if MPT_GCC_AT_LEAST(12, 0, 0) && MPT_GCC_BEFORE(13, 1, 0) +#pragma GCC diagnostic pop +#pragma GCC pop_options +#endif protected: void Port(CHANNELINDEX c, OPL::Register reg, OPL::Value value) override |
|
From: <sv...@op...> - 2025-02-15 19:10:52
|
Author: manx Date: Sat Feb 15 20:10:42 2025 New Revision: 22937 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22937 Log: [Ref] Move PlaybackTest from test/ into soundlib/ in order to avoid new directory-interdependencies within class CSoundFile. [Ref] build: Include PlaybackTest in libopenmpt-test build. Added: trunk/OpenMPT/soundlib/PlaybackTest.cpp - copied, changed from r22936, trunk/OpenMPT/test/PlaybackTest.cpp trunk/OpenMPT/soundlib/PlaybackTest.h - copied, changed from r22936, trunk/OpenMPT/test/PlaybackTest.h Deleted: trunk/OpenMPT/test/PlaybackTest.cpp trunk/OpenMPT/test/PlaybackTest.h Modified: trunk/OpenMPT/build/android_ndk/Android.mk trunk/OpenMPT/build/autotools/Makefile.am trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/OpenMPT-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/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.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/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.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/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.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/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2022win10/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win10/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.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/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2022win10clang/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win10clang/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2022win10clang/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2022win10uwp/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2022win10uwp/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2022win10uwp/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win10uwp/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2022win10uwp/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2022win10uwp/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.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/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2022win7/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2022win7/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win7/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2022win7/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2022win7/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2022win8/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win8/OpenMPT-ANSI.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/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2022win8/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2022win8/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win8/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2022win8/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2022win8/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2022win81/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win81/OpenMPT-ANSI.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/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2022win81/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2022win81/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win81/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2022win81/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2022win81/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/xcode-ios/libopenmpt.xcodeproj/project.pbxproj trunk/OpenMPT/build/xcode-macosx/libopenmpt.xcodeproj/project.pbxproj trunk/OpenMPT/mptrack/MainFrm.cpp Modified: trunk/OpenMPT/build/android_ndk/Android.mk ============================================================================== --- trunk/OpenMPT/build/android_ndk/Android.mk Sat Feb 15 19:49:30 2025 (r22936) +++ trunk/OpenMPT/build/android_ndk/Android.mk Sat Feb 15 20:10:42 2025 (r22937) @@ -225,6 +225,7 @@ soundlib/Paula.cpp \ soundlib/patternContainer.cpp \ soundlib/pattern.cpp \ + soundlib/PlaybackTest.cpp \ soundlib/PlayState.cpp \ soundlib/RowVisitor.cpp \ soundlib/S3MTools.cpp \ Modified: trunk/OpenMPT/build/autotools/Makefile.am ============================================================================== --- trunk/OpenMPT/build/autotools/Makefile.am Sat Feb 15 19:49:30 2025 (r22936) +++ trunk/OpenMPT/build/autotools/Makefile.am Sat Feb 15 20:10:42 2025 (r22937) @@ -490,6 +490,8 @@ MPT_FILES_SOUNDLIB += soundlib/patternContainer.h MPT_FILES_SOUNDLIB += soundlib/pattern.cpp MPT_FILES_SOUNDLIB += soundlib/pattern.h +MPT_FILES_SOUNDLIB += soundlib/PlaybackTest.cpp +MPT_FILES_SOUNDLIB += soundlib/PlaybackTest.h MPT_FILES_SOUNDLIB += soundlib/PlayState.cpp MPT_FILES_SOUNDLIB += soundlib/PlayState.h MPT_FILES_SOUNDLIB += soundlib/Resampler.h Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj Sat Feb 15 19:49:30 2025 (r22936) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj Sat Feb 15 20:10:42 2025 (r22937) @@ -985,6 +985,7 @@ <ClInclude Include="..\..\soundlib\OggStream.h" /> <ClInclude Include="..\..\soundlib\Paula.h" /> <ClInclude Include="..\..\soundlib\PlayState.h" /> + <ClInclude Include="..\..\soundlib\PlaybackTest.h" /> <ClInclude Include="..\..\soundlib\Resampler.h" /> <ClInclude Include="..\..\soundlib\RowVisitor.h" /> <ClInclude Include="..\..\soundlib\S3MTools.h" /> @@ -1250,7 +1251,6 @@ <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderRAW.hpp" /> <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderVorbis.hpp" /> <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.hpp" /> - <ClInclude Include="..\..\test\PlaybackTest.h" /> <ClInclude Include="..\..\test\TestTools.h" /> <ClInclude Include="..\..\test\TestToolsLib.h" /> <ClInclude Include="..\..\test\TestToolsTracker.h" /> @@ -1477,6 +1477,7 @@ <ClCompile Include="..\..\soundlib\OggStream.cpp" /> <ClCompile Include="..\..\soundlib\Paula.cpp" /> <ClCompile Include="..\..\soundlib\PlayState.cpp" /> + <ClCompile Include="..\..\soundlib\PlaybackTest.cpp" /> <ClCompile Include="..\..\soundlib\RowVisitor.cpp" /> <ClCompile Include="..\..\soundlib\S3MTools.cpp" /> <ClCompile Include="..\..\soundlib\SampleFormatBRR.cpp" /> @@ -1545,7 +1546,6 @@ <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderRAW.cpp" /> <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderVorbis.cpp" /> <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.cpp" /> - <ClCompile Include="..\..\test\PlaybackTest.cpp" /> <ClCompile Include="..\..\test\TestToolsLib.cpp" /> <ClCompile Include="..\..\test\mpt_tests_base.cpp" /> <ClCompile Include="..\..\test\mpt_tests_binary.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters Sat Feb 15 19:49:30 2025 (r22936) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters Sat Feb 15 20:10:42 2025 (r22937) @@ -957,6 +957,9 @@ <ClInclude Include="..\..\soundlib\PlayState.h"> <Filter>soundlib</Filter> </ClInclude> + <ClInclude Include="..\..\soundlib\PlaybackTest.h"> + <Filter>soundlib</Filter> + </ClInclude> <ClInclude Include="..\..\soundlib\Resampler.h"> <Filter>soundlib</Filter> </ClInclude> @@ -1752,9 +1755,6 @@ <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.hpp"> <Filter>src\openmpt\streamencoder</Filter> </ClInclude> - <ClInclude Include="..\..\test\PlaybackTest.h"> - <Filter>test</Filter> - </ClInclude> <ClInclude Include="..\..\test\TestTools.h"> <Filter>test</Filter> </ClInclude> @@ -2429,6 +2429,9 @@ <ClCompile Include="..\..\soundlib\PlayState.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\PlaybackTest.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\RowVisitor.cpp"> <Filter>soundlib</Filter> </ClCompile> @@ -2633,9 +2636,6 @@ <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.cpp"> <Filter>src\openmpt\streamencoder</Filter> </ClCompile> - <ClCompile Include="..\..\test\PlaybackTest.cpp"> - <Filter>test</Filter> - </ClCompile> <ClCompile Include="..\..\test\TestToolsLib.cpp"> <Filter>test</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj Sat Feb 15 19:49:30 2025 (r22936) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj Sat Feb 15 20:10:42 2025 (r22937) @@ -985,6 +985,7 @@ <ClInclude Include="..\..\soundlib\OggStream.h" /> <ClInclude Include="..\..\soundlib\Paula.h" /> <ClInclude Include="..\..\soundlib\PlayState.h" /> + <ClInclude Include="..\..\soundlib\PlaybackTest.h" /> <ClInclude Include="..\..\soundlib\Resampler.h" /> <ClInclude Include="..\..\soundlib\RowVisitor.h" /> <ClInclude Include="..\..\soundlib\S3MTools.h" /> @@ -1250,7 +1251,6 @@ <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderRAW.hpp" /> <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderVorbis.hpp" /> <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.hpp" /> - <ClInclude Include="..\..\test\PlaybackTest.h" /> <ClInclude Include="..\..\test\TestTools.h" /> <ClInclude Include="..\..\test\TestToolsLib.h" /> <ClInclude Include="..\..\test\TestToolsTracker.h" /> @@ -1477,6 +1477,7 @@ <ClCompile Include="..\..\soundlib\OggStream.cpp" /> <ClCompile Include="..\..\soundlib\Paula.cpp" /> <ClCompile Include="..\..\soundlib\PlayState.cpp" /> + <ClCompile Include="..\..\soundlib\PlaybackTest.cpp" /> <ClCompile Include="..\..\soundlib\RowVisitor.cpp" /> <ClCompile Include="..\..\soundlib\S3MTools.cpp" /> <ClCompile Include="..\..\soundlib\SampleFormatBRR.cpp" /> @@ -1545,7 +1546,6 @@ <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderRAW.cpp" /> <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderVorbis.cpp" /> <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.cpp" /> - <ClCompile Include="..\..\test\PlaybackTest.cpp" /> <ClCompile Include="..\..\test\TestToolsLib.cpp" /> <ClCompile Include="..\..\test\mpt_tests_base.cpp" /> <ClCompile Include="..\..\test\mpt_tests_binary.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters Sat Feb 15 19:49:30 2025 (r22936) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters Sat Feb 15 20:10:42 2025 (r22937) @@ -957,6 +957,9 @@ <ClInclude Include="..\..\soundlib\PlayState.h"> <Filter>soundlib</Filter> </ClInclude> + <ClInclude Include="..\..\soundlib\PlaybackTest.h"> + <Filter>soundlib</Filter> + </ClInclude> <ClInclude Include="..\..\soundlib\Resampler.h"> <Filter>soundlib</Filter> </ClInclude> @@ -1752,9 +1755,6 @@ <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.hpp"> <Filter>src\openmpt\streamencoder</Filter> </ClInclude> - <ClInclude Include="..\..\test\PlaybackTest.h"> - <Filter>test</Filter> - </ClInclude> <ClInclude Include="..\..\test\TestTools.h"> <Filter>test</Filter> </ClInclude> @@ -2429,6 +2429,9 @@ <ClCompile Include="..\..\soundlib\PlayState.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\PlaybackTest.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\RowVisitor.cpp"> <Filter>soundlib</Filter> </ClCompile> @@ -2633,9 +2636,6 @@ <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.cpp"> <Filter>src\openmpt\streamencoder</Filter> </ClCompile> - <ClCompile Include="..\..\test\PlaybackTest.cpp"> - <Filter>test</Filter> - </ClCompile> <ClCompile Include="..\..\test\TestToolsLib.cpp"> <Filter>test</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj Sat Feb 15 19:49:30 2025 (r22936) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj Sat Feb 15 20:10:42 2025 (r22937) @@ -985,6 +985,7 @@ <ClInclude Include="..\..\soundlib\OggStream.h" /> <ClInclude Include="..\..\soundlib\Paula.h" /> <ClInclude Include="..\..\soundlib\PlayState.h" /> + <ClInclude Include="..\..\soundlib\PlaybackTest.h" /> <ClInclude Include="..\..\soundlib\Resampler.h" /> <ClInclude Include="..\..\soundlib\RowVisitor.h" /> <ClInclude Include="..\..\soundlib\S3MTools.h" /> @@ -1250,7 +1251,6 @@ <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderRAW.hpp" /> <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderVorbis.hpp" /> <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.hpp" /> - <ClInclude Include="..\..\test\PlaybackTest.h" /> <ClInclude Include="..\..\test\TestTools.h" /> <ClInclude Include="..\..\test\TestToolsLib.h" /> <ClInclude Include="..\..\test\TestToolsTracker.h" /> @@ -1477,6 +1477,7 @@ <ClCompile Include="..\..\soundlib\OggStream.cpp" /> <ClCompile Include="..\..\soundlib\Paula.cpp" /> <ClCompile Include="..\..\soundlib\PlayState.cpp" /> + <ClCompile Include="..\..\soundlib\PlaybackTest.cpp" /> <ClCompile Include="..\..\soundlib\RowVisitor.cpp" /> <ClCompile Include="..\..\soundlib\S3MTools.cpp" /> <ClCompile Include="..\..\soundlib\SampleFormatBRR.cpp" /> @@ -1545,7 +1546,6 @@ <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderRAW.cpp" /> <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderVorbis.cpp" /> <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.cpp" /> - <ClCompile Include="..\..\test\PlaybackTest.cpp" /> <ClCompile Include="..\..\test\TestToolsLib.cpp" /> <ClCompile Include="..\..\test\mpt_tests_base.cpp" /> <ClCompile Include="..\..\test\mpt_tests_binary.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters Sat Feb 15 19:49:30 2025 (r22936) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters Sat Feb 15 20:10:42 2025 (r22937) @@ -957,6 +957,9 @@ <ClInclude Include="..\..\soundlib\PlayState.h"> <Filter>soundlib</Filter> </ClInclude> + <ClInclude Include="..\..\soundlib\PlaybackTest.h"> + <Filter>soundlib</Filter> + </ClInclude> <ClInclude Include="..\..\soundlib\Resampler.h"> <Filter>soundlib</Filter> </ClInclude> @@ -1752,9 +1755,6 @@ <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.hpp"> <Filter>src\openmpt\streamencoder</Filter> </ClInclude> - <ClInclude Include="..\..\test\PlaybackTest.h"> - <Filter>test</Filter> - </ClInclude> <ClInclude Include="..\..\test\TestTools.h"> <Filter>test</Filter> </ClInclude> @@ -2429,6 +2429,9 @@ <ClCompile Include="..\..\soundlib\PlayState.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\PlaybackTest.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\RowVisitor.cpp"> <Filter>soundlib</Filter> </ClCompile> @@ -2633,9 +2636,6 @@ <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.cpp"> <Filter>src\openmpt\streamencoder</Filter> </ClCompile> - <ClCompile Include="..\..\test\PlaybackTest.cpp"> - <Filter>test</Filter> - </ClCompile> <ClCompile Include="..\..\test\TestToolsLib.cpp"> <Filter>test</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj Sat Feb 15 19:49:30 2025 (r22936) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj Sat Feb 15 20:10:42 2025 (r22937) @@ -722,6 +722,7 @@ <ClInclude Include="..\..\soundlib\OggStream.h" /> <ClInclude Include="..\..\soundlib\Paula.h" /> <ClInclude Include="..\..\soundlib\PlayState.h" /> + <ClInclude Include="..\..\soundlib\PlaybackTest.h" /> <ClInclude Include="..\..\soundlib\Resampler.h" /> <ClInclude Include="..\..\soundlib\RowVisitor.h" /> <ClInclude Include="..\..\soundlib\S3MTools.h" /> @@ -1056,6 +1057,7 @@ <ClCompile Include="..\..\soundlib\OggStream.cpp" /> <ClCompile Include="..\..\soundlib\Paula.cpp" /> <ClCompile Include="..\..\soundlib\PlayState.cpp" /> + <ClCompile Include="..\..\soundlib\PlaybackTest.cpp" /> <ClCompile Include="..\..\soundlib\RowVisitor.cpp" /> <ClCompile Include="..\..\soundlib\S3MTools.cpp" /> <ClCompile Include="..\..\soundlib\SampleFormatBRR.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj.filters Sat Feb 15 19:49:30 2025 (r22936) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj.filters Sat Feb 15 20:10:42 2025 (r22937) @@ -405,6 +405,9 @@ <ClInclude Include="..\..\soundlib\PlayState.h"> <Filter>soundlib</Filter> </ClInclude> + <ClInclude Include="..\..\soundlib\PlaybackTest.h"> + <Filter>soundlib</Filter> + </ClInclude> <ClInclude Include="..\..\soundlib\Resampler.h"> <Filter>soundlib</Filter> </ClInclude> @@ -1403,6 +1406,9 @@ <ClCompile Include="..\..\soundlib\PlayState.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\PlaybackTest.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\RowVisitor.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj Sat Feb 15 19:49:30 2025 (r22936) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj Sat Feb 15 20:10:42 2025 (r22937) @@ -722,6 +722,7 @@ <ClInclude Include="..\..\soundlib\OggStream.h" /> <ClInclude Include="..\..\soundlib\Paula.h" /> <ClInclude Include="..\..\soundlib\PlayState.h" /> + <ClInclude Include="..\..\soundlib\PlaybackTest.h" /> <ClInclude Include="..\..\soundlib\Resampler.h" /> <ClInclude Include="..\..\soundlib\RowVisitor.h" /> <ClInclude Include="..\..\soundlib\S3MTools.h" /> @@ -1056,6 +1057,7 @@ <ClCompile Include="..\..\soundlib\OggStream.cpp" /> <ClCompile Include="..\..\soundlib\Paula.cpp" /> <ClCompile Include="..\..\soundlib\PlayState.cpp" /> + <ClCompile Include="..\..\soundlib\PlaybackTest.cpp" /> <ClCompile Include="..\..\soundlib\RowVisitor.cpp" /> <ClCompile Include="..\..\soundlib\S3MTools.cpp" /> <ClCompile Include="..\..\soundlib\SampleFormatBRR.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj.filters Sat Feb 15 19:49:30 2025 (r22936) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj.filters Sat Feb 15 20:10:42 2025 (r22937) @@ -405,6 +405,9 @@ <ClInclude Include="..\..\soundlib\PlayState.h"> <Filter>soundlib</Filter> </ClInclude> + <ClInclude Include="..\..\soundlib\PlaybackTest.h"> + <Filter>soundlib</Filter> + </ClInclude> <ClInclude Include="..\..\soundlib\Resampler.h"> <Filter>soundlib</Filter> </ClInclude> @@ -1403,6 +1406,9 @@ <ClCompile Include="..\..\soundlib\PlayState.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\PlaybackTest.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\RowVisitor.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj Sat Feb 15 19:49:30 2025 (r22936) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj Sat Feb 15 20:10:42 2025 (r22937) @@ -752,6 +752,7 @@ <ClInclude Include="..\..\soundlib\OggStream.h" /> <ClInclude Include="..\..\soundlib\Paula.h" /> <ClInclude Include="..\..\soundlib\PlayState.h" /> + <ClInclude Include="..\..\soundlib\PlaybackTest.h" /> <ClInclude Include="..\..\soundlib\Resampler.h" /> <ClInclude Include="..\..\soundlib\RowVisitor.h" /> <ClInclude Include="..\..\soundlib\S3MTools.h" /> @@ -986,7 +987,6 @@ <ClInclude Include="..\..\src\openmpt\soundfile_data\tags.hpp" /> <ClInclude Include="..\..\src\openmpt\soundfile_data\wav.hpp" /> <ClInclude Include="..\..\src\openmpt\soundfile_write\wav_write.hpp" /> - <ClInclude Include="..\..\test\PlaybackTest.h" /> <ClInclude Include="..\..\test\TestTools.h" /> <ClInclude Include="..\..\test\TestToolsLib.h" /> <ClInclude Include="..\..\test\TestToolsTracker.h" /> @@ -1098,6 +1098,7 @@ <ClCompile Include="..\..\soundlib\OggStream.cpp" /> <ClCompile Include="..\..\soundlib\Paula.cpp" /> <ClCompile Include="..\..\soundlib\PlayState.cpp" /> + <ClCompile Include="..\..\soundlib\PlaybackTest.cpp" /> <ClCompile Include="..\..\soundlib\RowVisitor.cpp" /> <ClCompile Include="..\..\soundlib\S3MTools.cpp" /> <ClCompile Include="..\..\soundlib\SampleFormatBRR.cpp" /> @@ -1147,7 +1148,6 @@ <ClCompile Include="..\..\soundlib\tuning.cpp" /> <ClCompile Include="..\..\soundlib\tuningCollection.cpp" /> <ClCompile Include="..\..\src\openmpt\soundfile_write\wav_write.cpp" /> - <ClCompile Include="..\..\test\PlaybackTest.cpp" /> <ClCompile Include="..\..\test\TestToolsLib.cpp" /> <ClCompile Include="..\..\test\mpt_tests_base.cpp" /> <ClCompile Include="..\..\test\mpt_tests_binary.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters Sat Feb 15 19:49:30 2025 (r22936) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters Sat Feb 15 20:10:42 2025 (r22937) @@ -423,6 +423,9 @@ <ClInclude Include="..\..\soundlib\PlayState.h"> <Filter>soundlib</Filter> </ClInclude> + <ClInclude Include="..\..\soundlib\PlaybackTest.h"> + <Filter>soundlib</Filter> + </ClInclude> <ClInclude Include="..\..\soundlib\Resampler.h"> <Filter>soundlib</Filter> </ClInclude> @@ -1125,9 +1128,6 @@ <ClInclude Include="..\..\src\openmpt\soundfile_write\wav_write.hpp"> <Filter>src\openmpt\soundfile_write</Filter> </ClInclude> - <ClInclude Include="..\..\test\PlaybackTest.h"> - <Filter>test</Filter> - </ClInclude> <ClInclude Include="..\..\test\TestTools.h"> <Filter>test</Filter> </ClInclude> @@ -1457,6 +1457,9 @@ <ClCompile Include="..\..\soundlib\PlayState.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\PlaybackTest.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\RowVisitor.cpp"> <Filter>soundlib</Filter> </ClCompile> @@ -1604,9 +1607,6 @@ <ClCompile Include="..\..\src\openmpt\soundfile_write\wav_write.cpp"> <Filter>src\openmpt\soundfile_write</Filter> </ClCompile> - <ClCompile Include="..\..\test\PlaybackTest.cpp"> - <Filter>test</Filter> - </ClCompile> <ClCompile Include="..\..\test\TestToolsLib.cpp"> <Filter>test</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj Sat Feb 15 19:49:30 2025 (r22936) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj Sat Feb 15 20:10:42 2025 (r22937) @@ -985,6 +985,7 @@ <ClInclude Include="..\..\soundlib\OggStream.h" /> <ClInclude Include="..\..\soundlib\Paula.h" /> <ClInclude Include="..\..\soundlib\PlayState.h" /> + <ClInclude Include="..\..\soundlib\PlaybackTest.h" /> <ClInclude Include="..\..\soundlib\Resampler.h" /> <ClInclude Include="..\..\soundlib\RowVisitor.h" /> <ClInclude Include="..\..\soundlib\S3MTools.h" /> @@ -1250,7 +1251,6 @@ <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderRAW.hpp" /> <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderVorbis.hpp" /> <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.hpp" /> - <ClInclude Include="..\..\test\PlaybackTest.h" /> <ClInclude Include="..\..\test\TestTools.h" /> <ClInclude Include="..\..\test\TestToolsLib.h" /> <ClInclude Include="..\..\test\TestToolsTracker.h" /> @@ -1477,6 +1477,7 @@ <ClCompile Include="..\..\soundlib\OggStream.cpp" /> <ClCompile Include="..\..\soundlib\Paula.cpp" /> <ClCompile Include="..\..\soundlib\PlayState.cpp" /> + <ClCompile Include="..\..\soundlib\PlaybackTest.cpp" /> <ClCompile Include="..\..\soundlib\RowVisitor.cpp" /> <ClCompile Include="..\..\soundlib\S3MTools.cpp" /> <ClCompile Include="..\..\soundlib\SampleFormatBRR.cpp" /> @@ -1545,7 +1546,6 @@ <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderRAW.cpp" /> <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderVorbis.cpp" /> <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.cpp" /> - <ClCompile Include="..\..\test\PlaybackTest.cpp" /> <ClCompile Include="..\..\test\TestToolsLib.cpp" /> <ClCompile Include="..\..\test\mpt_tests_base.cpp" /> <ClCompile Include="..\..\test\mpt_tests_binary.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters Sat Feb 15 19:49:30 2025 (r22936) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters Sat Feb 15 20:10:42 2025 (r22937) @@ -957,6 +957,9 @@ <ClInclude Include="..\..\soundlib\PlayState.h"> <Filter>soundlib</Filter> </ClInclude> + <ClInclude Include="..\..\soundlib\PlaybackTest.h"> + <Filter>soundlib</Filter> + </ClInclude> <ClInclude Include="..\..\soundlib\Resampler.h"> <Filter>soundlib</Filter> </ClInclude> @@ -1752,9 +1755,6 @@ <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.hpp"> <Filter>src\openmpt\streamencoder</Filter> </ClInclude> - <ClInclude Include="..\..\test\PlaybackTest.h"> - <Filter>test</Filter> - </ClInclude> <ClInclude Include="..\..\test\TestTools.h"> <Filter>test</Filter> </ClInclude> @@ -2429,6 +2429,9 @@ <ClCompile Include="..\..\soundlib\PlayState.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\PlaybackTest.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\RowVisitor.cpp"> <Filter>soundlib</Filter> </ClCompile> @@ -2633,9 +2636,6 @@ <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.cpp"> <Filter>src\openmpt\streamencoder</Filter> </ClCompile> - <ClCompile Include="..\..\test\PlaybackTest.cpp"> - <Filter>test</Filter> - </ClCompile> <ClCompile Include="..\..\test\TestToolsLib.cpp"> <Filter>test</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj Sat Feb 15 19:49:30 2025 (r22936) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj Sat Feb 15 20:10:42 2025 (r22937) @@ -985,6 +985,7 @@ <ClInclude Include="..\..\soundlib\OggStream.h" /> <ClInclude Include="..\..\soundlib\Paula.h" /> <ClInclude Include="..\..\soundlib\PlayState.h" /> + <ClInclude Include="..\..\soundlib\PlaybackTest.h" /> <ClInclude Include="..\..\soundlib\Resampler.h" /> <ClInclude Include="..\..\soundlib\RowVisitor.h" /> <ClInclude Include="..\..\soundlib\S3MTools.h" /> @@ -1250,7 +1251,6 @@ <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderRAW.hpp" /> <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderVorbis.hpp" /> <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.hpp" /> - <ClInclude Include="..\..\test\PlaybackTest.h" /> <ClInclude Include="..\..\test\TestTools.h" /> <ClInclude Include="..\..\test\TestToolsLib.h" /> <ClInclude Include="..\..\test\TestToolsTracker.h" /> @@ -1477,6 +1477,7 @@ <ClCompile Include="..\..\soundlib\OggStream.cpp" /> <ClCompile Include="..\..\soundlib\Paula.cpp" /> <ClCompile Include="..\..\soundlib\PlayState.cpp" /> + <ClCompile Include="..\..\soundlib\PlaybackTest.cpp" /> <ClCompile Include="..\..\soundlib\RowVisitor.cpp" /> <ClCompile Include="..\..\soundlib\S3MTools.cpp" /> <ClCompile Include="..\..\soundlib\SampleFormatBRR.cpp" /> @@ -1545,7 +1546,6 @@ <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderRAW.cpp" /> <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderVorbis.cpp" /> <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.cpp" /> - <ClCompile Include="..\..\test\PlaybackTest.cpp" /> <ClCompile Include="..\..\test\TestToolsLib.cpp" /> <ClCompile Include="..\..\test\mpt_tests_base.cpp" /> <ClCompile Include="..\..\test\mpt_tests_binary.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters Sat Feb 15 19:49:30 2025 (r22936) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters Sat Feb 15 20:10:42 2025 (r22937) @@ -957,6 +957,9 @@ <ClInclude Include="..\..\soundlib\PlayState.h"> <Filter>soundlib</Filter> </ClInclude> + <ClInclude Include="..\..\soundlib\PlaybackTest.h"> + <Filter>soundlib</Filter> + </ClInclude> <ClInclude Include="..\..\soundlib\Resampler.h"> <Filter>soundlib</Filter> </ClInclude> @@ -1752,9 +1755,6 @@ <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.hpp"> <Filter>src\openmpt\streamencoder</Filter> </ClInclude> - <ClInclude Include="..\..\test\PlaybackTest.h"> - <Filter>test</Filter> - </ClInclude> <ClInclude Include="..\..\test\TestTools.h"> <Filter>test</Filter> </ClInclude> @@ -2429,6 +2429,9 @@ <ClCompile Include="..\..\soundlib\PlayState.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\PlaybackTest.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\RowVisitor.cpp"> <Filter>soundlib</Filter> </ClCompile> @@ -2633,9 +2636,6 @@ <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.cpp"> <Filter>src\openmpt\streamencoder</Filter> </ClCompile> - <ClCompile Include="..\..\test\PlaybackTest.cpp"> - <Filter>test</Filter> - </ClCompile> <ClCompile Include="..\..\test\TestToolsLib.cpp"> <Filter>test</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj Sat Feb 15 19:49:30 2025 (r22936) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj Sat Feb 15 20:10:42 2025 (r22937) @@ -985,6 +985,7 @@ <ClInclude Include="..\..\soundlib\OggStream.h" /> <ClInclude Include="..\..\soundlib\Paula.h" /> <ClInclude Include="..\..\soundlib\PlayState.h" /> + <ClInclude Include="..\..\soundlib\PlaybackTest.h" /> <ClInclude Include="..\..\soundlib\Resampler.h" /> <ClInclude Include="..\..\soundlib\RowVisitor.h" /> <ClInclude Include="..\..\soundlib\S3MTools.h" /> @@ -1250,7 +1251,6 @@ <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderRAW.hpp" /> <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderVorbis.hpp" /> <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.hpp" /> - <ClInclude Include="..\..\test\PlaybackTest.h" /> <ClInclude Include="..\..\test\TestTools.h" /> <ClInclude Include="..\..\test\TestToolsLib.h" /> <ClInclude Include="..\..\test\TestToolsTracker.h" /> @@ -1477,6 +1477,7 @@ <ClCompile Include="..\..\soundlib\OggStream.cpp" /> <ClCompile Include="..\..\soundlib\Paula.cpp" /> <ClCompile Include="..\..\soundlib\PlayState.cpp" /> + <ClCompile Include="..\..\soundlib\PlaybackTest.cpp" /> <ClCompile Include="..\..\soundlib\RowVisitor.cpp" /> <ClCompile Include="..\..\soundlib\S3MTools.cpp" /> <ClCompile Include="..\..\soundlib\SampleFormatBRR.cpp" /> @@ -1545,7 +1546,6 @@ <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderRAW.cpp" /> <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderVorbis.cpp" /> <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.cpp" /> - <ClCompile Include="..\..\test\PlaybackTest.cpp" /> <ClCompile Include="..\..\test\TestToolsLib.cpp" /> <ClCompile Include="..\..\test\mpt_tests_base.cpp" /> <ClCompile Include="..\..\test\mpt_tests_binary.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters Sat Feb 15 19:49:30 2025 (r22936) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters Sat Feb 15 20:10:42 2025 (r22937) @@ -957,6 +957,9 @@ <ClInclude Include="..\..\soundlib\PlayState.h"> <Filter>soundlib</Filter> </ClInclude> + <ClInclude Include="..\..\soundlib\PlaybackTest.h"> + <Filter>soundlib</Filter> + </ClInclude> <ClInclude Include="..\..\soundlib\Resampler.h"> <Filter>soundlib</Filter> </ClInclude> @@ -1752,9 +1755,6 @@ <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.hpp"> <Filter>src\openmpt\streamencoder</Filter> </ClInclude> - <ClInclude Include="..\..\test\PlaybackTest.h"> - <Filter>test</Filter> - </ClInclude> <ClInclude Include="..\..\test\TestTools.h"> <Filter>test</Filter> </ClInclude> @@ -2429,6 +2429,9 @@ <ClCompile Include="..\..\soundlib\PlayState.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\PlaybackTest.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\RowVisitor.cpp"> <Filter>soundlib</Filter> </ClCompile> @@ -2633,9 +2636,6 @@ <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.cpp"> <Filter>src\openmpt\streamencoder</Filter> </ClCompile> - <ClCompile Include="..\..\test\PlaybackTest.cpp"> - <Filter>test</Filter> - </ClCompile> <ClCompile Include="..\..\test\TestToolsLib.cpp"> <Filter>test</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj Sat Feb 15 19:49:30 2025 (r22936) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj Sat Feb 15 20:10:42 2025 (r22937) @@ -722,6 +722,7 @@ <ClInclude Include="..\..\soundlib\OggStream.h" /> <ClInclude Include="..\..\soundlib\Paula.h" /> <ClInclude Include="..\..\soundlib\PlayState.h" /> + <ClInclude Include="..\..\soundlib\PlaybackTest.h" /> <ClInclude Include="..\..\soundlib\Resampler.h" /> <ClInclude Include="..\..\soundlib\RowVisitor.h" /> <ClInclude Include="..\..\soundlib\S3MTools.h" /> @@ -1056,6 +1057,7 @@ <ClCompile Include="..\..\soundlib\OggStream.cpp" /> <ClCompile Include="..\..\soundlib\Paula.cpp" /> <ClCompile Include="..\..\soundlib\PlayState.cpp" /> + <ClCompile Include="..\..\soundlib\PlaybackTest.cpp" /> <ClCompile Include="..\..\soundlib\RowVisitor.cpp" /> <ClCompile Include="..\..\soundlib\S3MTools.cpp" /> <ClCompile Include="..\..\soundlib\SampleFormatBRR.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters Sat Feb 15 19:49:30 2025 (r22936) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters Sat Feb 15 20:10:42 2025 (r22937) @@ -405,6 +405,9 @@ <ClInclude Include="..\..\soundlib\PlayState.h"> <Filter>soundlib</Filter> </ClInclude> + <ClInclude Include="..\..\soundlib\PlaybackTest.h"> + <Filter>soundlib</Filter> + </ClInclude> <ClInclude Include="..\..\soundlib\Resampler.h"> <Filter>soundlib</Filter> </ClInclude> @@ -1403,6 +1406,9 @@ <ClCompile Include="..\..\soundlib\PlayState.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\PlaybackTest.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\RowVisitor.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj Sat Feb 15 19:49:30 2025 (r22936) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj Sat Feb 15 20:10:42 2025 (r22937) @@ -722,6 +722,7 @@ <ClInclude Include="..\..\soundlib\OggStream.h" /> <ClInclude Include="..\..\soundlib\Paula.h" /> <ClInclude Include="..\..\soundlib\PlayState.h" /> + <ClInclude Include="..\..\soundlib\PlaybackTest.h" /> <ClInclude Include="..\..\soundlib\Resampler.h" /> <ClInclude Include="..\..\soundlib\RowVisitor.h" /> <ClInclude Include="..\..\soundlib\S3MTools.h" /> @@ -1056,6 +1057,7 @@ <ClCompile Include="..\..\soundlib\OggStream.cpp" /> <ClCompile Include="..\..\soundlib\Paula.cpp" /> <ClCompile Include="..\..\soundlib\PlayState.cpp" /> + <ClCompile Include="..\..\soundlib\PlaybackTest.cpp" /> <ClCompile Include="..\..\soundlib\RowVisitor.cpp" /> <ClCompile Include="..\..\soundlib\S3MTools.cpp" /> <ClCompile Include="..\..\soundlib\SampleFormatBRR.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj.filters Sat Feb 15 19:49:30 2025 (r22936) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj.filters Sat Feb 15 20:10:42 2025 (r22937) @@ -405,6 +405,9 @@ <ClInclude Include="..\..\soundlib\PlayState.h"> <Filter>soundlib</Filter> </ClInclude> + <ClInclude Include="..\..\soundlib\PlaybackTest.h"> + <Filter>soundlib</Filter> + </ClInclude> <ClInclude Include="..\..\soundlib\Resampler.h"> <Filter>soundlib</Filter> </ClInclude> @@ -1403,6 +1406,9 @@ <ClCompile Include="..\..\soundlib\PlayState.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\PlaybackTest.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\RowVisitor.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj Sat Feb 15 19:49:30 2025 (r22936) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj Sat Feb 15 20:10:42 2025 (r22937) @@ -752,6 +752,7 @@ <ClInclude Include="..\..\soundlib\OggStream.h" /> <ClInclude Include="..\..\soundlib\Paula.h" /> <ClInclude Include="..\..\soundlib\PlayState.h" /> + <ClInclude Include="..\..\soundlib\PlaybackTest.h" /> <ClInclude Include="..\..\soundlib\Resampler.h" /> <ClInclude Include="..\..\soundlib\RowVisitor.h" /> <ClInclude Include="..\..\soundlib\S3MTools.h" /> @@ -986,7 +987,6 @@ <ClInclude Include="..\..\src\openmpt\soundfile_data\tags.hpp" /> <ClInclude Include="..\..\src\openmpt\soundfile_data\wav.hpp" /> <ClInclude Include="..\..\src\openmpt\soundfile_write\wav_write.hpp" /> - <ClInclude Include="..\..\test\PlaybackTest.h" /> <ClInclude Include="..\..\test\TestTools.h" /> <ClInclude Include="..\..\test\TestToolsLib.h" /> <ClInclude Include="..\..\test\TestToolsTracker.h" /> @@ -1098,6 +1098,7 @@ <ClCompile Include="..\..\soundlib\OggStream.cpp" /> <ClCompile Include="..\..\soundlib\Paula.cpp" /> <ClCompile Include="..\..\soundlib\PlayState.cpp" /> + <ClCompile Include="..\..\soundlib\PlaybackTest.cpp" /> <ClCompile Include="..\..\soundlib\RowVisitor.cpp" /> <ClCompile Include="..\..\soundlib\S3MTools.cpp" /> <ClCompile Include="..\..\soundlib\SampleFormatBRR.cpp" /> @@ -1147,7 +1148,6 @@ <ClCompile Include="..\..\soundlib\tuning.cpp" /> <ClCompile Include="..\..\soundlib\tuningCollection.cpp" /> <ClCompile Include="..\..\src\openmpt\soundfile_write\wav_write.cpp" /> - <ClCompile Include="..\..\test\PlaybackTest.cpp" /> <ClCompile Include="..\..\test\TestToolsLib.cpp" /> <ClCompile Include="..\..\test\mpt_tests_base.cpp" /> <ClCompile Include="..\..\test\mpt_tests_binary.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters Sat Feb 15 19:49:30 2025 (r22936) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters Sat Feb 15 20:10:42 2025 (r22937) @@ -423,6 +423,9 @@ <ClInclude Include="..\..\soundlib\PlayState.h"> <Filter>soundlib</Filter> </ClInclude> + <ClInclude Include="..\..\soundlib\PlaybackTest.h"> + <Filter>soundlib</Filter> + </ClInclude> <ClInclude Include="..\..\soundlib\Resampler.h"> <Filter>soundlib</Filter> </ClInclude> @@ -1125,9 +1128,6 @@ <ClInclude Include="..\..\src\openmpt\soundfile_write\wav_write.hpp"> <Filter>src\openmpt\soundfile_write</Filter> </ClInclude> - <ClInclude Include="..\..\test\PlaybackTest.h"> - <Filter>test</Filter> - </ClInclude> <ClInclude Include="..\..\test\TestTools.h"> <Filter>test</Filter> </ClInclude> @@ -1457,6 +1457,9 @@ <ClCompile Include="..\..\soundlib\PlayState.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\PlaybackTest.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\RowVisitor.cpp"> <Filter>soundlib</Filter> </ClCompile> @@ -1604,9 +1607,6 @@ <ClCompile Include="..\..\src\openmpt\soundfile_write\wav_write.cpp"> <Filter>src\openmpt\soundfile_write</Filter> </ClCompile> - <ClCompile Include="..\..\test\PlaybackTest.cpp"> - <Filter>test</Filter> - </ClCompile> <ClCompile Include="..\..\test\TestToolsLib.cpp"> <Filter>test</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj Sat Feb 15 19:49:30 2025 (r22936) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj Sat Feb 15 20:10:42 2025 (r22937) @@ -1004,6 +1004,7 @@ <ClInclude Include="..\..\soundlib\OggStream.h" /> <ClInclude Include="..\..\soundlib\Paula.h" /> <ClInclude Include="..\..\soundlib\PlayState.h" /> + <ClInclude Include="..\..\soundlib\PlaybackTest.h" /> <ClInclude Include="..\..\soundlib\Resampler.h" /> <ClInclude Include="..\..\soundlib\RowVisitor.h" /> <ClInclude Include="..\..\soundlib\S3MTools.h" /> @@ -1269,7 +1270,6 @@ <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderRAW.hpp" /> <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderVorbis.hpp" /> <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.hpp" /> - <ClInclude Include="..\..\test\PlaybackTest.h" /> <ClInclude Include="..\..\test\TestTools.h" /> <ClInclude Include="..\..\test\TestToolsLib.h" /> <ClInclude Include="..\..\test\TestToolsTracker.h" /> @@ -1496,6 +1496,7 @@ <ClCompile Include="..\..\soundlib\OggStream.cpp" /> <ClCompile Include="..\..\soundlib\Paula.cpp" /> <ClCompile Include="..\..\soundlib\PlayState.cpp" /> + <ClCompile Include="..\..\soundlib\PlaybackTest.cpp" /> <ClCompile Include="..\..\soundlib\RowVisitor.cpp" /> <ClCompile Include="..\..\soundlib\S3MTools.cpp" /> <ClCompile Include="..\..\soundlib\SampleFormatBRR.cpp" /> @@ -1564,7 +1565,6 @@ <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderRAW.cpp" /> <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderVorbis.cpp" /> <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.cpp" /> - <ClCompile Include="..\..\test\PlaybackTest.cpp" /> <ClCompile Include="..\..\test\TestToolsLib.cpp" /> <ClCompile Include="..\..\test\mpt_tests_base.cpp" /> <ClCompile Include="..\..\test\mpt_tests_binary.cpp" /> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters Sat Feb 15 19:49:30 2025 (r22936) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters Sat Feb 15 20:10:42 2025 (r22937) @@ -996,6 +996,9 @@ <ClInclude Include="..\..\soundlib\PlayState.h"> <Filter>soundlib</Filter> </ClInclude> + <ClInclude Include="..\..\soundlib\PlaybackTest.h"> + <Filter>soundlib</Filter> + </ClInclude> <ClInclude Include="..\..\soundlib\Resampler.h"> <Filter>soundlib</Filter> </ClInclude> @@ -1791,9 +1794,6 @@ <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.hpp"> <Filter>src\openmpt\streamencoder</Filter> </ClInclude> - <ClInclude Include="..\..\test\PlaybackTest.h"> - <Filter>test</Filter> - </ClInclude> <ClInclude Include="..\..\test\TestTools.h"> <Filter>test</Filter> </ClInclude> @@ -2468,6 +2468,9 @@ <ClCompile Include="..\..\soundlib\PlayState.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\PlaybackTest.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\RowVisitor.cpp"> <Filter>soundlib</Filter> </ClCompile> @@ -2672,9 +2675,6 @@ <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.cpp"> <Filter>src\openmpt\streamencoder</Filter> </ClCompile> - <ClCompile Include="..\..\test\PlaybackTest.cpp"> - <Filter>test</Filter> - </ClCompile> <ClCompile Include="..\..\test\TestToolsLib.cpp"> <Filter>test</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj Sat Feb 15 19:49:30 2025 (r22936) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj Sat Feb 15 20:10:42 2025 (r22937) @@ -1004,6 +1004,7 @@ <ClInclude Include="..\..\soundlib\OggStream.h" /> <ClInclude Include="..\..\soundlib\Paula.h" /> <ClInclude Include="..\..\soundlib\PlayState.h" /> + <ClInclude Include="..\..\soundlib\PlaybackTest.h" /> <ClInclude Include="..\..\soundlib\Resampler.h" /> <ClInclude Include="..\..\soundlib\RowVisitor.h" /> <ClInclude Include="..\..\soundlib\S3MTools.h" /> @@ -1269,7 +1270,6 @@ <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderRAW.hpp" /> <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderVorbis.hpp" /> <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.hpp" /> - <ClInclude Include="..\..\test\PlaybackTest.h" /> <ClInclude Include="..\..\test\TestTools.h" /> <ClInclude Include="..\..\test\TestToolsLib.h" /> <ClInclude Include="..\..\test\TestToolsTracker.h" /> @@ -1496,6 +1496,7 @@ <ClCompile Include="..\..\soundlib\OggStream.cpp" /> <ClCompile Include="..\..\soundlib\Paula.cpp" /> <ClCompile Include="..\..\soundlib\PlayState.cpp" /> + <ClCompile Include="..\..\soundlib\PlaybackTest.cpp" /> <ClCompile Include="..\..\soundlib\RowVisitor.cpp" /> <ClCompile Include="..\..\soundlib\S3MTools.cpp" /> <ClCompile Include="..\..\soundlib\SampleFormatBRR.cpp" /> @@ -1564,7 +1565,6 @@ <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderRAW.cpp" /> <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderVorbis.cpp" /> <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.cpp" /> - <ClCompile Include="..\..\test\PlaybackTest.cpp" /> <ClCompile Include="..\..\test\TestToolsLib.cpp" /> <ClCompile Include="..\..\test\mpt_tests_base.cpp" /> <ClCompile Include="..\..\test\mpt_tests_binary.cpp" /> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters Sat Feb 15 19:49:30 2025 (r22936) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters Sat Feb 15 20:10:42 2025 (r22937) @@ -996,6 +996,9 @@ <ClInclude Include="..\..\soundlib\PlayState.h"> <Filter>soundlib</Filter> </ClInclude> + <ClInclude Include="..\..\soundlib\PlaybackTest.h"> + <Filter>soundlib</Filter> + </ClInclude> <ClInclude Include="..\..\soundlib\Resampler.h"> <Filter>soundlib</Filter> </ClInclude> @@ -1791,9 +1794,6 @@ <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.hpp"> <Filter>src\openmpt\streamencoder</Filter> </ClInclude> - <ClInclude Include="..\..\test\PlaybackTest.h"> - <Filter>test</Filter> - </ClInclude> <ClInclude Include="..\..\test\TestTools.h"> <Filter>test</Filter> </ClInclude> @@ -2468,6 +2468,9 @@ <ClCompile Include="..\..\soundlib\PlayState.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\PlaybackTest.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\RowVisitor.cpp"> <Filter>soundlib</Filter> </ClCompile> @@ -2672,9 +2675,6 @@ <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.cpp"> <Filter>src\openmpt\streamencoder</Filter> </ClCompile> - <ClCompile Include="..\..\test\PlaybackTest.cpp"> - <Filter>test</Filter> - </ClCompile> <ClCompile Include="..\..\test\TestToolsLib.cpp"> <Filter>test</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj Sat Feb 15 19:49:30 2025 (r22936) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj Sat Feb 15 20:10:42 2025 (r22937) @@ -1004,6 +1004,7 @@ <ClInclude Include="..\..\soundlib\OggStream.h" /> <ClInclude Include="..\..\soundlib\Paula.h" /> <ClInclude Include="..\..\soundlib\PlayState.h" /> + <ClInclude Include="..\..\soundlib\PlaybackTest.h" /> <ClInclude Include="..\..\soundlib\Resampler.h" /> <ClInclude Include="..\..\soundlib\RowVisitor.h" /> <ClInclude Include="..\..\soundlib\S3MTools.h" /> @@ -1269,7 +1270,6 @@ <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderRAW.hpp" /> <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderVorbis.hpp" /> <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.hpp" /> - <ClInclude Include="..\..\test\PlaybackTest.h" /> <ClInclude Include="..\..\test\TestTools.h" /> <ClInclude Include="..\..\test\TestToolsLib.h" /> <ClInclude Include="..\..\test\TestToolsTracker.h" /> @@ -1496,6 +1496,7 @@ <ClCompile Include="..\..\soundlib\OggStream.cpp" /> <ClCompile Include="..\..\soundlib\Paula.cpp" /> <ClCompile Include="..\..\soundlib\PlayState.cpp" /> + <ClCompile Include="..\..\soundlib\PlaybackTest.cpp" /> <ClCompile Include="..\..\soundlib\RowVisitor.cpp" /> <ClCompile Include="..\..\soundlib\S3MTools.cpp" /> <ClCompile Include="..\..\soundlib\SampleFormatBRR.cpp" /> @@ -1564,7 +1565,6 @@ <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderRAW.cpp" /> <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderVorbis.cpp" /> <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.cpp" /> - <ClCompile Include="..\..\test\PlaybackTest.cpp" /> <ClCompile Include="..\..\test\TestToolsLib.cpp" /> <ClCompile Include="..\..\test\mpt_tests_base.cpp" /> <ClCompile Include="..\..\test\mpt_tests_binary.cpp" /> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj.filters Sat Feb 15 19:49:30 2025 (r22936) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj.filters Sat Feb 15 20:10:42 2025 (r22937) @@ -996,6 +996,9 @@ <ClInclude Include="..\..\soundlib\PlayState.h"> <Filter>soundlib</Filter> </ClInclude> + <ClInclude Include="..\..\soundlib\PlaybackTest.h"> + <Filter>soundlib</Filter> + </ClInclude> <ClInclude Include="..\..\soundlib\Resampler.h"> <Filter>soundlib</Filter> </ClInclude> @@ -1791,9 +1794,6 @@ <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.hpp"> <Filter>src\openmpt\streamencoder</Filter> </ClInclude> - <ClInclude Include="..\..\test\PlaybackTest.h"> - <Filter>test</Filter> - </ClInclude> <ClInclude Include="..\..\test\TestTools.h"> <Filter>test</Filter> </ClInclude> @@ -2468,6 +2468,9 @@ <ClCompile Include="..\..\soundlib\PlayState.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\PlaybackTest.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\RowVisitor.cpp"> <Filter>soundlib</Filter> </ClCompile> @@ -2672,9 +2675,6 @@ <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.cpp"> <Filter>src\openmpt\streamencoder</Filter> </ClCompile> - <ClCompile Include="..\..\test\PlaybackTest.cpp"> - <Filter>test</Filter> - </ClCompile> <ClCompile Include="..\..\test\TestToolsLib.cpp"> <Filter>test</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj Sat Feb 15 19:49:30 2025 (r22936) +++ trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj Sat... [truncated message content] |
|
From: <sv...@op...> - 2025-02-15 18:49:42
|
Author: manx Date: Sat Feb 15 19:49:30 2025 New Revision: 22936 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22936 Log: [Ref] Add MPT_ENABLE_PLAYBACK_TRACE macro for PlaybackTest. Modified: trunk/OpenMPT/common/BuildSettings.h trunk/OpenMPT/soundlib/Sndfile.h trunk/OpenMPT/test/PlaybackTest.cpp trunk/OpenMPT/test/PlaybackTest.h Modified: trunk/OpenMPT/common/BuildSettings.h ============================================================================== --- trunk/OpenMPT/common/BuildSettings.h Sat Feb 15 19:23:24 2025 (r22935) +++ trunk/OpenMPT/common/BuildSettings.h Sat Feb 15 19:49:30 2025 (r22936) @@ -84,6 +84,9 @@ #define ENABLE_TESTS #endif +// Enable generation and verification of playback traces +#define MPT_ENABLE_PLAYBACK_TRACE + // Disable any file saving functionality (not really useful except for the player library) //#define MODPLUG_NO_FILESAVE @@ -157,6 +160,7 @@ #if defined(LIBOPENMPT_BUILD_TEST) #define ENABLE_TESTS +#define MPT_ENABLE_PLAYBACK_TRACE #else #define MODPLUG_NO_FILESAVE #endif Modified: trunk/OpenMPT/soundlib/Sndfile.h ============================================================================== --- trunk/OpenMPT/soundlib/Sndfile.h Sat Feb 15 19:23:24 2025 (r22935) +++ trunk/OpenMPT/soundlib/Sndfile.h Sat Feb 15 19:49:30 2025 (r22936) @@ -1287,7 +1287,10 @@ public: PLUGINDEX GetBestPlugin(const ModChannel &channel, CHANNELINDEX nChn, PluginPriority priority, PluginMutePriority respectMutes) const; +#if defined(MPT_ENABLE_PLAYBACK_TRACE) PlaybackTest CreatePlaybackTest(PlaybackTestSettings settings); +#endif // MPT_ENABLE_PLAYBACK_TRACE + }; Modified: trunk/OpenMPT/test/PlaybackTest.cpp ============================================================================== --- trunk/OpenMPT/test/PlaybackTest.cpp Sat Feb 15 19:23:24 2025 (r22935) +++ trunk/OpenMPT/test/PlaybackTest.cpp Sat Feb 15 19:49:30 2025 (r22936) @@ -30,6 +30,9 @@ OPENMPT_NAMESPACE_BEGIN +#if defined(MPT_ENABLE_PLAYBACK_TRACE) + + struct TestDataHeader { static constexpr char TestDataHeaderMagic[] = "OpenMPT Test Data\r\n\x1A"; @@ -740,4 +743,8 @@ return PlaybackTest{std::move(testData)}; } + +#endif // MPT_ENABLE_PLAYBACK_TRACE + + OPENMPT_NAMESPACE_END Modified: trunk/OpenMPT/test/PlaybackTest.h ============================================================================== --- trunk/OpenMPT/test/PlaybackTest.h Sat Feb 15 19:23:24 2025 (r22935) +++ trunk/OpenMPT/test/PlaybackTest.h Sat Feb 15 19:49:30 2025 (r22936) @@ -17,6 +17,8 @@ OPENMPT_NAMESPACE_BEGIN +#if defined(MPT_ENABLE_PLAYBACK_TRACE) + struct PlaybackTestData; struct PlaybackTestSettings; class CSoundFile; @@ -48,4 +50,6 @@ std::unique_ptr<PlaybackTestData> m_testData; }; +#endif // MPT_ENABLE_PLAYBACK_TRACE + OPENMPT_NAMESPACE_END |
|
From: <sv...@op...> - 2025-02-15 18:23:30
|
Author: manx Date: Sat Feb 15 19:23:24 2025 New Revision: 22935 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22935 Log: [Mod] OpenMPT: Version is now 1.31.14.02 Modified: branches/OpenMPT-1.31/common/versionNumber.h Modified: branches/OpenMPT-1.31/common/versionNumber.h ============================================================================== --- branches/OpenMPT-1.31/common/versionNumber.h Sat Feb 15 19:23:02 2025 (r22934) +++ branches/OpenMPT-1.31/common/versionNumber.h Sat Feb 15 19:23:24 2025 (r22935) @@ -18,6 +18,6 @@ #define VER_MAJORMAJOR 1 #define VER_MAJOR 31 #define VER_MINOR 14 -#define VER_MINORMINOR 01 +#define VER_MINORMINOR 02 OPENMPT_NAMESPACE_END |
Author: manx Date: Sat Feb 15 19:23:02 2025 New Revision: 22934 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22934 Log: [Var] Regenerate project files. Modified: branches/OpenMPT-1.31/build/vs2017winxp/ext/flac.vcxproj branches/OpenMPT-1.31/build/vs2017winxpansi/ext/flac.vcxproj branches/OpenMPT-1.31/build/vs2019win10/ext/flac.vcxproj branches/OpenMPT-1.31/build/vs2019win7/ext/flac.vcxproj branches/OpenMPT-1.31/build/vs2019win81/ext/flac.vcxproj branches/OpenMPT-1.31/build/vs2022win10/ext/flac.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/ext/flac.vcxproj branches/OpenMPT-1.31/build/vs2022win7/ext/flac.vcxproj branches/OpenMPT-1.31/build/vs2022win81/ext/flac.vcxproj Modified: branches/OpenMPT-1.31/build/vs2017winxp/ext/flac.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2017winxp/ext/flac.vcxproj Sat Feb 15 19:20:56 2025 (r22933) +++ branches/OpenMPT-1.31/build/vs2017winxp/ext/flac.vcxproj Sat Feb 15 19:23:02 2025 (r22934) @@ -294,7 +294,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC__NO_DLL;%(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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> @@ -314,7 +314,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC__NO_DLL;%(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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> @@ -333,7 +333,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC__NO_DLL;%(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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> @@ -357,7 +357,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC__NO_DLL;%(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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> @@ -380,7 +380,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC__NO_DLL;%(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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> @@ -405,7 +405,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC__NO_DLL;%(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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> @@ -429,7 +429,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC_API_EXPORTS;%(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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> @@ -450,7 +450,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC_API_EXPORTS;%(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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> @@ -470,7 +470,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC_API_EXPORTS;%(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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> @@ -496,7 +496,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC_API_EXPORTS;%(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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> @@ -521,7 +521,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC_API_EXPORTS;%(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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> @@ -548,7 +548,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC_API_EXPORTS;%(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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> Modified: branches/OpenMPT-1.31/build/vs2017winxpansi/ext/flac.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2017winxpansi/ext/flac.vcxproj Sat Feb 15 19:20:56 2025 (r22933) +++ branches/OpenMPT-1.31/build/vs2017winxpansi/ext/flac.vcxproj Sat Feb 15 19:23:02 2025 (r22934) @@ -294,7 +294,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC__NO_DLL;%(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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> @@ -314,7 +314,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC__NO_DLL;%(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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> @@ -333,7 +333,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC__NO_DLL;%(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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> @@ -357,7 +357,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC__NO_DLL;%(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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> @@ -380,7 +380,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC__NO_DLL;%(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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> @@ -405,7 +405,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC__NO_DLL;%(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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> @@ -429,7 +429,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC_API_EXPORTS;%(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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> @@ -450,7 +450,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC_API_EXPORTS;%(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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> @@ -470,7 +470,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC_API_EXPORTS;%(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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> @@ -496,7 +496,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC_API_EXPORTS;%(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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> @@ -521,7 +521,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC_API_EXPORTS;%(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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> @@ -548,7 +548,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC_API_EXPORTS;%(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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> Modified: branches/OpenMPT-1.31/build/vs2019win10/ext/flac.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2019win10/ext/flac.vcxproj Sat Feb 15 19:20:56 2025 (r22933) +++ branches/OpenMPT-1.31/build/vs2019win10/ext/flac.vcxproj Sat Feb 15 19:23:02 2025 (r22934) @@ -531,7 +531,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> @@ -553,7 +553,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> @@ -575,7 +575,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Disabled</Optimization> @@ -596,7 +596,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Disabled</Optimization> @@ -617,7 +617,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> @@ -644,7 +644,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> @@ -670,7 +670,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> @@ -696,7 +696,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> @@ -722,7 +722,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> @@ -750,7 +750,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> @@ -777,7 +777,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> @@ -804,7 +804,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> @@ -831,7 +831,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> @@ -854,7 +854,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> @@ -877,7 +877,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Disabled</Optimization> @@ -900,7 +900,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Disabled</Optimization> @@ -923,7 +923,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> @@ -952,7 +952,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> @@ -980,7 +980,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> @@ -1008,7 +1008,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> @@ -1036,7 +1036,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> @@ -1066,7 +1066,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> @@ -1095,7 +1095,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> @@ -1124,7 +1124,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;F... [truncated message content] |
|
From: <sv...@op...> - 2025-02-15 18:21:07
|
Author: manx Date: Sat Feb 15 19:20:56 2025 New Revision: 22933 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22933 Log: Merged revision(s) 22921 from trunk/OpenMPT: [Var] FLAC: Update to v1.5.0 (2025-02-11). ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/build/premake/ext-flac.lua branches/OpenMPT-1.31/include/flac/AUTHORS branches/OpenMPT-1.31/include/flac/COPYING.Xiph branches/OpenMPT-1.31/include/flac/OpenMPT.txt branches/OpenMPT-1.31/include/flac/include/FLAC/all.h branches/OpenMPT-1.31/include/flac/include/FLAC/assert.h branches/OpenMPT-1.31/include/flac/include/FLAC/callback.h branches/OpenMPT-1.31/include/flac/include/FLAC/export.h branches/OpenMPT-1.31/include/flac/include/FLAC/format.h branches/OpenMPT-1.31/include/flac/include/FLAC/metadata.h branches/OpenMPT-1.31/include/flac/include/FLAC/ordinals.h branches/OpenMPT-1.31/include/flac/include/FLAC/stream_decoder.h branches/OpenMPT-1.31/include/flac/include/FLAC/stream_encoder.h branches/OpenMPT-1.31/include/flac/include/share/alloc.h branches/OpenMPT-1.31/include/flac/include/share/compat.h branches/OpenMPT-1.31/include/flac/include/share/endswap.h branches/OpenMPT-1.31/include/flac/include/share/macros.h branches/OpenMPT-1.31/include/flac/include/share/private.h branches/OpenMPT-1.31/include/flac/include/share/safe_str.h branches/OpenMPT-1.31/include/flac/include/share/win_utf8_io.h branches/OpenMPT-1.31/include/flac/src/libFLAC/bitmath.c branches/OpenMPT-1.31/include/flac/src/libFLAC/bitreader.c branches/OpenMPT-1.31/include/flac/src/libFLAC/bitwriter.c branches/OpenMPT-1.31/include/flac/src/libFLAC/cpu.c branches/OpenMPT-1.31/include/flac/src/libFLAC/crc.c branches/OpenMPT-1.31/include/flac/src/libFLAC/fixed.c branches/OpenMPT-1.31/include/flac/src/libFLAC/fixed_intrin_avx2.c branches/OpenMPT-1.31/include/flac/src/libFLAC/fixed_intrin_sse2.c branches/OpenMPT-1.31/include/flac/src/libFLAC/fixed_intrin_sse42.c branches/OpenMPT-1.31/include/flac/src/libFLAC/fixed_intrin_ssse3.c branches/OpenMPT-1.31/include/flac/src/libFLAC/float.c branches/OpenMPT-1.31/include/flac/src/libFLAC/format.c branches/OpenMPT-1.31/include/flac/src/libFLAC/include/private/all.h branches/OpenMPT-1.31/include/flac/src/libFLAC/include/private/bitmath.h branches/OpenMPT-1.31/include/flac/src/libFLAC/include/private/bitreader.h branches/OpenMPT-1.31/include/flac/src/libFLAC/include/private/bitwriter.h branches/OpenMPT-1.31/include/flac/src/libFLAC/include/private/cpu.h branches/OpenMPT-1.31/include/flac/src/libFLAC/include/private/crc.h branches/OpenMPT-1.31/include/flac/src/libFLAC/include/private/fixed.h branches/OpenMPT-1.31/include/flac/src/libFLAC/include/private/float.h branches/OpenMPT-1.31/include/flac/src/libFLAC/include/private/format.h branches/OpenMPT-1.31/include/flac/src/libFLAC/include/private/lpc.h branches/OpenMPT-1.31/include/flac/src/libFLAC/include/private/macros.h branches/OpenMPT-1.31/include/flac/src/libFLAC/include/private/memory.h branches/OpenMPT-1.31/include/flac/src/libFLAC/include/private/metadata.h branches/OpenMPT-1.31/include/flac/src/libFLAC/include/private/ogg_decoder_aspect.h branches/OpenMPT-1.31/include/flac/src/libFLAC/include/private/ogg_encoder_aspect.h branches/OpenMPT-1.31/include/flac/src/libFLAC/include/private/ogg_helper.h branches/OpenMPT-1.31/include/flac/src/libFLAC/include/private/ogg_mapping.h branches/OpenMPT-1.31/include/flac/src/libFLAC/include/private/stream_encoder.h branches/OpenMPT-1.31/include/flac/src/libFLAC/include/private/stream_encoder_framing.h branches/OpenMPT-1.31/include/flac/src/libFLAC/include/private/window.h branches/OpenMPT-1.31/include/flac/src/libFLAC/include/protected/all.h branches/OpenMPT-1.31/include/flac/src/libFLAC/include/protected/stream_decoder.h branches/OpenMPT-1.31/include/flac/src/libFLAC/include/protected/stream_encoder.h branches/OpenMPT-1.31/include/flac/src/libFLAC/lpc.c branches/OpenMPT-1.31/include/flac/src/libFLAC/lpc_intrin_avx2.c branches/OpenMPT-1.31/include/flac/src/libFLAC/lpc_intrin_fma.c branches/OpenMPT-1.31/include/flac/src/libFLAC/lpc_intrin_neon.c branches/OpenMPT-1.31/include/flac/src/libFLAC/lpc_intrin_sse2.c branches/OpenMPT-1.31/include/flac/src/libFLAC/lpc_intrin_sse41.c branches/OpenMPT-1.31/include/flac/src/libFLAC/md5.c branches/OpenMPT-1.31/include/flac/src/libFLAC/memory.c branches/OpenMPT-1.31/include/flac/src/libFLAC/metadata_iterators.c branches/OpenMPT-1.31/include/flac/src/libFLAC/metadata_object.c branches/OpenMPT-1.31/include/flac/src/libFLAC/ogg_decoder_aspect.c branches/OpenMPT-1.31/include/flac/src/libFLAC/ogg_encoder_aspect.c branches/OpenMPT-1.31/include/flac/src/libFLAC/ogg_helper.c branches/OpenMPT-1.31/include/flac/src/libFLAC/ogg_mapping.c branches/OpenMPT-1.31/include/flac/src/libFLAC/stream_decoder.c branches/OpenMPT-1.31/include/flac/src/libFLAC/stream_encoder.c branches/OpenMPT-1.31/include/flac/src/libFLAC/stream_encoder_framing.c branches/OpenMPT-1.31/include/flac/src/libFLAC/stream_encoder_intrin_avx2.c branches/OpenMPT-1.31/include/flac/src/libFLAC/stream_encoder_intrin_sse2.c branches/OpenMPT-1.31/include/flac/src/libFLAC/stream_encoder_intrin_ssse3.c branches/OpenMPT-1.31/include/flac/src/libFLAC/version.rc branches/OpenMPT-1.31/include/flac/src/libFLAC/window.c branches/OpenMPT-1.31/include/flac/src/share/win_utf8_io/win_utf8_io.c Modified: branches/OpenMPT-1.31/build/premake/ext-flac.lua ============================================================================== --- branches/OpenMPT-1.31/build/premake/ext-flac.lua Sat Feb 15 19:18:53 2025 (r22932) +++ branches/OpenMPT-1.31/build/premake/ext-flac.lua Sat Feb 15 19:20:56 2025 (r22933) @@ -115,7 +115,7 @@ filter {} defines { "FLAC__HAS_OGG=1" } links { "ogg" } - defines { "PACKAGE_VERSION=\"1.4.3\"" } + defines { "PACKAGE_VERSION=\"1.5.0\"" } filter {} filter { "kind:StaticLib" } defines { "FLAC__NO_DLL" } Modified: branches/OpenMPT-1.31/include/flac/AUTHORS ============================================================================== --- branches/OpenMPT-1.31/include/flac/AUTHORS Sat Feb 15 19:18:53 2025 (r22932) +++ branches/OpenMPT-1.31/include/flac/AUTHORS Sat Feb 15 19:20:56 2025 (r22933) @@ -1,6 +1,6 @@ /* FLAC - Free Lossless Audio Codec * Copyright (C) 2001-2009 Josh Coalson - * Copyright (C) 2011-2023 Xiph.Org Foundation + * Copyright (C) 2011-2025 Xiph.Org Foundation * * This file is part the FLAC project. FLAC is comprised of several * components distributed under different licenses. The codec libraries Modified: branches/OpenMPT-1.31/include/flac/COPYING.Xiph ============================================================================== --- branches/OpenMPT-1.31/include/flac/COPYING.Xiph Sat Feb 15 19:18:53 2025 (r22932) +++ branches/OpenMPT-1.31/include/flac/COPYING.Xiph Sat Feb 15 19:20:56 2025 (r22933) @@ -1,5 +1,5 @@ Copyright (C) 2000-2009 Josh Coalson -Copyright (C) 2011-2023 Xiph.Org Foundation +Copyright (C) 2011-2025 Xiph.Org Foundation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions Modified: branches/OpenMPT-1.31/include/flac/OpenMPT.txt ============================================================================== --- branches/OpenMPT-1.31/include/flac/OpenMPT.txt Sat Feb 15 19:18:53 2025 (r22932) +++ branches/OpenMPT-1.31/include/flac/OpenMPT.txt Sat Feb 15 19:20:56 2025 (r22933) @@ -1,6 +1,5 @@ -flac 1.4.3. +flac 1.5.0 (2025-02-11). The FLAC package has been left pretty much untouched, except for a few changes: - * https://github.com/xiph/flac/pull/638 has been applied. * In `include/share/compat.h`, the Windows XP compatibility warning has been disabled. * All modifications have been marked with "/* OpenMPT */". Modified: branches/OpenMPT-1.31/include/flac/include/FLAC/all.h ============================================================================== --- branches/OpenMPT-1.31/include/flac/include/FLAC/all.h Sat Feb 15 19:18:53 2025 (r22932) +++ branches/OpenMPT-1.31/include/flac/include/FLAC/all.h Sat Feb 15 19:20:56 2025 (r22933) @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2000-2009 Josh Coalson - * Copyright (C) 2011-2023 Xiph.Org Foundation + * Copyright (C) 2011-2025 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -436,6 +436,56 @@ * */ +/** \defgroup porting_1_4_3_to_1_5_0 Porting from FLAC 1.4.3 to 1.5.0 + * \ingroup porting + * + * \brief + * This module describes porting from FLAC 1.4.3 to FLAC 1.5.0. + * + * \section porting_1_4_3_to_1_5_0_summary Summary + * + * Between FLAC 1.4.3 and FLAC 1.5.0, there have been changes to + * existing C functions and enums: + * - the functions FLAC__metadata_get_streaminfo, + * FLAC__metadata_get_tags and FLAC__metadata_get_cuesheet can now + * read from Ogg FLAC files + * - when encoding Ogg FLAC files, the 'samples' argument of the + * write callback no longer always returns 0. + * - two error statuses have been added to the + * FLAC__StreamDecoderErrorStatus enum + * - one status is added to FLAC__StreamDecoderState, which is only + * used when the new decoding of chained streams functionality is + * enabled + * - one status is added to FLAC__StreamDecoderReadStatus, which is + * only used when the new decoding of chained streams functionality + * is enabled + * - the function + * FLAC__metadata_chain_write_with_callbacks_and_tempfile can now + * be used regardless of whether a tempfile is actually needed, + * which is useful when writing to a new file is desired anyway + * + * Furthermore, there have been the following additions: + * - the functions FLAC__stream_decoder_set_decode_chained_stream, + * FLAC__stream_decoder_get_decode_chained_stream, + * FLAC__stream_decoder_finish_link, + * FLAC__stream_decoder_skip_single_link, + * FLAC__stream_decoder_process_until_end_of_link and + * FLAC__stream_decoder_get_link_lengths have been added + * to support decoding of chained streams + * - the function FLAC__metadata_chain_write_new_file has been added, + * which is useful to combine copying of a file with changing its + * metadata + * - the function FLAC__stream_decoder_find_total_samples was added, + * which seeks to the end of a file to find the total number of + * samples + * - the function FLAC__stream_encoder_set_num_threads and + * FLAC__stream_encoder_get_num_threads have been added, which + * can be used to enable multithreading in the encoder + * + * For the C++ API, changes are the same, but in C++ nomenclature + * + */ + /** \defgroup flac FLAC C API * * The FLAC C API is the interface to libFLAC, a set of structures Modified: branches/OpenMPT-1.31/include/flac/include/FLAC/assert.h ============================================================================== --- branches/OpenMPT-1.31/include/flac/include/FLAC/assert.h Sat Feb 15 19:18:53 2025 (r22932) +++ branches/OpenMPT-1.31/include/flac/include/FLAC/assert.h Sat Feb 15 19:20:56 2025 (r22933) @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2001-2009 Josh Coalson - * Copyright (C) 2011-2023 Xiph.Org Foundation + * Copyright (C) 2011-2025 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: branches/OpenMPT-1.31/include/flac/include/FLAC/callback.h ============================================================================== --- branches/OpenMPT-1.31/include/flac/include/FLAC/callback.h Sat Feb 15 19:18:53 2025 (r22932) +++ branches/OpenMPT-1.31/include/flac/include/FLAC/callback.h Sat Feb 15 19:20:56 2025 (r22933) @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2004-2009 Josh Coalson - * Copyright (C) 2011-2023 Xiph.Org Foundation + * Copyright (C) 2011-2025 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: branches/OpenMPT-1.31/include/flac/include/FLAC/export.h ============================================================================== --- branches/OpenMPT-1.31/include/flac/include/FLAC/export.h Sat Feb 15 19:18:53 2025 (r22932) +++ branches/OpenMPT-1.31/include/flac/include/FLAC/export.h Sat Feb 15 19:20:56 2025 (r22933) @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2000-2009 Josh Coalson - * Copyright (C) 2011-2023 Xiph.Org Foundation + * Copyright (C) 2011-2025 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -95,9 +95,9 @@ /** These \#defines will mirror the libtool-based library version number, see * http://www.gnu.org/software/libtool/manual/libtool.html#Libtool-versioning */ -#define FLAC_API_VERSION_CURRENT 13 +#define FLAC_API_VERSION_CURRENT 14 #define FLAC_API_VERSION_REVISION 0 /**< see above */ -#define FLAC_API_VERSION_AGE 1 /**< see above */ +#define FLAC_API_VERSION_AGE 0 /**< see above */ #ifdef __cplusplus extern "C" { Modified: branches/OpenMPT-1.31/include/flac/include/FLAC/format.h ============================================================================== --- branches/OpenMPT-1.31/include/flac/include/FLAC/format.h Sat Feb 15 19:18:53 2025 (r22932) +++ branches/OpenMPT-1.31/include/flac/include/FLAC/format.h Sat Feb 15 19:20:56 2025 (r22933) @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2000-2009 Josh Coalson - * Copyright (C) 2011-2023 Xiph.Org Foundation + * Copyright (C) 2011-2025 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: branches/OpenMPT-1.31/include/flac/include/FLAC/metadata.h ============================================================================== --- branches/OpenMPT-1.31/include/flac/include/FLAC/metadata.h Sat Feb 15 19:18:53 2025 (r22932) +++ branches/OpenMPT-1.31/include/flac/include/FLAC/metadata.h Sat Feb 15 19:20:56 2025 (r22933) @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2001-2009 Josh Coalson - * Copyright (C) 2011-2023 Xiph.Org Foundation + * Copyright (C) 2011-2025 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -62,9 +62,9 @@ * This module provides functions for creating and manipulating FLAC * metadata blocks in memory, and three progressively more powerful * interfaces for traversing and editing metadata in native FLAC files. - * Note that currently only the Chain interface (level 2) supports Ogg - * FLAC files, and it is read-only i.e. no writing back changed - * metadata to file. + * Note that currently only the Chain interface (level 2) and some + * functions in level 0 supports Ogg FLAC files, and they are + * read-only i.e. no writing back changed metadata to file. * * There are three metadata interfaces of increasing complexity: * @@ -144,10 +144,11 @@ * \{ */ -/** Read the STREAMINFO metadata block of the given FLAC file. This function - * will try to skip any ID3v2 tag at the head of the file. +/** Read the STREAMINFO metadata block of the given FLAC or Ogg FLAC + * file. This function will try to skip any ID3v2 tag at the head + * of the file. * - * \param filename The path to the FLAC file to read. + * \param filename The path to the FLAC or Ogg FLAC file to read. * \param streaminfo A pointer to space for the STREAMINFO block. Since * FLAC__StreamMetadata is a simple structure with no * memory allocation involved, you pass the address of @@ -163,10 +164,11 @@ */ FLAC_API FLAC__bool FLAC__metadata_get_streaminfo(const char *filename, FLAC__StreamMetadata *streaminfo); -/** Read the VORBIS_COMMENT metadata block of the given FLAC file. This - * function will try to skip any ID3v2 tag at the head of the file. +/** Read the VORBIS_COMMENT metadata block of the given FLAC or Ogg FLAC + * file. This function will try to skip any ID3v2 tag at the head + * of the file. * - * \param filename The path to the FLAC file to read. + * \param filename The path to the FLAC or Ogg FLAC file to read. * \param tags The address where the returned pointer will be * stored. The \a tags object must be deleted by * the caller using FLAC__metadata_object_delete(). @@ -182,10 +184,11 @@ */ FLAC_API FLAC__bool FLAC__metadata_get_tags(const char *filename, FLAC__StreamMetadata **tags); -/** Read the CUESHEET metadata block of the given FLAC file. This - * function will try to skip any ID3v2 tag at the head of the file. +/** Read the CUESHEET metadata block of the given FLAC or Ogg FLAC + * file. This function will try to skip any ID3v2 tag at the head + * of the file. * - * \param filename The path to the FLAC file to read. + * \param filename The path to the FLAC or Ogg FLAC file to read. * \param cuesheet The address where the returned pointer will be * stored. The \a cuesheet object must be deleted by * the caller using FLAC__metadata_object_delete(). @@ -207,7 +210,8 @@ * function takes a number of parameters that act as constraints to * the search. The PICTURE block with the largest area matching all * the constraints will be returned, or \a *picture will be set to - * \c NULL if there was no such block. + * \c NULL if there was no such block. This function does not + * currently support reading from Ogg FLAC files. * * \param filename The path to the FLAC file to read. * \param picture The address where the returned pointer will be @@ -784,9 +788,6 @@ /**< FLAC__metadata_chain_write_with_callbacks() was called when the * chain write requires a tempfile; use * FLAC__metadata_chain_write_with_callbacks_and_tempfile() instead. - * Or, FLAC__metadata_chain_write_with_callbacks_and_tempfile() was - * called when the chain write does not require a tempfile; use - * FLAC__metadata_chain_write_with_callbacks() instead. * Always check FLAC__metadata_chain_check_if_tempfile_needed() * before writing via callbacks. */ @@ -923,11 +924,11 @@ * edited metadata back to the FLAC file does not require rewriting the * entire file. If rewriting is required, then a temporary workfile is * required. When writing metadata using callbacks, you must check - * this function to know whether to call - * FLAC__metadata_chain_write_with_callbacks() or - * FLAC__metadata_chain_write_with_callbacks_and_tempfile(). When - * writing with FLAC__metadata_chain_write(), the temporary file is - * handled internally. + * this function to know whether + * FLAC__metadata_chain_write_with_callbacks() can be used or + * FLAC__metadata_chain_write_with_callbacks_and_tempfile() is + * necessary. When writing with FLAC__metadata_chain_write(), the + * temporary file is handled internally. * * \param chain A pointer to an existing chain. * \param use_padding @@ -990,6 +991,28 @@ */ FLAC_API FLAC__bool FLAC__metadata_chain_write(FLAC__Metadata_Chain *chain, FLAC__bool use_padding, FLAC__bool preserve_file_stats); +/** Write all metadata out to a new FLAC file. + * + * This function works similar to FLAC__metadata_chain_write(), but is + * useful if writing to a new file is desired. This is more efficient + * than copying the file before changing it. + * + * For this write function to be used, the chain must have been read with + * FLAC__metadata_chain_read()/FLAC__metadata_chain_read_ogg(), not + * FLAC__metadata_chain_read_with_callbacks()/FLAC__metadata_chain_read_ogg_with_callbacks(). + * See also FLAC__metadata_chain_write_with_callbacks_and_tempfile() + * + * \param chain A pointer to an existing chain. + * \param use_padding See FLAC__metadata_chain_write() + * \param filename The filename of the new file. + * \assert + * \code chain != NULL \endcode + * \retval FLAC__bool + * \c true if the write succeeded, else \c false. On failure, + * check the status with FLAC__metadata_chain_status(). + */ +FLAC_API FLAC__bool FLAC__metadata_chain_write_new_file(FLAC__Metadata_Chain *chain, const char *filename, FLAC__bool use_padding); + /** Write all metadata out to a FLAC stream via callbacks. * * (See FLAC__metadata_chain_write() for the details on how padding is @@ -1031,7 +1054,8 @@ * FLAC file to edit, and a temporary handle to which the new FLAC * file will be written. It is the caller's job to move this temporary * FLAC file on top of the original FLAC file to complete the metadata - * edit. + * edit. This version of the write-with-callbacks function can also be + * used if writing to a new file is desired anyway. * * The \a handle must be open for reading and be seekable. The * equivalent minimum stdio fopen() file mode is \c "r" (or \c "rb" @@ -1046,8 +1070,6 @@ * For this write function to be used, the chain must have been read with * FLAC__metadata_chain_read_with_callbacks()/FLAC__metadata_chain_read_ogg_with_callbacks(), * not FLAC__metadata_chain_read()/FLAC__metadata_chain_read_ogg(). - * Also, FLAC__metadata_chain_check_if_tempfile_needed() must have returned - * \c true. * * \param chain A pointer to an existing chain. * \param use_padding See FLAC__metadata_chain_write() Modified: branches/OpenMPT-1.31/include/flac/include/FLAC/ordinals.h ============================================================================== --- branches/OpenMPT-1.31/include/flac/include/FLAC/ordinals.h Sat Feb 15 19:18:53 2025 (r22932) +++ branches/OpenMPT-1.31/include/flac/include/FLAC/ordinals.h Sat Feb 15 19:20:56 2025 (r22933) @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2000-2009 Josh Coalson - * Copyright (C) 2011-2023 Xiph.Org Foundation + * Copyright (C) 2011-2025 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: branches/OpenMPT-1.31/include/flac/include/FLAC/stream_decoder.h ============================================================================== --- branches/OpenMPT-1.31/include/flac/include/FLAC/stream_decoder.h Sat Feb 15 19:18:53 2025 (r22932) +++ branches/OpenMPT-1.31/include/flac/include/FLAC/stream_decoder.h Sat Feb 15 19:20:56 2025 (r22933) @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2000-2009 Josh Coalson - * Copyright (C) 2011-2023 Xiph.Org Foundation + * Copyright (C) 2011-2025 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -235,12 +235,20 @@ * state and can no longer be used. */ - FLAC__STREAM_DECODER_UNINITIALIZED + FLAC__STREAM_DECODER_UNINITIALIZED, /**< The decoder is in the uninitialized state; one of the * FLAC__stream_decoder_init_*() functions must be called before samples * can be processed. */ + FLAC__STREAM_DECODER_END_OF_LINK + /**< The decoder has reached the end of an Ogg FLAC chain link and a new + * link follows; FLAC__stream_decoder_finish_link() has to be called to + * progress. This state is only returned when decoding of chained + * streams is enabled with + * FLAC__stream_decoder_set_decode_chained_stream() + */ + } FLAC__StreamDecoderState; /** Maps a FLAC__StreamDecoderState to a C string. @@ -307,9 +315,14 @@ * of \c 0. */ - FLAC__STREAM_DECODER_READ_STATUS_ABORT + FLAC__STREAM_DECODER_READ_STATUS_ABORT, /**< An unrecoverable error occurred. The decoder will return from the process call. */ + FLAC__STREAM_DECODER_READ_STATUS_END_OF_LINK + /**< The read was attempted while at the end of the link. The semantics + * are the same as for FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM. + */ + } FLAC__StreamDecoderReadStatus; /** Maps a FLAC__StreamDecoderReadStatus to a C string. @@ -442,9 +455,21 @@ FLAC__STREAM_DECODER_ERROR_STATUS_UNPARSEABLE_STREAM, /**< The decoder encountered reserved fields in use in the stream. */ - FLAC__STREAM_DECODER_ERROR_STATUS_BAD_METADATA + FLAC__STREAM_DECODER_ERROR_STATUS_BAD_METADATA, /**< The decoder encountered a corrupted metadata block. */ + FLAC__STREAM_DECODER_ERROR_STATUS_OUT_OF_BOUNDS, + /**< The decoder encountered a otherwise valid frame in which + * the decoded samples exceeded the range offered by the stated + * bit depth. */ + + FLAC__STREAM_DECODER_ERROR_STATUS_MISSING_FRAME + /**< Two adjacent frames had frame numbers increasing by more than + * 1 or sample numbers increasing by more than the blocksize, + * indicating that one or more frame/frames was missing between + * them. The decoder will sent out one or more ´fake' constant + * subframes to fill up the gap. */ + } FLAC__StreamDecoderErrorStatus; /** Maps a FLAC__StreamDecoderErrorStatus to a C string. @@ -782,6 +807,33 @@ */ FLAC_API FLAC__bool FLAC__stream_decoder_set_ogg_serial_number(FLAC__StreamDecoder *decoder, long serial_number); +/** Set the "decode chained stream" flag. If set to \c false, the + * decoder will stop decoding when it encounters the end-of-stream + * of the first link in the chain. If set to \c true, decoding will + * continue: at the start of each link, FLAC__stream_decoder_get_state + * will return FLAC__STREAM_DECODER_SEARCH_FOR_METADATA. + * + * This function was made to decode chained Ogg streams, but it should + * be possible to chain regular FLAC files through the read callback + * by using FLAC__STREAM_DECODER_READ_STATUS_END_OF_LINK + * appropriately. + * + * Note that when this flag is set to true, the serial number set + * with FLAC__stream_decoder_set_ogg_serial_number is ignored. + * + * \note + * This function has no effect with native FLAC decoding. + * + * \default \c false + * \param decoder A decoder instance to set. + * \param allow Whether to allow chained streams. + * \assert + * \code decoder != NULL \endcode + * \retval FLAC__bool + * \c false if the decoder is already initialized, else \c true. + */ +FLAC_API FLAC__bool FLAC__stream_decoder_set_decode_chained_stream(FLAC__StreamDecoder* decoder, FLAC__bool value); + /** Set the "MD5 signature checking" flag. If \c true, the decoder will * compute the MD5 signature of the unencoded audio data while decoding * and compare it to the signature from the STREAMINFO block, if it @@ -814,7 +866,7 @@ * \code decoder != NULL \endcode * \a type is valid * \retval FLAC__bool - * \c false if the decoder is already initialized, else \c true. + * \c false if type is invalid, else \c true. */ FLAC_API FLAC__bool FLAC__stream_decoder_set_metadata_respond(FLAC__StreamDecoder *decoder, FLAC__MetadataType type); @@ -829,7 +881,7 @@ * \code decoder != NULL \endcode * \code id != NULL \endcode * \retval FLAC__bool - * \c false if the decoder is already initialized, else \c true. + * \c false when memory allocation fails, else \c true. */ FLAC_API FLAC__bool FLAC__stream_decoder_set_metadata_respond_application(FLAC__StreamDecoder *decoder, const FLAC__byte id[4]); @@ -841,7 +893,7 @@ * \assert * \code decoder != NULL \endcode * \retval FLAC__bool - * \c false if the decoder is already initialized, else \c true. + * \c always \c true. */ FLAC_API FLAC__bool FLAC__stream_decoder_set_metadata_respond_all(FLAC__StreamDecoder *decoder); @@ -855,7 +907,7 @@ * \code decoder != NULL \endcode * \a type is valid * \retval FLAC__bool - * \c false if the decoder is already initialized, else \c true. + * \c false if type is invalid, else \c true. */ FLAC_API FLAC__bool FLAC__stream_decoder_set_metadata_ignore(FLAC__StreamDecoder *decoder, FLAC__MetadataType type); @@ -870,7 +922,7 @@ * \code decoder != NULL \endcode * \code id != NULL \endcode * \retval FLAC__bool - * \c false if the decoder is already initialized, else \c true. + * \c false if memory allocation fails, else \c true. */ FLAC_API FLAC__bool FLAC__stream_decoder_set_metadata_ignore_application(FLAC__StreamDecoder *decoder, const FLAC__byte id[4]); @@ -882,7 +934,7 @@ * \assert * \code decoder != NULL \endcode * \retval FLAC__bool - * \c false if the decoder is already initialized, else \c true. + * \c always \c true. */ FLAC_API FLAC__bool FLAC__stream_decoder_set_metadata_ignore_all(FLAC__StreamDecoder *decoder); @@ -906,6 +958,17 @@ */ FLAC_API const char *FLAC__stream_decoder_get_resolved_state_string(const FLAC__StreamDecoder *decoder); +/** Get the "decode chained stream" flag as described in + * \code FLAC__stream_decoder_set_decode_chained_stream \endcode. + * + * \param decoder A decoder instance to query. + * \assert + * \code decoder != NULL \endcode + * \retval FLAC__bool + * See above. + */ +FLAC_API FLAC__bool FLAC__stream_decoder_get_decode_chained_stream(const FLAC__StreamDecoder* decoder); + /** Get the "MD5 signature checking" flag. * This is the value of the setting, not whether or not the decoder is * currently checking the MD5 (remember, it can be turned off automatically @@ -932,6 +995,32 @@ */ FLAC_API FLAC__uint64 FLAC__stream_decoder_get_total_samples(const FLAC__StreamDecoder *decoder); +/** Seek to the end of the file being decoded to find the total number + * of samples. This will return a number of samples even if + * FLAC__stream_decoder_get_total_samples() returns 0. It can also + * be used to find the total number of samples of a chained stream, + * as it returns the total number of samples in all chain links + * combined. See FLAC__stream_decoder_set_decode_chained_stream() + * + * For this function to work, the stream must be seekable. Also, as + * seeking can fail, this function returns 0 when it was unable to + * find the total number of samples. Use + * FLAC__stream_decoder_get_state() in that case to find out whether + * the decoder is still valid. + * + * The state in which the decoder is left after calling this function + * is undefined and might change in the future. Use + * FLAC__stream_decoder_reset() to return the decoder to a defined + * state. + * + * \param decoder A decoder instance to query. + * \assert + * \code decoder != NULL \endcode + * \retval uint32_t + * See above. + */ +FLAC_API FLAC__uint64 FLAC__stream_decoder_find_total_samples(FLAC__StreamDecoder *decoder); + /** Get the current number of channels in the stream being decoded. * Will only be valid after decoding has started and will contain the * value from the most recently decoded frame header. @@ -1023,6 +1112,43 @@ */ FLAC_API const void *FLAC__stream_decoder_get_client_data(FLAC__StreamDecoder *decoder); +#define FLAC__STREAM_DECODER_GET_LINK_LENGTHS_INVALID -1 +#define FLAC__STREAM_DECODER_GET_LINK_LENGTHS_NOT_INDEXED -2 +#define FLAC__STREAM_DECODER_GET_LINK_LENGTHS_MEMORY_ALLOCATION_ERROR -3 + +/** Get the link lengths in samples in a chained stream + * + * After either processing the whole file or using + * FLAC__stream_decoder_find_total_samples, this function + * returns an array with link lengths in samples. If it fails, + * it returns a negative number as error code, currently either + * FLAC__STREAM_DECODER_GET_LINK_LENGTHS_INVALID if the current + * decoder is not in a valid state or not processing a chained + * stream, FLAC__STREAM_DECODER_GET_LINK_LENGTHS_NOT_INDEXED if + * the stream hasn't been indexed yet, and + * FLAC__STREAM_DECODER_GET_LINK_LENGTHS_MEMORY_ALLOCATION_ERROR + * if allocating memory failed. + * + * If the function succeeds, the return value is the number of + * links. The link_lengths parameter is a FLAC__uint64 pointer + * which is allocated by the call, and must be freed by the user. + * If a null pointer is passed, the function only returns the + * number of links, not their lengths. The length of the returned + * array is equal to the number of links and thus to the return + * value of the function. + * + * \param decoder A decoder instance to query. + * \param link_lengths Address at which to return the link lengths + * array. + * \assert + * \code decoder != NULL \endcode + * \retval int32_t + * \c the number of links if successful, zero or a negative + * number if unsuccessful + */ + +FLAC_API int32_t FLAC__stream_decoder_get_link_lengths(FLAC__StreamDecoder *decoder, FLAC__uint64 **link_lengths); + /** Initialize the decoder instance to decode native FLAC streams. * * This flavor of initialization sets up the decoder to decode from a @@ -1394,6 +1520,23 @@ */ FLAC_API FLAC__bool FLAC__stream_decoder_finish(FLAC__StreamDecoder *decoder); +/** Finish the decoding process of the current link. + * Checks MD5 for current link and start processing of the next link. This + * function should only be used when the decoder state is + * FLAC__STREAM_DECODER_END_OF_LINK. After calling this function, the state + * is set to FLAC__STREAM_DECODER_SEARCH_FOR_METADATA. + * + * \param decoder An uninitialized decoder instance. + * \assert + * \code decoder != NULL \endcode + * \retval FLAC__bool + * \c false if MD5 checking is on AND a STREAMINFO block was available + * AND the MD5 signature in the STREAMINFO block was non-zero AND the + * signature does not match the one computed by the decoder; else + * \c true. + */ +FLAC_API FLAC__bool FLAC__stream_decoder_finish_link(FLAC__StreamDecoder *decoder); + /** Flush the stream input. * The decoder's input buffer will be cleared and the state set to * \c FLAC__STREAM_DECODER_SEARCH_FOR_FRAME_SYNC. This will also turn @@ -1495,6 +1638,31 @@ */ FLAC_API FLAC__bool FLAC__stream_decoder_process_until_end_of_metadata(FLAC__StreamDecoder *decoder); +/** Decode until the end of the Ogg chain link. + * This version instructs the decoder to decode from the current + * position and continue until the end of link or until the + * callbacks return a fatal error. This function should not be + * used without enabling decoding of chained streams with + * FLAC__stream_decoder_set_decode_chained_stream() + * + * To start processing the next link after calling this function, + * call FLAC__stream_decoder_finish_link() + * + * As the decoder needs more input it will call the read callback. + * As each metadata block and frame is decoded, the metadata or write + * callback will be called with the decoded metadata or frame. + * + * \param decoder An initialized decoder instance. + * \assert + * \code decoder != NULL \endcode + * \retval FLAC__bool + * \c false if any fatal read, write, or memory allocation error + * occurred (meaning decoding must stop), else \c true; for more + * information about the decoder, check the decoder state with + * FLAC__stream_decoder_get_state(). + */ +FLAC_API FLAC__bool FLAC__stream_decoder_process_until_end_of_link(FLAC__StreamDecoder *decoder); + /** Decode until the end of the stream. * This version instructs the decoder to decode from the current position * and continue until the end of stream (the read callback returns @@ -1557,6 +1725,34 @@ */ FLAC_API FLAC__bool FLAC__stream_decoder_skip_single_frame(FLAC__StreamDecoder *decoder); +/** Skip one Ogg chain link. + * This version instructs the decoder to 'skip' the current ogg chain + * link. This function should not be used without enabling decoding + * of chained streams with + * FLAC__stream_decoder_set_decode_chained_stream() + * + * When the location ot the next link is already known (for example, + * because there has already been a seek in the stream) this function + * will seek to the end of the link and start processing, but when it + * is not, it will do various seeks (when possible) to find the end + * of the link. If seeking is not possible (or the tell and length + * callback do not work) it will simply read forward instead of + * seeking, much like a muted (but faster) version of + * FLAC__stream_decoder_process_until_end_of_link(). + * + * \param decoder An initialized decoder instance not in a metadata + * state. + * \assert + * \code decoder != NULL \endcode + * \retval FLAC__bool + * \c false if any fatal read, write, or memory allocation error + * occurred (meaning decoding must stop), or when decoding a format + * that does not support chaining, else \c true; for more + * information about the decoder, check the decoder state with + * FLAC__stream_decoder_get_state(). + */ +FLAC_API FLAC__bool FLAC__stream_decoder_skip_single_link(FLAC__StreamDecoder *decoder); + /** Flush the input and seek to an absolute sample. * Decoding will resume at the given sample. Note that because of * this, the next write callback may contain a partial block. The @@ -1566,6 +1762,14 @@ * with FLAC__stream_decoder_flush() or reset with * FLAC__stream_decoder_reset() before decoding can continue. * + * When seeking in a chained stream with decoding of such streams + * enabled with FLAC__stream_decoder_set_decode_chained_stream(), + * this function seeks in the whole stream, over all links. When + * a seek to another link is performed, the decoder will also + * return metadata blocks of that link. If this is not desired, + * use FLAC__stream_decoder_set_metadata_ignore_all() before + * seeking. + * * \param decoder A decoder instance. * \param sample The target sample number to seek to. * \assert Modified: branches/OpenMPT-1.31/include/flac/include/FLAC/stream_encoder.h ============================================================================== --- branches/OpenMPT-1.31/include/flac/include/FLAC/stream_encoder.h Sat Feb 15 19:18:53 2025 (r22932) +++ branches/OpenMPT-1.31/include/flac/include/FLAC/stream_encoder.h Sat Feb 15 19:20:56 2025 (r22933) @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2000-2009 Josh Coalson - * Copyright (C) 2011-2023 Xiph.Org Foundation + * Copyright (C) 2011-2025 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -288,6 +288,11 @@ extern FLAC_API const char * const FLAC__StreamEncoderStateString[]; +#define FLAC__STREAM_ENCODER_SET_NUM_THREADS_OK 0 +#define FLAC__STREAM_ENCODER_SET_NUM_THREADS_NOT_COMPILED_WITH_MULTITHREADING_ENABLED 1 +#define FLAC__STREAM_ENCODER_SET_NUM_THREADS_ALREADY_INITIALIZED 2 +#define FLAC__STREAM_ENCODER_SET_NUM_THREADS_TOO_MANY_THREADS 3 + /** Possible return values for the FLAC__stream_encoder_init_*() functions. */ typedef enum { @@ -533,11 +538,17 @@ * callback is being called to write metadata. * * \note - * Unlike when writing to native FLAC, when writing to Ogg FLAC the - * write callback will be called twice when writing each audio - * frame; once for the page header, and once for the page body. - * When writing the page header, the \a samples argument to the - * write callback will be \c 0. + * Unlike when writing to native FLAC, when writing to Ogg FLAC the write + * callback will be called at least twice when writing each audio frame; once + * for the page header and once for the page body, possibly repeating this + * pair of calls several times in a batch with the same value of + * \a current_frame. When writing the page header, as well as in all but the + * first page body write of the batch, the \a samples argument to the write + * callback will be \c 0. For the write callback call containing the first + * page body, the \a samples argument is the number of samples contained in + * all newly added complete packets (not pages). This means that in case a + * packet is split over two pages, they are counted in the samples argument + * of the page on which the packet is completed. * * \note In general, FLAC__StreamEncoder functions which change the * state should not be called on the \a encoder while in the callback. @@ -1102,6 +1113,52 @@ */ FLAC_API FLAC__bool FLAC__stream_encoder_set_max_residual_partition_order(FLAC__StreamEncoder *encoder, uint32_t value); +/** Set the maximum number of threads to use during encoding. + * Set to a value different than 1 to enable multithreaded encoding. + * + * Note that enabling multithreading encoding (i.e., setting a value + * different than 1) results in the behaviour of + * FLAC__stream_encoder_finish(), FLAC__stream_encoder_process(), + * FLAC__stream_encoder_process_interleaved() subtly changing. + * For example, calling one of the process functions with enough + * samples to fill a block might not always result in a call to + * the write callback with a frame coding these samples. Instead, + * blocks with samples are distributed among worker threads, + * meaning that the first few calls to those functions will + * return very quickly, while later calls might block if all + * threads are occupied. Also, certain calls to the process + * functions will results in several calls to the write callback, + * while subsequent calls might again return very quickly with no + * calls to the write callback. + * + * Also, a call to FLAC__stream_encoder_finish() blocks while + * waiting for all threads to finish, and therefore might take much + * longer than when not multithreading and result in multiple calls + * to the write callback. + * + * Calls to the write callback are guaranteed to be in the correct + * order. + * + * Currently, passing a value of 0 is synonymous with a value of 1, + * but this might change in the future. + * + * \default \c 1 + * \param encoder An encoder instance to set. + * \param value See above. + * \assert + * \code encoder != NULL \endcode + * \retval uint32_t + * - \c FLAC__STREAM_ENCODER_SET_NUM_THREADS_OK if the number of threads was set correctly, + * - \c FLAC__STREAM_ENCODER_SET_NUM_THREADS_NOT_COMPILED_WITH_MULTITHREADING_ENABLED when + * multithreading was not enabled at compilation, + * - \c FLAC__STREAM_ENCODER_SET_NUM_THREADS_ALREADY_INITIALIZED when the encoder was + * already initialized, + * - \c FLAC__STREAM_ENCODER_SET_NUM_THREADS_TOO_MANY_THREADS when + * the number of threads was larger than the maximum allowed number of threads (currently + * 128). + */ +FLAC_API uint32_t FLAC__stream_encoder_set_num_threads(FLAC__StreamEncoder *encoder, uint32_t value); + /** Deprecated. Setting this value has no effect. * * \default \c 0 @@ -1435,6 +1492,16 @@ */ FLAC_API uint32_t FLAC__stream_encoder_get_max_residual_partition_order(const FLAC__StreamEncoder *encoder); +/** Get maximum number of threads setting. + * + * \param encoder An encoder instance to query. + * \assert + * \code encoder != NULL \endcode + * \retval uint32_t + * See FLAC__stream_encoder_set_num_threads(). + */ +FLAC_API uint32_t FLAC__stream_encoder_get_num_threads(const FLAC__StreamEncoder *encoder); + /** Get the Rice parameter search distance setting. * * \param encoder An encoder instance to query. Modified: branches/OpenMPT-1.31/include/flac/include/share/alloc.h ============================================================================== --- branches/OpenMPT-1.31/include/flac/include/share/alloc.h Sat Feb 15 19:18:53 2025 (r22932) +++ branches/OpenMPT-1.31/include/flac/include/share/alloc.h Sat Feb 15 19:20:56 2025 (r22933) @@ -1,6 +1,6 @@ /* alloc - Convenience routines for safely allocating memory * Copyright (C) 2007-2009 Josh Coalson - * Copyright (C) 2011-2023 Xiph.Org Foundation + * Copyright (C) 2011-2025 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -64,15 +64,19 @@ #endif #ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -extern int alloc_check_threshold, alloc_check_counter; -static inline int alloc_check() { +extern int alloc_check_threshold, alloc_check_counter, alloc_check_keep_failing; + +static inline int alloc_check(void) { if(alloc_check_threshold == INT32_MAX) return 0; else if(alloc_check_counter++ == alloc_check_threshold) return 1; - else + else if(alloc_check_keep_failing && (alloc_check_counter > alloc_check_threshold)) + return 1; + else { return 0; + } } #endif Modified: branches/OpenMPT-1.31/include/flac/include/share/compat.h ============================================================================== --- branches/OpenMPT-1.31/include/flac/include/share/compat.h Sat Feb 15 19:18:53 2025 (r22932) +++ branches/OpenMPT-1.31/include/flac/include/share/compat.h Sat Feb 15 19:20:56 2025 (r22933) @@ -1,5 +1,5 @@ /* libFLAC - Free Lossless Audio Codec library - * Copyright (C) 2012-2023 Xiph.Org Foundation + * Copyright (C) 2012-2025 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -63,8 +63,15 @@ #endif #endif #else +#ifndef HAVE_FSEEKO +#define fseeko fseek +#define ftello ftell +#define FLAC__off_t long +#define FLAC__OFF_T_MAX LONG_MAX +#else #define FLAC__off_t off_t -#define FLAC__OFF_T_MAX OFF_T_MAX +#define FLAC__OFF_T_MAX (sizeof(off_t) == sizeof(int64_t) ? INT64_MAX : sizeof(off_t) == sizeof(int32_t) ? INT32_MAX : -999999) +#endif #endif Modified: branches/OpenMPT-1.31/include/flac/include/share/endswap.h ============================================================================== --- branches/OpenMPT-1.31/include/flac/include/share/endswap.h Sat Feb 15 19:18:53 2025 (r22932) +++ branches/OpenMPT-1.31/include/flac/include/share/endswap.h Sat Feb 15 19:20:56 2025 (r22933) @@ -1,5 +1,5 @@ /* libFLAC - Free Lossless Audio Codec library - * Copyright (C) 2012-2023 Xiph.Org Foundation + * Copyright (C) 2012-2025 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: branches/OpenMPT-1.31/include/flac/include/share/macros.h ============================================================================== --- branches/OpenMPT-1.31/include/flac/include/share/macros.h Sat Feb 15 19:18:53 2025 (r22932) +++ branches/OpenMPT-1.31/include/flac/include/share/macros.h Sat Feb 15 19:20:56 2025 (r22933) @@ -1,5 +1,5 @@ /* libFLAC - Free Lossless Audio Codec library - * Copyright (C) 2013-2023 Xiph.Org Foundation + * Copyright (C) 2013-2025 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: branches/OpenMPT-1.31/include/flac/include/share/private.h ============================================================================== --- branches/OpenMPT-1.31/include/flac/include/share/private.h Sat Feb 15 19:18:53 2025 (r22932) +++ branches/OpenMPT-1.31/include/flac/include/share/private.h Sat Feb 15 19:20:56 2025 (r22933) @@ -1,5 +1,5 @@ /* libFLAC - Free Lossless Audio Codec library - * Copyright (C) 2013-2023 Xiph.Org Foundation + * Copyright (C) 2013-2025 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: branches/OpenMPT-1.31/include/flac/include/share/safe_str.h ============================================================================== --- branches/OpenMPT-1.31/include/flac/include/share/safe_str.h Sat Feb 15 19:18:53 2025 (r22932) +++ branches/OpenMPT-1.31/include/flac/include/share/safe_str.h Sat Feb 15 19:20:56 2025 (r22933) @@ -1,5 +1,5 @@ /* libFLAC - Free Lossless Audio Codec library - * Copyright (C) 2013-2023 Xiph.Org Foundation + * Copyright (C) 2013-2025 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: branches/OpenMPT-1.31/include/flac/include/share/win_utf8_io.h ============================================================================== --- branches/OpenMPT-1.31/include/flac/include/share/win_utf8_io.h Sat Feb 15 19:18:53 2025 (r22932) +++ branches/OpenMPT-1.31/include/flac/include/share/win_utf8_io.h Sat Feb 15 19:20:56 2025 (r22933) @@ -1,5 +1,5 @@ /* libFLAC - Free Lossless Audio Codec library - * Copyright (C) 2013-2023 Xiph.Org Foundation + * Copyright (C) 2013-2025 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: branches/OpenMPT-1.31/include/flac/src/libFLAC/bitmath.c ============================================================================== --- branches/OpenMPT-1.31/include/flac/src/libFLAC/bitmath.c Sat Feb 15 19:18:53 2025 (r22932) +++ branches/OpenMPT-1.31/include/flac/src/libFLAC/bitmath.c Sat Feb 15 19:20:56 2025 (r22933) @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2001-2009 Josh Coalson - * Copyright (C) 2011-2023 Xiph.Org Foundation + * Copyright (C) 2011-2025 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -71,3 +71,45 @@ v = (v < 0) ? (-(v+1)) : v; return FLAC__bitmath_ilog2_wide(v)+2; } + +/* An example of what FLAC__bitmath_extra_mulbits_unsigned() computes: + * + * extra_mulbits_unsigned( 0) = 0 + * extra_mulbits_unsigned( 1) = 0 + * extra_mulbits_unsigned( 2) = 1 + * extra_mulbits_unsigned( 3) = 2 + * extra_mulbits_unsigned( 4) = 2 + * extra_mulbits_unsigned( 5) = 3 + * extra_mulbits_unsigned( 6) = 3 + * extra_mulbits_unsigned( 7) = 3 + * extra_mulbits_unsigned( 8) = 3 + * extra_mulbits_unsigned( 9) = 4 + * extra_mulbits_unsigned(10) = 4 + * extra_mulbits_unsigned(11) = 4 + * extra_mulbits_unsigned(12) = 4 + * extra_mulbits_unsigned(13) = 4 + * extra_mulbits_unsigned(14) = 4 + * extra_mulbits_unsigned(15) = 4 + * extra_mulbits_unsigned(16) = 4 + * extra_mulbits_unsigned(17) = 5 + * extra_mulbits_unsigned(18) = 5 + * + * The intent of this is to calculate how many extra bits multiplication + * by a certain number requires. So, if a signal fits in a certain number + * of bits (for example 16) than multiplying by a number (for example 1024) + * grows that storage requirement (to 26 in this example). In effect this is + * is the log2 rounded up. + */ +uint32_t FLAC__bitmath_extra_mulbits_unsigned(FLAC__uint32 v) +{ + uint32_t ilog2; + if(v == 0) + return 0; + ilog2 = FLAC__bitmath_ilog2(v); + if(((v >> ilog2) << ilog2) == v) + /* v is power of 2 */ + return ilog2; + else + /* v is not a power of 2, return one higher */ + return ilog2 + 1; +} Modified: branches/OpenMPT-1.31/include/flac/src/libFLAC/bitreader.c ============================================================================== --- branches/OpenMPT-1.31/include/flac/src/libFLAC/bitreader.c Sat Feb 15 19:18:53 2025 (r22932) +++ branches/OpenMPT-1.31/include/flac/src/libFLAC/bitreader.c Sat Feb 15 19:20:56 2025 (r22933) @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2000-2009 Josh Coalson - * Copyright (C) 2011-2023 Xiph.Org Foundation + * Copyright (C) 2011-2025 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -939,23 +939,23 @@ v = x; i = 0; } - else if(x & 0xC0 && !(x & 0x20)) { /* 110xxxxx */ + else if((x & 0xE0) == 0xC0) { /* 110xxxxx */ v = x & 0x1F; i = 1; } - else if(x & 0xE0 && !(x & 0x10)) { /* 1110xxxx */ + else if((x & 0xF0) == 0xE0) { /* 1110xxxx */ v = x & 0x0F; i = 2; } - else if(x & 0xF0 && !(x & 0x08)) { /* 11110xxx */ + else if((x & 0xF8) == 0xF0) { /* 11110xxx */ v = x & 0x07; i = 3; } - else if(x & 0xF8 && !(x & 0x04)) { /* 111110xx */ + else if((x & 0xFC) == 0xF8) { /* 111110xx */ v = x & 0x03; i = 4; } - else if(x & 0xFC && !(x & 0x02)) { /* 1111110x */ + else if((x & 0xFE) == 0xFC) { /* 1111110x */ v = x & 0x01; i = 5; } @@ -994,27 +994,27 @@ v = x; i = 0; } - else if(x & 0xC0 && !(x & 0x20)) { /* 110xxxxx */ + else if((x & 0xE0) == 0xC0) { /* 110xxxxx */ v = x & 0x1F; i = 1; } - else if(x & 0xE0 && !(x & 0x10)) { /* 1110xxxx */ + else if((x & 0xF0) == 0xE0) { /* 1110xxxx */ v = x & 0x0F; i = 2; } - else if(x & 0xF0 && !(x & 0x08)) { /* 11110xxx */ + else if((x & 0xF8) == 0xF0) { /* 11110xxx */ v = x & 0x07; i = 3; } - else if(x & 0xF8 && !(x & 0x04)) { /* 111110xx */ + else if((x & 0xFC) == 0xF8) { /* 111110xx */ v = x & 0x03; i = 4; } - else if(x & 0xFC && !(x & 0x02)) { /* 1111110x */ + else if((x & 0xFE) == 0xFC) { /* 1111110x */ v = x & 0x01; i = 5; } - else if(x & 0xFE && !(x & 0x01)) { /* 11111110 */ + else if(x == 0xFE) { /* 11111110 */ v = 0; i = 6; } Modified: branches/OpenMPT-1.31/include/flac/src/libFLAC/bitwriter.c ============================================================================== --- branches/OpenMPT-1.31/include/flac/src/libFLAC/bitwriter.c Sat Feb 15 19:18:53 2025 (r22932) +++ branches/OpenMPT-1.31/include/flac/src/libFLAC/bitwriter.c Sat Feb 15 19:20:56 2025 (r22933) @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2000-2009 Josh Coalson - * Copyright (C) 2011-2023 Xiph.Org Foundation + * Copyright (C) 2011-2025 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -89,8 +89,8 @@ * next one. */ static const uint32_t FLAC__BITWRITER_DEFAULT_CAPACITY = 32768u / sizeof(bwword); /* size in words */ -/* When growing, increment 4K at a time */ -static const uint32_t FLAC__BITWRITER_DEFAULT_INCREMENT = 4096u / sizeof(bwword); /* size in words */ +/* When growing, increment with 1/4th at a time */ +static const uint32_t FLAC__BITWRITER_DEFAULT_GROW_FRACTION = 2; /* means grow by >> 2 (1/4th) of current size */ #define FLAC__WORDS_TO_BITS(words) ((words) * FLAC__BITS_PER_WORD) #define FLAC__TOTAL_BITS(bw) (FLAC__WORDS_TO_BITS((bw)->words) + (bw)->bits) @@ -131,11 +131,11 @@ * To prevent chrashing, give up */ return false; - /* round up capacity increase to the nearest FLAC__BITWRITER_DEFAULT_INCREMENT */ - if((new_capacity - bw->capacity) % FLAC__BITWRITER_DEFAULT_INCREMENT) - new_capacity += FLAC__BITWRITER_DEFAULT_INCREMENT - ((new_capacity - bw->capacity) % FLAC__BITWRITER_DEFAULT_INCREMENT); + /* As reallocation can be quite expensive, grow exponentially */ + if((new_capacity - bw->capacity) < (bw->capacity >> FLAC__BITWRITER_DEFAULT_GROW_FRACTION)) + new_capacity = bw->capacity + (bw->capacity >> FLAC__BITWRITER_DEFAULT_GROW_FRACTION); + /* make sure we got everything right */ - FLAC__ASSERT(0 == (new_capacity - bw->capacity) % FLAC__BITWRITER_DEFAULT_INCREMENT); FLAC__ASSERT(new_capacity > bw->capacity); FLAC__ASSERT(new_capacity >= bw->words + ((bw->bits + bits_to_add + FLAC__BITS_PER_WORD - 1) / FLAC__BITS_PER_WORD)); Modified: branches/OpenMPT-1.31/include/flac/src/libFLAC/cpu.c ============================================================================== --- branches/OpenMPT-1.31/include/flac/src/libFLAC/cpu.c Sat Feb 15 19:18:53 2025 (r22932) +++ branches/OpenMPT-1.31/include/flac/src/libFLAC/cpu.c Sat Feb 15 19:20:56 2025 (r22933) @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2001-2009 Josh Coalson - * Copyright (C) 2011-2023 Xiph.Org Foundation + * Copyright (C) 2011-2025 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -45,14 +45,6 @@ #include <cpuid.h> /* for __get_cpuid() and __get_cpuid_max() */ #endif -#ifndef NDEBUG -#include <stdio.h> -#define dfprintf fprintf -#else -/* This is bad practice, it should be a static void empty function */ -#define dfprintf(file, format, ...) -#endif - #if defined(HAVE_SYS_AUXV_H) #include <sys/auxv.h> #endif @@ -190,36 +182,12 @@ info->x86.bmi2 = (flags_ebx & FLAC__CPUINFO_X86_CPUID_BMI2 ) ? true : false; } -#if defined FLAC__CPU_IA32 - dfprintf(stderr, "CPU info (IA-32):\n"); -#else - dfprintf(stderr, "CPU info (x86-64):\n"); -#endif - dfprintf(stderr, " CMOV ....... %c\n", info->x86.cmov ? 'Y' : 'n'); - dfprintf(stderr, " MMX ........ %c\n", info->x86.mmx ? 'Y' : 'n'); - dfprintf(stderr, " SSE ........ %c\n", info->x86.sse ? 'Y' : 'n'); - dfprintf(stderr, " SSE2 ....... %c\n", info->x86.sse2 ? 'Y' : 'n'); - dfprintf(stderr, " SSE3 ....... %c\n", info->x86.sse3 ? 'Y' : 'n'); - dfprintf(stderr, " SSSE3 ...... %c\n", info->x86.ssse3 ? 'Y' : 'n'); - dfprintf(stderr, " SSE41 ...... %c\n", info->x86.sse41 ? 'Y' : 'n'); - dfprintf(stderr, " SSE42 ...... %c\n", info->x86.sse42 ? 'Y' : 'n'); - - if (FLAC__AVX_SUPPORTED) { - dfprintf(stderr, " AVX ........ %c\n", info->x86.avx ? 'Y' : 'n'); - dfprintf(stderr, " FMA ........ %c\n", info->x86.fma ? 'Y' : 'n'); - dfprintf(stderr, " AVX2 ....... %c\n", info->x86.avx2 ? 'Y' : 'n'); - dfprintf(stderr, " BMI2 ....... %c\n", info->x86.bmi2 ? 'Y' : 'n'); - } - /* * now have to check for OS support of AVX instructions */ if (FLAC__AVX_SUPPORTED && info->x86.avx && x86_osxsave && (cpu_xgetbv_x86() & 0x6) == 0x6) { os_avx = true; } - if (os_avx) { - dfprintf(stderr, " AVX OS sup . %c\n", info->x86.avx ? 'Y' : 'n'); - } if (!os_avx) { /* no OS AVX support */ info->x86.avx = false; Modified: branches/OpenMPT-1.31/include/flac/src/libFLAC/crc.c ============================================================================== --- branches/OpenMPT-1.31/include/flac/src/libFLAC/crc.c Sat Feb 15 19:18:53 2025 (r22932) +++ branches/OpenMPT-1.31/include/flac/src/libFLAC/crc.c Sat Feb 15 19:20:56 2025 (r22933) @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2000-2009 Josh Coalson - * Copyright (C) 2011-2023 Xiph.Org Foundation + * Copyright (C) 2011-2025 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: branches/OpenMPT-1.31/include/flac/src/libFLAC/fixed.c ============================================================================== --- branches/OpenMPT-1.31/include/flac/src/libFLAC/fixed.c Sat Feb 15 19:18:53 2025 (r22932) +++ branches/OpenMPT-1.31/include/flac/src/libFLAC/fixed.c Sat Feb 15 19:20:56 2025 (r22933) @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2000-2009 Josh Coalson - * Copyright (C) 2011-2023 Xiph.Org Foundation + * Copyright (C) 2011-2025 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -357,7 +357,7 @@ if(order_##macro_order##_is_valid && total_error_##macro_order < smallest_error) { \ order = macro_order; \ smallest_error = total_error_##macro_order ; \ - residual_bits_per_sample[ macro_order ] = (float)((total_error_0 > 0) ? log(M_LN2 * (double)total_error_0 / (double)data_len) / M_LN2 : 0.0); \ + residual_bits_per_sample[ macro_order ] = (float)((total_error_##macro_order > 0) ? log(M_LN2 * (double)total_error_##macro_order / (double)data_len) / M_LN2 : 0.0); \ } \ else \ residual_bits_per_sample[ macro_order ] = 34.0f; Modified: branches/OpenMPT-1.31/include/flac/src/libFLAC/fixed_intrin_a... [truncated message content] |
|
From: <sv...@op...> - 2025-02-15 18:19:00
|
Author: manx Date: Sat Feb 15 19:18:53 2025 New Revision: 22932 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22932 Log: [Mod] libopenmpt: Bump prerel version. Modified: branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.h branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.mk Modified: branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.h ============================================================================== --- branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.h Sat Feb 15 19:18:36 2025 (r22931) +++ branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.h Sat Feb 15 19:18:53 2025 (r22932) @@ -21,7 +21,7 @@ /*! \brief libopenmpt patch version number */ #define OPENMPT_API_VERSION_PATCH 49 /*! \brief libopenmpt pre-release tag */ -#define OPENMPT_API_VERSION_PREREL "-pre.0" +#define OPENMPT_API_VERSION_PREREL "-pre.1" /*! \brief libopenmpt pre-release flag */ #define OPENMPT_API_VERSION_IS_PREREL 1 Modified: branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.mk ============================================================================== --- branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.mk Sat Feb 15 19:18:36 2025 (r22931) +++ branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.mk Sat Feb 15 19:18:53 2025 (r22932) @@ -1,7 +1,7 @@ LIBOPENMPT_VERSION_MAJOR=0 LIBOPENMPT_VERSION_MINOR=4 LIBOPENMPT_VERSION_PATCH=49 -LIBOPENMPT_VERSION_PREREL=-pre.0 +LIBOPENMPT_VERSION_PREREL=-pre.1 LIBOPENMPT_LTVER_CURRENT=1 LIBOPENMPT_LTVER_REVISION=49 |
|
From: <sv...@op...> - 2025-02-15 18:18:49
|
Author: manx Date: Sat Feb 15 19:18:36 2025 New Revision: 22931 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22931 Log: [Mod] libopenmpt: Bump prerel version. Modified: trunk/OpenMPT/libopenmpt/libopenmpt_version.h trunk/OpenMPT/libopenmpt/libopenmpt_version.mk Modified: trunk/OpenMPT/libopenmpt/libopenmpt_version.h ============================================================================== --- trunk/OpenMPT/libopenmpt/libopenmpt_version.h Sat Feb 15 19:18:00 2025 (r22930) +++ trunk/OpenMPT/libopenmpt/libopenmpt_version.h Sat Feb 15 19:18:36 2025 (r22931) @@ -23,7 +23,7 @@ /*! \brief libopenmpt patch version number */ #define OPENMPT_API_VERSION_PATCH 0 /*! \brief libopenmpt pre-release tag */ -#define OPENMPT_API_VERSION_PREREL "-pre.13" +#define OPENMPT_API_VERSION_PREREL "-pre.14" /*! \brief libopenmpt pre-release flag */ #define OPENMPT_API_VERSION_IS_PREREL 1 Modified: trunk/OpenMPT/libopenmpt/libopenmpt_version.mk ============================================================================== --- trunk/OpenMPT/libopenmpt/libopenmpt_version.mk Sat Feb 15 19:18:00 2025 (r22930) +++ trunk/OpenMPT/libopenmpt/libopenmpt_version.mk Sat Feb 15 19:18:36 2025 (r22931) @@ -1,7 +1,7 @@ LIBOPENMPT_VERSION_MAJOR=0 LIBOPENMPT_VERSION_MINOR=8 LIBOPENMPT_VERSION_PATCH=0 -LIBOPENMPT_VERSION_PREREL=-pre.13 +LIBOPENMPT_VERSION_PREREL=-pre.14 LIBOPENMPT_LTVER_CURRENT=5 LIBOPENMPT_LTVER_REVISION=0 |
|
From: <sv...@op...> - 2025-02-15 18:18:07
|
Author: manx Date: Sat Feb 15 19:18:00 2025 New Revision: 22930 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22930 Log: Revert r22897: Merged revision(s) 22897 from branches/OpenMPT-1.28: Partial merge of r22895. Merged revision(s) 22895 from trunk/OpenMPT: [Fix] libmodplug-0.8.8.5: Fix typo in linker option --no-undefined. ........ ........ Modified: branches/OpenMPT-1.28/ (props changed) branches/OpenMPT-1.28/build/autotools/Makefile.am Modified: branches/OpenMPT-1.28/build/autotools/Makefile.am ============================================================================== --- branches/OpenMPT-1.28/build/autotools/Makefile.am Sat Feb 15 19:17:03 2025 (r22929) +++ branches/OpenMPT-1.28/build/autotools/Makefile.am Sat Feb 15 19:18:00 2025 (r22930) @@ -402,7 +402,7 @@ if ENABLE_LIBOPENMPT_MODPLUG lib_LTLIBRARIES += libopenmpt_modplug.la -libopenmpt_modplug_la_LDFLAGS = -version-info 1:0:0 --no-undefined +libopenmpt_modplug_la_LDFLAGS = -version-info 1:0:0 -no-undefined libopenmpt_modplug_la_CPPFLAGS = $(MINGWSTDTHREADS_CPPFLAGS) -I$(srcdir)/ libopenmpt_modplug_la_CXXFLAGS = libopenmpt_modplug_la_CFLAGS = @@ -415,7 +415,7 @@ if ENABLE_LIBMODPLUG pkgconfig_DATA += libmodplug/libmodplug.pc lib_LTLIBRARIES += libmodplug.la -libmodplug_la_LDFLAGS = -version-info 1:0:0 --no-undefined +libmodplug_la_LDFLAGS = -version-info 1:0:0 -no-undefined nobase_include_HEADERS += libmodplug/modplug.h libmodplug/sndfile.h libmodplug/stdafx.h libmodplug_la_CPPFLAGS = $(MINGWSTDTHREADS_CPPFLAGS) -I$(srcdir)/ libmodplug_la_CXXFLAGS = |
|
From: <sv...@op...> - 2025-02-15 18:17:10
|
Author: manx Date: Sat Feb 15 19:17:03 2025 New Revision: 22929 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22929 Log: Revert r22895: Merged revision(s) 22895 from trunk/OpenMPT: [Fix] libmodplug-0.8.8.5: Fix typo in linker option --no-undefined. [Mod] libmodplug-0.8.8.5: Version is now 0.8.8.5-openmpt2. ........ Modified: trunk/OpenMPT/contrib/libmodplug-0.8.8.5/Makefile.am trunk/OpenMPT/contrib/libmodplug-0.8.8.5/configure.ac Modified: trunk/OpenMPT/contrib/libmodplug-0.8.8.5/Makefile.am ============================================================================== --- trunk/OpenMPT/contrib/libmodplug-0.8.8.5/Makefile.am Sat Feb 15 19:16:29 2025 (r22928) +++ trunk/OpenMPT/contrib/libmodplug-0.8.8.5/Makefile.am Sat Feb 15 19:17:03 2025 (r22929) @@ -21,7 +21,7 @@ if ENABLE_LIBOPENMPT_MODPLUG lib_LTLIBRARIES += libopenmpt_modplug.la -libopenmpt_modplug_la_LDFLAGS = -version-info 1:0:0 --no-undefined +libopenmpt_modplug_la_LDFLAGS = -version-info 1:0:0 -no-undefined libopenmpt_modplug_la_CPPFLAGS = -I$(srcdir)/ $(LIBOPENMPT_CPPFLAGS) libopenmpt_modplug_la_CXXFLAGS = $(LIBOPENMPT_CFLAGS) libopenmpt_modplug_la_CFLAGS = $(LIBOPENMPT_CFLAGS) @@ -34,7 +34,7 @@ if ENABLE_LIBMODPLUG pkgconfig_DATA += libmodplug.pc lib_LTLIBRARIES += libmodplug.la -libmodplug_la_LDFLAGS = -version-info 1:0:0 --no-undefined +libmodplug_la_LDFLAGS = -version-info 1:0:0 -no-undefined nobase_include_HEADERS += libmodplug/modplug.h libmodplug/sndfile.h libmodplug/stdafx.h libmodplug_la_CPPFLAGS = -I$(srcdir)/ $(LIBOPENMPT_CPPFLAGS) libmodplug_la_CXXFLAGS = $(LIBOPENMPT_CFLAGS) Modified: trunk/OpenMPT/contrib/libmodplug-0.8.8.5/configure.ac ============================================================================== --- trunk/OpenMPT/contrib/libmodplug-0.8.8.5/configure.ac Sat Feb 15 19:16:29 2025 (r22928) +++ trunk/OpenMPT/contrib/libmodplug-0.8.8.5/configure.ac Sat Feb 15 19:17:03 2025 (r22929) @@ -1,4 +1,4 @@ -AC_INIT([libopenmpt-modplug], [0.8.8.5-openmpt2], [https://bugs.openmpt.org/], [libopenmpt-modplug], [https://lib.openmpt.org/]) +AC_INIT([libopenmpt-modplug], [0.8.8.5-openmpt1], [https://bugs.openmpt.org/], [libopenmpt-modplug], [https://lib.openmpt.org/]) AC_PREREQ([2.68]) AC_CONFIG_MACRO_DIR([m4]) |
|
From: <sv...@op...> - 2025-02-15 18:16:42
|
Author: manx Date: Sat Feb 15 19:16:29 2025 New Revision: 22928 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22928 Log: Revert r22894: Merged revision(s) 22894 from trunk/OpenMPT: [Fix] libmodplug-0.8.9.0: Fix typo in linker option --no-undefined. [Mod] libmodplug-0.8.9.0: Version is now 0.8.9.0-openmpt2. ........ Modified: trunk/OpenMPT/contrib/libmodplug-0.8.9.0/Makefile.am trunk/OpenMPT/contrib/libmodplug-0.8.9.0/configure.ac Modified: trunk/OpenMPT/contrib/libmodplug-0.8.9.0/Makefile.am ============================================================================== --- trunk/OpenMPT/contrib/libmodplug-0.8.9.0/Makefile.am Sat Feb 15 19:14:59 2025 (r22927) +++ trunk/OpenMPT/contrib/libmodplug-0.8.9.0/Makefile.am Sat Feb 15 19:16:29 2025 (r22928) @@ -21,7 +21,7 @@ if ENABLE_LIBOPENMPT_MODPLUG lib_LTLIBRARIES += libopenmpt_modplug.la -libopenmpt_modplug_la_LDFLAGS = -version-info 1:0:0 --no-undefined +libopenmpt_modplug_la_LDFLAGS = -version-info 1:0:0 -no-undefined libopenmpt_modplug_la_CPPFLAGS = -I$(srcdir)/ $(LIBOPENMPT_CPPFLAGS) libopenmpt_modplug_la_CXXFLAGS = $(LIBOPENMPT_CFLAGS) libopenmpt_modplug_la_CFLAGS = $(LIBOPENMPT_CFLAGS) @@ -34,7 +34,7 @@ if ENABLE_LIBMODPLUG pkgconfig_DATA += libmodplug.pc lib_LTLIBRARIES += libmodplug.la -libmodplug_la_LDFLAGS = -version-info 1:0:0 --no-undefined +libmodplug_la_LDFLAGS = -version-info 1:0:0 -no-undefined nobase_include_HEADERS += libmodplug/modplug.h libmodplug/sndfile.h libmodplug/stdafx.h libmodplug_la_CPPFLAGS = -I$(srcdir)/ $(LIBOPENMPT_CPPFLAGS) libmodplug_la_CXXFLAGS = $(LIBOPENMPT_CFLAGS) Modified: trunk/OpenMPT/contrib/libmodplug-0.8.9.0/configure.ac ============================================================================== --- trunk/OpenMPT/contrib/libmodplug-0.8.9.0/configure.ac Sat Feb 15 19:14:59 2025 (r22927) +++ trunk/OpenMPT/contrib/libmodplug-0.8.9.0/configure.ac Sat Feb 15 19:16:29 2025 (r22928) @@ -1,4 +1,4 @@ -AC_INIT([libopenmpt-modplug], [0.8.9.0-openmpt2], [https://bugs.openmpt.org/], [libopenmpt-modplug], [https://lib.openmpt.org/]) +AC_INIT([libopenmpt-modplug], [0.8.9.0-openmpt1], [https://bugs.openmpt.org/], [libopenmpt-modplug], [https://lib.openmpt.org/]) AC_PREREQ([2.68]) AC_CONFIG_MACRO_DIR([m4]) |
|
From: <sv...@op...> - 2025-02-15 18:15:07
|
Author: manx Date: Sat Feb 15 19:14:59 2025 New Revision: 22927 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22927 Log: Merged revision(s) 22923 from trunk/OpenMPT: [Fix] build: Autotools: In libtool, ld option --no-undefined is called -no-undefined. ........ Modified: branches/OpenMPT-1.28/ (props changed) branches/OpenMPT-1.28/build/autotools/Makefile.am Modified: branches/OpenMPT-1.28/build/autotools/Makefile.am ============================================================================== --- branches/OpenMPT-1.28/build/autotools/Makefile.am Sat Feb 15 19:14:04 2025 (r22926) +++ branches/OpenMPT-1.28/build/autotools/Makefile.am Sat Feb 15 19:14:59 2025 (r22927) @@ -363,7 +363,7 @@ pkgconfig_DATA += libopenmpt/libopenmpt.pc lib_LTLIBRARIES += libopenmpt.la -libopenmpt_la_LDFLAGS = -version-info $(LIBOPENMPT_LTVER_CURRENT):$(LIBOPENMPT_LTVER_REVISION):$(LIBOPENMPT_LTVER_AGE) --no-undefined +libopenmpt_la_LDFLAGS = -version-info $(LIBOPENMPT_LTVER_CURRENT):$(LIBOPENMPT_LTVER_REVISION):$(LIBOPENMPT_LTVER_AGE) -no-undefined nobase_include_HEADERS += libopenmpt/libopenmpt.h nobase_include_HEADERS += libopenmpt/libopenmpt.hpp nobase_include_HEADERS += libopenmpt/libopenmpt_version.h |
|
From: <sv...@op...> - 2025-02-15 18:14:10
|
Author: manx Date: Sat Feb 15 19:14:04 2025 New Revision: 22926 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22926 Log: Merged revision(s) 22923 from trunk/OpenMPT: [Fix] build: Autotools: In libtool, ld option --no-undefined is called -no-undefined. ........ Modified: branches/OpenMPT-1.29/ (props changed) branches/OpenMPT-1.29/build/autotools/Makefile.am Modified: branches/OpenMPT-1.29/build/autotools/Makefile.am ============================================================================== --- branches/OpenMPT-1.29/build/autotools/Makefile.am Sat Feb 15 19:13:45 2025 (r22925) +++ branches/OpenMPT-1.29/build/autotools/Makefile.am Sat Feb 15 19:14:04 2025 (r22926) @@ -371,7 +371,7 @@ pkgconfig_DATA += libopenmpt/libopenmpt.pc lib_LTLIBRARIES += libopenmpt.la -libopenmpt_la_LDFLAGS = -version-info $(LIBOPENMPT_LTVER_CURRENT):$(LIBOPENMPT_LTVER_REVISION):$(LIBOPENMPT_LTVER_AGE) --no-undefined +libopenmpt_la_LDFLAGS = -version-info $(LIBOPENMPT_LTVER_CURRENT):$(LIBOPENMPT_LTVER_REVISION):$(LIBOPENMPT_LTVER_AGE) -no-undefined nobase_include_HEADERS += libopenmpt/libopenmpt.h nobase_include_HEADERS += libopenmpt/libopenmpt.hpp nobase_include_HEADERS += libopenmpt/libopenmpt_version.h |
|
From: <sv...@op...> - 2025-02-15 18:13:59
|
Author: manx Date: Sat Feb 15 19:13:45 2025 New Revision: 22925 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22925 Log: Merged revision(s) 22923 from trunk/OpenMPT: [Fix] build: Autotools: In libtool, ld option --no-undefined is called -no-undefined. ........ Modified: branches/OpenMPT-1.30/ (props changed) branches/OpenMPT-1.30/build/autotools/Makefile.am Modified: branches/OpenMPT-1.30/build/autotools/Makefile.am ============================================================================== --- branches/OpenMPT-1.30/build/autotools/Makefile.am Sat Feb 15 19:13:23 2025 (r22924) +++ branches/OpenMPT-1.30/build/autotools/Makefile.am Sat Feb 15 19:13:45 2025 (r22925) @@ -512,7 +512,7 @@ pkgconfig_DATA += libopenmpt/libopenmpt.pc lib_LTLIBRARIES += libopenmpt.la -libopenmpt_la_LDFLAGS = -version-info $(LIBOPENMPT_LTVER_CURRENT):$(LIBOPENMPT_LTVER_REVISION):$(LIBOPENMPT_LTVER_AGE) --no-undefined +libopenmpt_la_LDFLAGS = -version-info $(LIBOPENMPT_LTVER_CURRENT):$(LIBOPENMPT_LTVER_REVISION):$(LIBOPENMPT_LTVER_AGE) -no-undefined nobase_include_HEADERS += libopenmpt/libopenmpt.h nobase_include_HEADERS += libopenmpt/libopenmpt.hpp nobase_include_HEADERS += libopenmpt/libopenmpt_version.h |
|
From: <sv...@op...> - 2025-02-15 18:13:36
|
Author: manx Date: Sat Feb 15 19:13:23 2025 New Revision: 22924 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22924 Log: Merged revision(s) 22923 from trunk/OpenMPT: [Fix] build: Autotools: In libtool, ld option --no-undefined is called -no-undefined. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/build/autotools/Makefile.am Modified: branches/OpenMPT-1.31/build/autotools/Makefile.am ============================================================================== --- branches/OpenMPT-1.31/build/autotools/Makefile.am Sat Feb 15 19:13:02 2025 (r22923) +++ branches/OpenMPT-1.31/build/autotools/Makefile.am Sat Feb 15 19:13:23 2025 (r22924) @@ -546,7 +546,7 @@ pkgconfig_DATA += libopenmpt/libopenmpt.pc lib_LTLIBRARIES += libopenmpt.la -libopenmpt_la_LDFLAGS = -version-info $(LIBOPENMPT_LTVER_CURRENT):$(LIBOPENMPT_LTVER_REVISION):$(LIBOPENMPT_LTVER_AGE) --no-undefined +libopenmpt_la_LDFLAGS = -version-info $(LIBOPENMPT_LTVER_CURRENT):$(LIBOPENMPT_LTVER_REVISION):$(LIBOPENMPT_LTVER_AGE) -no-undefined includelibopenmpt_HEADERS += libopenmpt/libopenmpt.h includelibopenmpt_HEADERS += libopenmpt/libopenmpt.hpp includelibopenmpt_HEADERS += libopenmpt/libopenmpt_version.h |
|
From: <sv...@op...> - 2025-02-15 18:13:14
|
Author: manx Date: Sat Feb 15 19:13:02 2025 New Revision: 22923 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22923 Log: [Fix] build: Autotools: In libtool, ld option --no-undefined is called -no-undefined. Modified: trunk/OpenMPT/build/autotools/Makefile.am Modified: trunk/OpenMPT/build/autotools/Makefile.am ============================================================================== --- trunk/OpenMPT/build/autotools/Makefile.am Sat Feb 15 18:54:33 2025 (r22922) +++ trunk/OpenMPT/build/autotools/Makefile.am Sat Feb 15 19:13:02 2025 (r22923) @@ -583,7 +583,7 @@ pkgconfig_DATA += libopenmpt/libopenmpt.pc lib_LTLIBRARIES += libopenmpt.la -libopenmpt_la_LDFLAGS = -version-info $(LIBOPENMPT_LTVER_CURRENT):$(LIBOPENMPT_LTVER_REVISION):$(LIBOPENMPT_LTVER_AGE) --no-undefined +libopenmpt_la_LDFLAGS = -version-info $(LIBOPENMPT_LTVER_CURRENT):$(LIBOPENMPT_LTVER_REVISION):$(LIBOPENMPT_LTVER_AGE) -no-undefined includelibopenmpt_HEADERS += libopenmpt/libopenmpt.h includelibopenmpt_HEADERS += libopenmpt/libopenmpt.hpp includelibopenmpt_HEADERS += libopenmpt/libopenmpt_version.h |
Author: manx Date: Sat Feb 15 18:54:33 2025 New Revision: 22922 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22922 Log: [Var] Regenerate project files. Modified: trunk/OpenMPT/build/vs2017winxp/ext/flac.vcxproj trunk/OpenMPT/build/vs2017winxpansi/ext/flac.vcxproj trunk/OpenMPT/build/vs2019win7/ext/flac.vcxproj trunk/OpenMPT/build/vs2022win10/ext/flac.vcxproj trunk/OpenMPT/build/vs2022win10clang/ext/flac.vcxproj trunk/OpenMPT/build/vs2022win10uwp/ext/flac.vcxproj trunk/OpenMPT/build/vs2022win7/ext/flac.vcxproj trunk/OpenMPT/build/vs2022win8/ext/flac.vcxproj trunk/OpenMPT/build/vs2022win81/ext/flac.vcxproj Modified: trunk/OpenMPT/build/vs2017winxp/ext/flac.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/ext/flac.vcxproj Sat Feb 15 18:54:09 2025 (r22921) +++ trunk/OpenMPT/build/vs2017winxp/ext/flac.vcxproj Sat Feb 15 18:54:33 2025 (r22922) @@ -294,7 +294,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC__NO_DLL;%(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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> @@ -314,7 +314,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC__NO_DLL;%(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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> @@ -333,7 +333,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC__NO_DLL;%(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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> @@ -357,7 +357,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC__NO_DLL;%(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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> @@ -380,7 +380,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC__NO_DLL;%(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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> @@ -405,7 +405,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC__NO_DLL;%(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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> @@ -429,7 +429,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC_API_EXPORTS;%(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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> @@ -450,7 +450,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC_API_EXPORTS;%(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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> @@ -470,7 +470,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC_API_EXPORTS;%(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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> @@ -496,7 +496,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC_API_EXPORTS;%(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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> @@ -521,7 +521,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC_API_EXPORTS;%(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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> @@ -548,7 +548,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC_API_EXPORTS;%(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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> Modified: trunk/OpenMPT/build/vs2017winxpansi/ext/flac.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/ext/flac.vcxproj Sat Feb 15 18:54:09 2025 (r22921) +++ trunk/OpenMPT/build/vs2017winxpansi/ext/flac.vcxproj Sat Feb 15 18:54:33 2025 (r22922) @@ -294,7 +294,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC__NO_DLL;%(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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> @@ -314,7 +314,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC__NO_DLL;%(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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> @@ -333,7 +333,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC__NO_DLL;%(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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> @@ -357,7 +357,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC__NO_DLL;%(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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> @@ -380,7 +380,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC__NO_DLL;%(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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> @@ -405,7 +405,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC__NO_DLL;%(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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> @@ -429,7 +429,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC_API_EXPORTS;%(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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> @@ -450,7 +450,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC_API_EXPORTS;%(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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> @@ -470,7 +470,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC_API_EXPORTS;%(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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> @@ -496,7 +496,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC_API_EXPORTS;%(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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> @@ -521,7 +521,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC_API_EXPORTS;%(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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> @@ -548,7 +548,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC_API_EXPORTS;%(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;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> Modified: trunk/OpenMPT/build/vs2019win7/ext/flac.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/ext/flac.vcxproj Sat Feb 15 18:54:09 2025 (r22921) +++ trunk/OpenMPT/build/vs2019win7/ext/flac.vcxproj Sat Feb 15 18:54:33 2025 (r22922) @@ -269,7 +269,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0601;NTDDI_VERSION=0x06010000;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0601;NTDDI_VERSION=0x06010000;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> @@ -291,7 +291,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0601;NTDDI_VERSION=0x06010000;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0601;NTDDI_VERSION=0x06010000;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> @@ -313,7 +313,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0601;NTDDI_VERSION=0x06010000;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0601;NTDDI_VERSION=0x06010000;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> @@ -340,7 +340,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0601;NTDDI_VERSION=0x06010000;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0601;NTDDI_VERSION=0x06010000;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> @@ -366,7 +366,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0601;NTDDI_VERSION=0x06010000;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0601;NTDDI_VERSION=0x06010000;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> @@ -394,7 +394,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0601;NTDDI_VERSION=0x06010000;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0601;NTDDI_VERSION=0x06010000;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> @@ -421,7 +421,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0601;NTDDI_VERSION=0x06010000;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0601;NTDDI_VERSION=0x06010000;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> @@ -444,7 +444,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0601;NTDDI_VERSION=0x06010000;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0601;NTDDI_VERSION=0x06010000;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> @@ -467,7 +467,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0601;NTDDI_VERSION=0x06010000;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0601;NTDDI_VERSION=0x06010000;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> @@ -496,7 +496,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0601;NTDDI_VERSION=0x06010000;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0601;NTDDI_VERSION=0x06010000;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> @@ -524,7 +524,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0601;NTDDI_VERSION=0x06010000;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0601;NTDDI_VERSION=0x06010000;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> @@ -554,7 +554,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0601;NTDDI_VERSION=0x06010000;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0601;NTDDI_VERSION=0x06010000;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> Modified: trunk/OpenMPT/build/vs2022win10/ext/flac.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10/ext/flac.vcxproj Sat Feb 15 18:54:09 2025 (r22921) +++ trunk/OpenMPT/build/vs2022win10/ext/flac.vcxproj Sat Feb 15 18:54:33 2025 (r22922) @@ -680,7 +680,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> @@ -703,7 +703,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> @@ -726,7 +726,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Disabled</Optimization> @@ -748,7 +748,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Disabled</Optimization> @@ -770,7 +770,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000E;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000E;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Disabled</Optimization> @@ -792,7 +792,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> @@ -820,7 +820,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> @@ -847,7 +847,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> @@ -874,7 +874,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> @@ -901,7 +901,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000E;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000E;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> @@ -928,7 +928,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.4.3";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0A00;NTDDI_VERSION=0x0A00000C;FLAC__HAS_OGG=1;PACKAGE_VERSION="1.5.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\include\ogg\include;..\..\..\include\flac\include;..\..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> @@ -957,7 +957,7 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_S... [truncated message content] |
3 messages has been excluded from this view by a project administrator.
