Menu
▾
▴
modplug-svn-commit — OpenMPT subversion commit notifications
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
(1) |
Apr
(1) |
May
|
Jun
(1) |
Jul
|
Aug
(10) |
Sep
|
Oct
|
Nov
|
Dec
(3) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(1) |
Feb
(2) |
Mar
(3) |
Apr
(2) |
May
(10) |
Jun
(2) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
(3) |
Dec
|
| 2008 |
Jan
(6) |
Feb
(4) |
Mar
(5) |
Apr
(2) |
May
(1) |
Jun
(1) |
Jul
(4) |
Aug
(6) |
Sep
(2) |
Oct
(9) |
Nov
(1) |
Dec
(4) |
| 2009 |
Jan
(9) |
Feb
(2) |
Mar
(2) |
Apr
(2) |
May
(6) |
Jun
(18) |
Jul
(33) |
Aug
(39) |
Sep
(33) |
Oct
(24) |
Nov
(23) |
Dec
(22) |
| 2010 |
Jan
(29) |
Feb
(32) |
Mar
(51) |
Apr
(17) |
May
(31) |
Jun
(21) |
Jul
(32) |
Aug
(28) |
Sep
(35) |
Oct
(27) |
Nov
(11) |
Dec
(13) |
| 2011 |
Jan
(14) |
Feb
(13) |
Mar
(27) |
Apr
(27) |
May
(28) |
Jun
(20) |
Jul
(43) |
Aug
(52) |
Sep
(66) |
Oct
(61) |
Nov
(11) |
Dec
(8) |
| 2012 |
Jan
(20) |
Feb
(30) |
Mar
(38) |
Apr
(21) |
May
(33) |
Jun
(21) |
Jul
(25) |
Aug
(9) |
Sep
(24) |
Oct
(42) |
Nov
(27) |
Dec
(41) |
| 2013 |
Jan
(20) |
Feb
(35) |
Mar
(156) |
Apr
(298) |
May
(258) |
Jun
(201) |
Jul
(105) |
Aug
(60) |
Sep
(193) |
Oct
(245) |
Nov
(280) |
Dec
(194) |
| 2014 |
Jan
(63) |
Feb
(202) |
Mar
(200) |
Apr
(23) |
May
(53) |
Jun
(105) |
Jul
(18) |
Aug
(26) |
Sep
(110) |
Oct
(187) |
Nov
(97) |
Dec
(74) |
| 2015 |
Jan
(45) |
Feb
(55) |
Mar
(116) |
Apr
(116) |
May
(193) |
Jun
(164) |
Jul
(50) |
Aug
(111) |
Sep
(98) |
Oct
(71) |
Nov
(103) |
Dec
(63) |
| 2016 |
Jan
(33) |
Feb
(101) |
Mar
(182) |
Apr
(139) |
May
(140) |
Jun
(103) |
Jul
(165) |
Aug
(286) |
Sep
(208) |
Oct
(127) |
Nov
(97) |
Dec
(54) |
| 2017 |
Jan
(64) |
Feb
(335) |
Mar
(202) |
Apr
(212) |
May
(139) |
Jun
(127) |
Jul
(294) |
Aug
(154) |
Sep
(170) |
Oct
(152) |
Nov
(156) |
Dec
(62) |
| 2018 |
Jan
(168) |
Feb
(237) |
Mar
(196) |
Apr
(174) |
May
(174) |
Jun
(161) |
Jul
(127) |
Aug
(88) |
Sep
(149) |
Oct
(66) |
Nov
(52) |
Dec
(135) |
| 2019 |
Jan
(146) |
Feb
(126) |
Mar
(104) |
Apr
(58) |
May
(60) |
Jun
(28) |
Jul
(197) |
Aug
(129) |
Sep
(141) |
Oct
(148) |
Nov
(63) |
Dec
(100) |
| 2020 |
Jan
(74) |
Feb
(37) |
Mar
(59) |
Apr
(154) |
May
(194) |
Jun
(133) |
Jul
(313) |
Aug
(197) |
Sep
(49) |
Oct
(162) |
Nov
(143) |
Dec
(57) |
| 2021 |
Jan
(120) |
Feb
(107) |
Mar
(314) |
Apr
(157) |
May
(524) |
Jun
(169) |
Jul
(72) |
Aug
(133) |
Sep
(135) |
Oct
(146) |
Nov
(198) |
Dec
(325) |
| 2022 |
Jan
(409) |
Feb
(249) |
Mar
(138) |
Apr
(95) |
May
(102) |
Jun
(221) |
Jul
(66) |
Aug
(120) |
Sep
(192) |
Oct
(131) |
Nov
(53) |
Dec
(171) |
| 2023 |
Jan
(357) |
Feb
(82) |
Mar
(168) |
Apr
(218) |
May
(196) |
Jun
(86) |
Jul
(115) |
Aug
(49) |
Sep
(190) |
Oct
(102) |
Nov
(45) |
Dec
(76) |
| 2024 |
Jan
(86) |
Feb
(50) |
Mar
(324) |
Apr
(209) |
May
(197) |
Jun
(232) |
Jul
(194) |
Aug
(247) |
Sep
(219) |
Oct
(266) |
Nov
(328) |
Dec
(304) |
| 2025 |
Jan
(191) |
Feb
(115) |
Mar
(137) |
Apr
(32) |
May
(126) |
Jun
(403) |
Jul
(213) |
Aug
(177) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <sv...@op...> - 2024-07-18 18:21:33
|
Author: manx Date: Thu Jul 18 20:21:21 2024 New Revision: 21198 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21198 Log: Merged revision(s) 21197 from trunk/OpenMPT: [Fix] build: Autotools: Work-around NetBSD toolchain being ignorant of transitive dependencies on libstdc++. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/build/autotools/configure.ac Modified: branches/OpenMPT-1.31/build/autotools/configure.ac ============================================================================== --- branches/OpenMPT-1.31/build/autotools/configure.ac Thu Jul 18 18:26:16 2024 (r21197) +++ branches/OpenMPT-1.31/build/autotools/configure.ac Thu Jul 18 20:21:21 2024 (r21198) @@ -85,6 +85,12 @@ AC_CANONICAL_HOST +# work-around NetBSD toolchain not understanding transitive shared object dependencies at all +AS_CASE([$host_os], + [netbsd*], [LIBS="$LIBS -lstdc++"], + [] +) + AS_CASE([$host_os], [mingw32*],[ LIBOPENMPT_WIN32_LIBS= |
|
From: <sv...@op...> - 2024-07-18 16:26:23
|
Author: manx Date: Thu Jul 18 18:26:16 2024 New Revision: 21197 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21197 Log: [Fix] build: Autotools: Work-around NetBSD toolchain being ignorant of transitive dependencies on libstdc++. Modified: trunk/OpenMPT/build/autotools/configure.ac Modified: trunk/OpenMPT/build/autotools/configure.ac ============================================================================== --- trunk/OpenMPT/build/autotools/configure.ac Thu Jul 18 18:11:02 2024 (r21196) +++ trunk/OpenMPT/build/autotools/configure.ac Thu Jul 18 18:26:16 2024 (r21197) @@ -85,6 +85,12 @@ AC_CANONICAL_HOST +# work-around NetBSD toolchain not understanding transitive shared object dependencies at all +AS_CASE([$host_os], + [netbsd*], [LIBS="$LIBS -lstdc++"], + [] +) + AS_CASE([$host_os], [mingw32*],[ LIBOPENMPT_WIN32_LIBS= |
|
From: <sv...@op...> - 2024-07-18 16:11:14
|
Author: manx Date: Thu Jul 18 18:11:02 2024 New Revision: 21196 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21196 Log: Merged revision(s) 21195 from trunk/OpenMPT: [Ref] build: Autotools: Use AS_CASE instead of raw shell case. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/build/autotools/configure.ac Modified: branches/OpenMPT-1.31/build/autotools/configure.ac ============================================================================== --- branches/OpenMPT-1.31/build/autotools/configure.ac Thu Jul 18 18:10:25 2024 (r21195) +++ branches/OpenMPT-1.31/build/autotools/configure.ac Thu Jul 18 18:11:02 2024 (r21196) @@ -84,8 +84,9 @@ AC_CANONICAL_HOST -case $host_os in - mingw32*) + +AS_CASE([$host_os], + [mingw32*],[ LIBOPENMPT_WIN32_LIBS= LIBOPENMPT_LIBS_PRIVATE_WIN32= LIBOPENMPTTEST_WIN32_LIBS="-lole32 -lrpcrt4" @@ -95,8 +96,8 @@ WIN32_CFLAGS="-municode -mthreads" WIN32_CONSOLE_CXXFLAGS=-mconsole WIN32_CONSOLE_CFLAGS=-mconsole - ;; - *) + ], + [ LIBOPENMPT_WIN32_LIBS= LIBOPENMPT_LIBS_PRIVATE_WIN32= LIBOPENMPTTEST_WIN32_LIBS= @@ -106,8 +107,8 @@ WIN32_CFLAGS= WIN32_CONSOLE_CXXFLAGS= WIN32_CONSOLE_CFLAGS= - ;; -esac + ] +) AC_SUBST([LIBOPENMPT_WIN32_LIBS]) AC_SUBST([LIBOPENMPTTEST_WIN32_LIBS]) AC_SUBST([OPENMPT123_WIN32_LIBS]) @@ -210,8 +211,8 @@ # Optional openmpt123 dependency AC_ARG_WITH([pulseaudio], AS_HELP_STRING([--with-pulseaudio], [Enable use of libpulse and libpulse-simple (enabled by default on Linux).])) AS_IF([test "x$enable_openmpt123" != "xno"],[ -case $host_os in - linux*) +AS_CASE([$host_os], + [linux*],[ AS_IF([test "x$with_pulseaudio" != "xno"], [ PKG_CHECK_MODULES([PULSEAUDIO], [libpulse libpulse-simple], @@ -248,8 +249,9 @@ have_pulseaudio=0 ] ) - ;; -esac + ], + [] +) ],[have_pulseaudio=0]) # Optional openmpt123 and examples dependency |
|
From: <sv...@op...> - 2024-07-18 16:10:38
|
Author: manx Date: Thu Jul 18 18:10:25 2024 New Revision: 21195 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21195 Log: [Ref] build: Autotools: Use AS_CASE instead of raw shell case. Modified: trunk/OpenMPT/build/autotools/configure.ac Modified: trunk/OpenMPT/build/autotools/configure.ac ============================================================================== --- trunk/OpenMPT/build/autotools/configure.ac Thu Jul 18 14:25:51 2024 (r21194) +++ trunk/OpenMPT/build/autotools/configure.ac Thu Jul 18 18:10:25 2024 (r21195) @@ -84,8 +84,9 @@ AC_CANONICAL_HOST -case $host_os in - mingw32*) + +AS_CASE([$host_os], + [mingw32*],[ LIBOPENMPT_WIN32_LIBS= LIBOPENMPT_LIBS_PRIVATE_WIN32= LIBOPENMPTTEST_WIN32_LIBS="-lole32 -lrpcrt4" @@ -95,8 +96,8 @@ WIN32_CFLAGS="-municode -mthreads" WIN32_CONSOLE_CXXFLAGS=-mconsole WIN32_CONSOLE_CFLAGS=-mconsole - ;; - *) + ], + [ LIBOPENMPT_WIN32_LIBS= LIBOPENMPT_LIBS_PRIVATE_WIN32= LIBOPENMPTTEST_WIN32_LIBS= @@ -106,8 +107,8 @@ WIN32_CFLAGS= WIN32_CONSOLE_CXXFLAGS= WIN32_CONSOLE_CFLAGS= - ;; -esac + ] +) AC_SUBST([LIBOPENMPT_WIN32_LIBS]) AC_SUBST([LIBOPENMPTTEST_WIN32_LIBS]) AC_SUBST([OPENMPT123_WIN32_LIBS]) @@ -210,8 +211,8 @@ # Optional openmpt123 dependency AC_ARG_WITH([pulseaudio], AS_HELP_STRING([--with-pulseaudio], [Enable use of libpulse and libpulse-simple (enabled by default on Linux).])) AS_IF([test "x$enable_openmpt123" != "xno"],[ -case $host_os in - linux*) +AS_CASE([$host_os], + [linux*],[ AS_IF([test "x$with_pulseaudio" != "xno"], [ PKG_CHECK_MODULES([PULSEAUDIO], [libpulse libpulse-simple], @@ -248,8 +249,9 @@ have_pulseaudio=0 ] ) - ;; -esac + ], + [] +) ],[have_pulseaudio=0]) # Optional openmpt123 and examples dependency |
|
From: <sv...@op...> - 2024-07-18 12:25:58
|
Author: manx Date: Thu Jul 18 14:25:51 2024 New Revision: 21194 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21194 Log: [New] build: CI: GitHub: CPA: NetBSD: Add Autotools builder again. Added: trunk/OpenMPT/.github/workflows/NetBSD-Autotools.yml Added: trunk/OpenMPT/.github/workflows/NetBSD-Autotools.yml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/OpenMPT/.github/workflows/NetBSD-Autotools.yml Thu Jul 18 14:25:51 2024 (r21194) @@ -0,0 +1,79 @@ +name: NetBSD Autotools + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build: + + strategy: + fail-fast: false + matrix: + include: + - { version: '10.0' } + - { version: '9.4' } + + concurrency: + group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-autotools + cancel-in-progress: true + + runs-on: ubuntu-22.04 + + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Startup VM + uses: cross-platform-actions/action@v0.25.0 + with: + architecture: x86_64 + memory: 4G + operating_system: netbsd + version: ${{matrix.version}} + shell: bash + sync_files: runner-to-vm + shutdown_vm: false + run: true + - name: Install dependencies + uses: cross-platform-actions/action@v0.25.0 + with: + architecture: x86_64 + memory: 4G + operating_system: netbsd + version: ${{matrix.version}} + shell: bash + sync_files: false + shutdown_vm: false + 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 gmake pkgconf + sudo pkgin -y install mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio SDL2 + sudo pkgin -y install autoconf autoconf-archive automake libtool libltdl + sudo pkgin -y install doxygen help2man + - name: Build + uses: cross-platform-actions/action@v0.25.0 + with: + architecture: x86_64 + memory: 4G + operating_system: netbsd + version: ${{matrix.version}} + shell: bash + sync_files: false + shutdown_vm: false + run: | + export MAKEFLAGS="-j4"; ./build/autotools/autoconfiscate.sh + - name: Shutdown VM + uses: cross-platform-actions/action@v0.25.0 + with: + architecture: x86_64 + memory: 4G + operating_system: netbsd + version: ${{matrix.version}} + shell: bash + sync_files: false + shutdown_vm: true + run: true |
|
From: <sv...@op...> - 2024-07-16 19:33:56
|
Author: manx Date: Tue Jul 16 21:33:44 2024 New Revision: 21193 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21193 Log: Merged revision(s) 21192 from trunk/OpenMPT: [Fix] build: CI: GitHub: CPA: NetBSD: Work-around <https://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=58432> missing subversion pkg on NetBSD 9.4. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml Modified: branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml ============================================================================== --- branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml Tue Jul 16 21:33:20 2024 (r21192) +++ branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml Tue Jul 16 21:33:44 2024 (r21193) @@ -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...> - 2024-07-16 19:33:33
|
Author: manx Date: Tue Jul 16 21:33:20 2024 New Revision: 21192 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21192 Log: [Fix] build: CI: GitHub: CPA: NetBSD: Work-around <https://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=58432> missing subversion pkg on NetBSD 9.4. Modified: trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml Modified: trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml Tue Jul 16 15:01:53 2024 (r21191) +++ trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml Tue Jul 16 21:33:20 2024 (r21192) @@ -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...> - 2024-07-16 13:02:05
|
Author: manx Date: Tue Jul 16 15:01:53 2024 New Revision: 21191 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21191 Log: [Imp] build: download_externals: Support wget in addition to curl. Modified: trunk/OpenMPT/build/download_externals.sh Modified: trunk/OpenMPT/build/download_externals.sh ============================================================================== --- trunk/OpenMPT/build/download_externals.sh Mon Jul 15 22:55:45 2024 (r21190) +++ trunk/OpenMPT/build/download_externals.sh Tue Jul 16 15:01:53 2024 (r21191) @@ -34,7 +34,11 @@ URL="$(echo ""$1"" | sed 's/ /%20/g')" if [ ! -f "$MPT_GET_FILE_NAME" ]; then echo "Downloading '$MPT_GET_FILE_NAME' from '$URL' ..." - curl --location -o "$MPT_GET_FILE_NAME" "$URL" || true + if command -v curl &> /dev/null ; then + curl --location -o "$MPT_GET_FILE_NAME" "$URL" || true + elif command -v wget &> /dev/null ; then + wget -O "$MPT_GET_FILE_NAME" "$URL" || true + fi echo "Verifying '$URL' ..." if [ -f "$MPT_GET_FILE_NAME" ]; then FILE_SIZE=$(find "$MPT_GET_FILE_NAME" -printf '%s') |
|
From: <sv...@op...> - 2024-07-15 20:55:52
|
Author: sagamusix Date: Mon Jul 15 22:55:45 2024 New Revision: 21190 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21190 Log: Merged revision(s) 21188-21189 from trunk/OpenMPT: [Fix] MED: Command 0F was not imported properly. ........ [Fix] MED: Apply more suitable lower period limits. Should fix Silly.med. The limit for software mixing may not be accurate. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/soundlib/Load_med.cpp Modified: branches/OpenMPT-1.31/soundlib/Load_med.cpp ============================================================================== --- branches/OpenMPT-1.31/soundlib/Load_med.cpp Mon Jul 15 22:54:58 2024 (r21189) +++ branches/OpenMPT-1.31/soundlib/Load_med.cpp Mon Jul 15 22:55:45 2024 (r21190) @@ -458,7 +458,7 @@ if(m.param < 0x20) m.param = 0x20; #endif // MODPLUG_TRACKER - } else switch(command) + } else switch(param) { case 0xF1: // Play note twice m.SetEffectCommand(CMD_MODCMDEX, 0x93); @@ -603,7 +603,7 @@ cmd = command; param1 = param; } - // Octave wrapping for 4-channel modules (TODO: this should not be set because of synth instruments) + // Octave wrapping for 4-channel modules if(ctx.hardwareMixSamples && note >= NOTE_MIDDLEC + 2 * 12) needInstruments = true; @@ -794,6 +794,7 @@ // - starkelsesirap.mmd0 (synth instruments) on the other hand don't need it // In MMD2 / MMD3, the mix flag is used instead. const bool hardwareMixSamples = (version < 2) || (version >= 2 && !(songHeader.flags2 & MMDSong::FLAG2_MIX)); + m_nMinPeriod = hardwareMixSamples ? (113 * 4) : (55 * 4); bool needInstruments = false; bool anySynthInstrs = false; |
|
From: <sv...@op...> - 2024-07-15 20:55:11
|
Author: sagamusix Date: Mon Jul 15 22:54:58 2024 New Revision: 21189 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21189 Log: [Fix] MED: Apply more suitable lower period limits. Should fix Silly.med. The limit for software mixing may not be accurate. Modified: trunk/OpenMPT/soundlib/Load_med.cpp Modified: trunk/OpenMPT/soundlib/Load_med.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_med.cpp Mon Jul 15 22:32:08 2024 (r21188) +++ trunk/OpenMPT/soundlib/Load_med.cpp Mon Jul 15 22:54:58 2024 (r21189) @@ -926,6 +926,7 @@ // - starkelsesirap.mmd0 (synth instruments) on the other hand don't need it // In MMD2 / MMD3, the mix flag is used instead. const bool hardwareMixSamples = (version < 2) || (version >= 2 && !(songHeader.flags2 & MMDSong::FLAG2_MIX)); + m_nMinPeriod = hardwareMixSamples ? (113 * 4) : (55 * 4); bool needInstruments = false; #ifndef NO_PLUGINS |
|
From: <sv...@op...> - 2024-07-15 20:32:20
|
Author: sagamusix Date: Mon Jul 15 22:32:08 2024 New Revision: 21188 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21188 Log: [Fix] MED: Command 0F was not imported properly. Modified: trunk/OpenMPT/soundlib/Load_med.cpp Modified: trunk/OpenMPT/soundlib/Load_med.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_med.cpp Mon Jul 15 21:02:26 2024 (r21187) +++ trunk/OpenMPT/soundlib/Load_med.cpp Mon Jul 15 22:32:08 2024 (r21188) @@ -481,7 +481,7 @@ if(m.param < 0x20) m.param = 0x20; #endif // MODPLUG_TRACKER - } else switch(command) + } else switch(param) { case 0xF1: // Play note twice m.SetEffectCommand(CMD_MODCMDEX, 0x93); @@ -626,7 +626,7 @@ cmd = command; param1 = param; } - // Octave wrapping for 4-channel modules (TODO: this should not be set because of synth instruments) + // Octave wrapping for 4-channel modules if(ctx.hardwareMixSamples && note >= NOTE_MIDDLEC + 2 * 12) needInstruments = true; |
|
From: <sv...@op...> - 2024-07-15 19:02:42
|
Author: sagamusix Date: Mon Jul 15 21:02:26 2024 New Revision: 21187 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21187 Log: Merged revision(s) 21186 from trunk/OpenMPT: [Var] Update ancient to commit 9929dc420d9810f4d9b435007e9200f3d9f1d620 (2024-07-15). Fixes a crash with malformed PPMQ files and adds support for Pack-Ice and PMC. ........ Added: branches/OpenMPT-1.31/include/ancient/src/IceDecompressor.cpp - copied unchanged from r21186, trunk/OpenMPT/include/ancient/src/IceDecompressor.cpp branches/OpenMPT-1.31/include/ancient/src/IceDecompressor.hpp - copied unchanged from r21186, trunk/OpenMPT/include/ancient/src/IceDecompressor.hpp branches/OpenMPT-1.31/include/ancient/src/LHDecompressor.cpp - copied unchanged from r21186, trunk/OpenMPT/include/ancient/src/LHDecompressor.cpp branches/OpenMPT-1.31/include/ancient/src/LHDecompressor.hpp - copied unchanged from r21186, trunk/OpenMPT/include/ancient/src/LHDecompressor.hpp branches/OpenMPT-1.31/include/ancient/src/PMCDecompressor.cpp - copied unchanged from r21186, trunk/OpenMPT/include/ancient/src/PMCDecompressor.cpp branches/OpenMPT-1.31/include/ancient/src/PMCDecompressor.hpp - copied unchanged from r21186, trunk/OpenMPT/include/ancient/src/PMCDecompressor.hpp Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/build/vs2017winxp/ext/ancient.vcxproj branches/OpenMPT-1.31/build/vs2017winxp/ext/ancient.vcxproj.filters branches/OpenMPT-1.31/build/vs2017winxpansi/ext/ancient.vcxproj branches/OpenMPT-1.31/build/vs2017winxpansi/ext/ancient.vcxproj.filters branches/OpenMPT-1.31/build/vs2019win10/ext/ancient.vcxproj branches/OpenMPT-1.31/build/vs2019win10/ext/ancient.vcxproj.filters branches/OpenMPT-1.31/build/vs2019win7/ext/ancient.vcxproj branches/OpenMPT-1.31/build/vs2019win7/ext/ancient.vcxproj.filters branches/OpenMPT-1.31/build/vs2019win81/ext/ancient.vcxproj branches/OpenMPT-1.31/build/vs2019win81/ext/ancient.vcxproj.filters branches/OpenMPT-1.31/build/vs2022win10/ext/ancient.vcxproj branches/OpenMPT-1.31/build/vs2022win10/ext/ancient.vcxproj.filters branches/OpenMPT-1.31/build/vs2022win10clang/ext/ancient.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/ext/ancient.vcxproj.filters branches/OpenMPT-1.31/build/vs2022win7/ext/ancient.vcxproj branches/OpenMPT-1.31/build/vs2022win7/ext/ancient.vcxproj.filters branches/OpenMPT-1.31/build/vs2022win81/ext/ancient.vcxproj branches/OpenMPT-1.31/build/vs2022win81/ext/ancient.vcxproj.filters branches/OpenMPT-1.31/include/ancient/OpenMPT.txt branches/OpenMPT-1.31/include/ancient/src/API.cpp branches/OpenMPT-1.31/include/ancient/src/BZIP2Decompressor.cpp branches/OpenMPT-1.31/include/ancient/src/BZIP2Decompressor.hpp branches/OpenMPT-1.31/include/ancient/src/CRMDecompressor.cpp branches/OpenMPT-1.31/include/ancient/src/CRMDecompressor.hpp branches/OpenMPT-1.31/include/ancient/src/CompactDecompressor.cpp branches/OpenMPT-1.31/include/ancient/src/CompactDecompressor.hpp branches/OpenMPT-1.31/include/ancient/src/CompressDecompressor.cpp branches/OpenMPT-1.31/include/ancient/src/CompressDecompressor.hpp branches/OpenMPT-1.31/include/ancient/src/DEFLATEDecompressor.cpp branches/OpenMPT-1.31/include/ancient/src/DEFLATEDecompressor.hpp branches/OpenMPT-1.31/include/ancient/src/DMSDecompressor.cpp branches/OpenMPT-1.31/include/ancient/src/DMSDecompressor.hpp branches/OpenMPT-1.31/include/ancient/src/Decompressor.cpp branches/OpenMPT-1.31/include/ancient/src/Decompressor.hpp branches/OpenMPT-1.31/include/ancient/src/FreezeDecompressor.cpp branches/OpenMPT-1.31/include/ancient/src/FreezeDecompressor.hpp branches/OpenMPT-1.31/include/ancient/src/IMPDecompressor.cpp branches/OpenMPT-1.31/include/ancient/src/IMPDecompressor.hpp branches/OpenMPT-1.31/include/ancient/src/InputStream.hpp branches/OpenMPT-1.31/include/ancient/src/LOBDecompressor.cpp branches/OpenMPT-1.31/include/ancient/src/LOBDecompressor.hpp branches/OpenMPT-1.31/include/ancient/src/MMCMPDecompressor.cpp branches/OpenMPT-1.31/include/ancient/src/MMCMPDecompressor.hpp branches/OpenMPT-1.31/include/ancient/src/PPDecompressor.cpp branches/OpenMPT-1.31/include/ancient/src/PPDecompressor.hpp branches/OpenMPT-1.31/include/ancient/src/PPMQDecompressor.cpp branches/OpenMPT-1.31/include/ancient/src/PackDecompressor.cpp branches/OpenMPT-1.31/include/ancient/src/PackDecompressor.hpp branches/OpenMPT-1.31/include/ancient/src/RNCDecompressor.cpp branches/OpenMPT-1.31/include/ancient/src/RNCDecompressor.hpp branches/OpenMPT-1.31/include/ancient/src/SCOCompressDecompressor.cpp branches/OpenMPT-1.31/include/ancient/src/SCOCompressDecompressor.hpp branches/OpenMPT-1.31/include/ancient/src/StoneCrackerDecompressor.cpp branches/OpenMPT-1.31/include/ancient/src/StoneCrackerDecompressor.hpp branches/OpenMPT-1.31/include/ancient/src/TPWMDecompressor.cpp branches/OpenMPT-1.31/include/ancient/src/TPWMDecompressor.hpp branches/OpenMPT-1.31/include/ancient/src/VicXDecompressor.cpp branches/OpenMPT-1.31/include/ancient/src/VicXDecompressor.hpp branches/OpenMPT-1.31/include/ancient/src/XPKMain.cpp branches/OpenMPT-1.31/include/ancient/src/XPKMain.hpp Modified: branches/OpenMPT-1.31/build/vs2017winxp/ext/ancient.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2017winxp/ext/ancient.vcxproj Mon Jul 15 20:58:24 2024 (r21186) +++ branches/OpenMPT-1.31/build/vs2017winxp/ext/ancient.vcxproj Mon Jul 15 21:02:26 2024 (r21187) @@ -609,7 +609,9 @@ <ClInclude Include="..\..\..\include\ancient\src\HuffmanDecoder.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\ILZRDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\IMPDecompressor.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\IceDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\InputStream.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\LHDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LHLBDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LIN1Decompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LIN2Decompressor.hpp" /> @@ -626,6 +628,7 @@ <ClInclude Include="..\..\..\include\ancient\src\NONEDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\NUKEDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\OutputStream.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\PMCDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PPDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PPMQDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PackDecompressor.hpp" /> @@ -683,7 +686,9 @@ <ClCompile Include="..\..\..\include\ancient\src\HUFFDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\ILZRDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\IMPDecompressor.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\IceDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\InputStream.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\LHDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LHLBDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LIN1Decompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LIN2Decompressor.cpp" /> @@ -700,6 +705,7 @@ <ClCompile Include="..\..\..\include\ancient\src\NONEDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\NUKEDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\OutputStream.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\PMCDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PPDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PPMQDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PackDecompressor.cpp" /> Modified: branches/OpenMPT-1.31/build/vs2017winxp/ext/ancient.vcxproj.filters ============================================================================== --- branches/OpenMPT-1.31/build/vs2017winxp/ext/ancient.vcxproj.filters Mon Jul 15 20:58:24 2024 (r21186) +++ branches/OpenMPT-1.31/build/vs2017winxp/ext/ancient.vcxproj.filters Mon Jul 15 21:02:26 2024 (r21187) @@ -93,9 +93,15 @@ <ClInclude Include="..\..\..\include\ancient\src\IMPDecompressor.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\IceDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\InputStream.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\LHDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\LHLBDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -144,6 +150,9 @@ <ClInclude Include="..\..\..\include\ancient\src\OutputStream.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\PMCDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\PPDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -311,9 +320,15 @@ <ClCompile Include="..\..\..\include\ancient\src\IMPDecompressor.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\IceDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\InputStream.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\LHDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\LHLBDecompressor.cpp"> <Filter>src</Filter> </ClCompile> @@ -362,6 +377,9 @@ <ClCompile Include="..\..\..\include\ancient\src\OutputStream.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\PMCDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\PPDecompressor.cpp"> <Filter>src</Filter> </ClCompile> Modified: branches/OpenMPT-1.31/build/vs2017winxpansi/ext/ancient.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2017winxpansi/ext/ancient.vcxproj Mon Jul 15 20:58:24 2024 (r21186) +++ branches/OpenMPT-1.31/build/vs2017winxpansi/ext/ancient.vcxproj Mon Jul 15 21:02:26 2024 (r21187) @@ -609,7 +609,9 @@ <ClInclude Include="..\..\..\include\ancient\src\HuffmanDecoder.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\ILZRDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\IMPDecompressor.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\IceDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\InputStream.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\LHDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LHLBDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LIN1Decompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LIN2Decompressor.hpp" /> @@ -626,6 +628,7 @@ <ClInclude Include="..\..\..\include\ancient\src\NONEDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\NUKEDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\OutputStream.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\PMCDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PPDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PPMQDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PackDecompressor.hpp" /> @@ -683,7 +686,9 @@ <ClCompile Include="..\..\..\include\ancient\src\HUFFDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\ILZRDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\IMPDecompressor.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\IceDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\InputStream.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\LHDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LHLBDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LIN1Decompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LIN2Decompressor.cpp" /> @@ -700,6 +705,7 @@ <ClCompile Include="..\..\..\include\ancient\src\NONEDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\NUKEDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\OutputStream.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\PMCDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PPDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PPMQDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PackDecompressor.cpp" /> Modified: branches/OpenMPT-1.31/build/vs2017winxpansi/ext/ancient.vcxproj.filters ============================================================================== --- branches/OpenMPT-1.31/build/vs2017winxpansi/ext/ancient.vcxproj.filters Mon Jul 15 20:58:24 2024 (r21186) +++ branches/OpenMPT-1.31/build/vs2017winxpansi/ext/ancient.vcxproj.filters Mon Jul 15 21:02:26 2024 (r21187) @@ -93,9 +93,15 @@ <ClInclude Include="..\..\..\include\ancient\src\IMPDecompressor.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\IceDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\InputStream.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\LHDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\LHLBDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -144,6 +150,9 @@ <ClInclude Include="..\..\..\include\ancient\src\OutputStream.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\PMCDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\PPDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -311,9 +320,15 @@ <ClCompile Include="..\..\..\include\ancient\src\IMPDecompressor.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\IceDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\InputStream.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\LHDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\LHLBDecompressor.cpp"> <Filter>src</Filter> </ClCompile> @@ -362,6 +377,9 @@ <ClCompile Include="..\..\..\include\ancient\src\OutputStream.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\PMCDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\PPDecompressor.cpp"> <Filter>src</Filter> </ClCompile> Modified: branches/OpenMPT-1.31/build/vs2019win10/ext/ancient.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2019win10/ext/ancient.vcxproj Mon Jul 15 20:58:24 2024 (r21186) +++ branches/OpenMPT-1.31/build/vs2019win10/ext/ancient.vcxproj Mon Jul 15 21:02:26 2024 (r21187) @@ -1200,7 +1200,9 @@ <ClInclude Include="..\..\..\include\ancient\src\HuffmanDecoder.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\ILZRDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\IMPDecompressor.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\IceDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\InputStream.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\LHDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LHLBDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LIN1Decompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LIN2Decompressor.hpp" /> @@ -1217,6 +1219,7 @@ <ClInclude Include="..\..\..\include\ancient\src\NONEDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\NUKEDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\OutputStream.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\PMCDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PPDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PPMQDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PackDecompressor.hpp" /> @@ -1274,7 +1277,9 @@ <ClCompile Include="..\..\..\include\ancient\src\HUFFDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\ILZRDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\IMPDecompressor.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\IceDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\InputStream.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\LHDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LHLBDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LIN1Decompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LIN2Decompressor.cpp" /> @@ -1291,6 +1296,7 @@ <ClCompile Include="..\..\..\include\ancient\src\NONEDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\NUKEDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\OutputStream.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\PMCDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PPDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PPMQDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PackDecompressor.cpp" /> Modified: branches/OpenMPT-1.31/build/vs2019win10/ext/ancient.vcxproj.filters ============================================================================== --- branches/OpenMPT-1.31/build/vs2019win10/ext/ancient.vcxproj.filters Mon Jul 15 20:58:24 2024 (r21186) +++ branches/OpenMPT-1.31/build/vs2019win10/ext/ancient.vcxproj.filters Mon Jul 15 21:02:26 2024 (r21187) @@ -93,9 +93,15 @@ <ClInclude Include="..\..\..\include\ancient\src\IMPDecompressor.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\IceDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\InputStream.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\LHDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\LHLBDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -144,6 +150,9 @@ <ClInclude Include="..\..\..\include\ancient\src\OutputStream.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\PMCDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\PPDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -311,9 +320,15 @@ <ClCompile Include="..\..\..\include\ancient\src\IMPDecompressor.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\IceDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\InputStream.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\LHDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\LHLBDecompressor.cpp"> <Filter>src</Filter> </ClCompile> @@ -362,6 +377,9 @@ <ClCompile Include="..\..\..\include\ancient\src\OutputStream.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\PMCDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\PPDecompressor.cpp"> <Filter>src</Filter> </ClCompile> Modified: branches/OpenMPT-1.31/build/vs2019win7/ext/ancient.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2019win7/ext/ancient.vcxproj Mon Jul 15 20:58:24 2024 (r21186) +++ branches/OpenMPT-1.31/build/vs2019win7/ext/ancient.vcxproj Mon Jul 15 21:02:26 2024 (r21187) @@ -618,7 +618,9 @@ <ClInclude Include="..\..\..\include\ancient\src\HuffmanDecoder.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\ILZRDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\IMPDecompressor.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\IceDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\InputStream.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\LHDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LHLBDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LIN1Decompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LIN2Decompressor.hpp" /> @@ -635,6 +637,7 @@ <ClInclude Include="..\..\..\include\ancient\src\NONEDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\NUKEDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\OutputStream.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\PMCDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PPDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PPMQDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PackDecompressor.hpp" /> @@ -692,7 +695,9 @@ <ClCompile Include="..\..\..\include\ancient\src\HUFFDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\ILZRDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\IMPDecompressor.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\IceDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\InputStream.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\LHDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LHLBDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LIN1Decompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LIN2Decompressor.cpp" /> @@ -709,6 +714,7 @@ <ClCompile Include="..\..\..\include\ancient\src\NONEDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\NUKEDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\OutputStream.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\PMCDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PPDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PPMQDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PackDecompressor.cpp" /> Modified: branches/OpenMPT-1.31/build/vs2019win7/ext/ancient.vcxproj.filters ============================================================================== --- branches/OpenMPT-1.31/build/vs2019win7/ext/ancient.vcxproj.filters Mon Jul 15 20:58:24 2024 (r21186) +++ branches/OpenMPT-1.31/build/vs2019win7/ext/ancient.vcxproj.filters Mon Jul 15 21:02:26 2024 (r21187) @@ -93,9 +93,15 @@ <ClInclude Include="..\..\..\include\ancient\src\IMPDecompressor.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\IceDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\InputStream.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\LHDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\LHLBDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -144,6 +150,9 @@ <ClInclude Include="..\..\..\include\ancient\src\OutputStream.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\PMCDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\PPDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -311,9 +320,15 @@ <ClCompile Include="..\..\..\include\ancient\src\IMPDecompressor.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\IceDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\InputStream.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\LHDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\LHLBDecompressor.cpp"> <Filter>src</Filter> </ClCompile> @@ -362,6 +377,9 @@ <ClCompile Include="..\..\..\include\ancient\src\OutputStream.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\PMCDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\PPDecompressor.cpp"> <Filter>src</Filter> </ClCompile> Modified: branches/OpenMPT-1.31/build/vs2019win81/ext/ancient.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2019win81/ext/ancient.vcxproj Mon Jul 15 20:58:24 2024 (r21186) +++ branches/OpenMPT-1.31/build/vs2019win81/ext/ancient.vcxproj Mon Jul 15 21:02:26 2024 (r21187) @@ -618,7 +618,9 @@ <ClInclude Include="..\..\..\include\ancient\src\HuffmanDecoder.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\ILZRDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\IMPDecompressor.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\IceDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\InputStream.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\LHDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LHLBDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LIN1Decompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LIN2Decompressor.hpp" /> @@ -635,6 +637,7 @@ <ClInclude Include="..\..\..\include\ancient\src\NONEDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\NUKEDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\OutputStream.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\PMCDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PPDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PPMQDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PackDecompressor.hpp" /> @@ -692,7 +695,9 @@ <ClCompile Include="..\..\..\include\ancient\src\HUFFDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\ILZRDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\IMPDecompressor.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\IceDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\InputStream.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\LHDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LHLBDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LIN1Decompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LIN2Decompressor.cpp" /> @@ -709,6 +714,7 @@ <ClCompile Include="..\..\..\include\ancient\src\NONEDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\NUKEDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\OutputStream.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\PMCDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PPDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PPMQDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PackDecompressor.cpp" /> Modified: branches/OpenMPT-1.31/build/vs2019win81/ext/ancient.vcxproj.filters ============================================================================== --- branches/OpenMPT-1.31/build/vs2019win81/ext/ancient.vcxproj.filters Mon Jul 15 20:58:24 2024 (r21186) +++ branches/OpenMPT-1.31/build/vs2019win81/ext/ancient.vcxproj.filters Mon Jul 15 21:02:26 2024 (r21187) @@ -93,9 +93,15 @@ <ClInclude Include="..\..\..\include\ancient\src\IMPDecompressor.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\IceDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\InputStream.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\LHDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\LHLBDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -144,6 +150,9 @@ <ClInclude Include="..\..\..\include\ancient\src\OutputStream.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\PMCDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\PPDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -311,9 +320,15 @@ <ClCompile Include="..\..\..\include\ancient\src\IMPDecompressor.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\IceDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\InputStream.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\LHDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\LHLBDecompressor.cpp"> <Filter>src</Filter> </ClCompile> @@ -362,6 +377,9 @@ <ClCompile Include="..\..\..\include\ancient\src\OutputStream.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\PMCDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\PPDecompressor.cpp"> <Filter>src</Filter> </ClCompile> Modified: branches/OpenMPT-1.31/build/vs2022win10/ext/ancient.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2022win10/ext/ancient.vcxproj Mon Jul 15 20:58:24 2024 (r21186) +++ branches/OpenMPT-1.31/build/vs2022win10/ext/ancient.vcxproj Mon Jul 15 21:02:26 2024 (r21187) @@ -1224,7 +1224,9 @@ <ClInclude Include="..\..\..\include\ancient\src\HuffmanDecoder.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\ILZRDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\IMPDecompressor.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\IceDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\InputStream.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\LHDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LHLBDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LIN1Decompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LIN2Decompressor.hpp" /> @@ -1241,6 +1243,7 @@ <ClInclude Include="..\..\..\include\ancient\src\NONEDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\NUKEDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\OutputStream.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\PMCDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PPDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PPMQDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PackDecompressor.hpp" /> @@ -1298,7 +1301,9 @@ <ClCompile Include="..\..\..\include\ancient\src\HUFFDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\ILZRDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\IMPDecompressor.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\IceDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\InputStream.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\LHDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LHLBDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LIN1Decompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LIN2Decompressor.cpp" /> @@ -1315,6 +1320,7 @@ <ClCompile Include="..\..\..\include\ancient\src\NONEDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\NUKEDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\OutputStream.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\PMCDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PPDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PPMQDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PackDecompressor.cpp" /> Modified: branches/OpenMPT-1.31/build/vs2022win10/ext/ancient.vcxproj.filters ============================================================================== --- branches/OpenMPT-1.31/build/vs2022win10/ext/ancient.vcxproj.filters Mon Jul 15 20:58:24 2024 (r21186) +++ branches/OpenMPT-1.31/build/vs2022win10/ext/ancient.vcxproj.filters Mon Jul 15 21:02:26 2024 (r21187) @@ -93,9 +93,15 @@ <ClInclude Include="..\..\..\include\ancient\src\IMPDecompressor.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\IceDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\InputStream.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\LHDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\LHLBDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -144,6 +150,9 @@ <ClInclude Include="..\..\..\include\ancient\src\OutputStream.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\PMCDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\PPDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -311,9 +320,15 @@ <ClCompile Include="..\..\..\include\ancient\src\IMPDecompressor.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\IceDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\InputStream.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\LHDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\LHLBDecompressor.cpp"> <Filter>src</Filter> </ClCompile> @@ -362,6 +377,9 @@ <ClCompile Include="..\..\..\include\ancient\src\OutputStream.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\PMCDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\PPDecompressor.cpp"> <Filter>src</Filter> </ClCompile> Modified: branches/OpenMPT-1.31/build/vs2022win10clang/ext/ancient.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2022win10clang/ext/ancient.vcxproj Mon Jul 15 20:58:24 2024 (r21186) +++ branches/OpenMPT-1.31/build/vs2022win10clang/ext/ancient.vcxproj Mon Jul 15 21:02:26 2024 (r21187) @@ -1158,7 +1158,9 @@ <ClInclude Include="..\..\..\include\ancient\src\HuffmanDecoder.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\ILZRDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\IMPDecompressor.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\IceDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\InputStream.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\LHDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LHLBDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LIN1Decompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LIN2Decompressor.hpp" /> @@ -1175,6 +1177,7 @@ <ClInclude Include="..\..\..\include\ancient\src\NONEDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\NUKEDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\OutputStream.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\PMCDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PPDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PPMQDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PackDecompressor.hpp" /> @@ -1232,7 +1235,9 @@ <ClCompile Include="..\..\..\include\ancient\src\HUFFDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\ILZRDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\IMPDecompressor.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\IceDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\InputStream.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\LHDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LHLBDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LIN1Decompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LIN2Decompressor.cpp" /> @@ -1249,6 +1254,7 @@ <ClCompile Include="..\..\..\include\ancient\src\NONEDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\NUKEDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\OutputStream.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\PMCDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PPDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PPMQDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PackDecompressor.cpp" /> Modified: branches/OpenMPT-1.31/build/vs2022win10clang/ext/ancient.vcxproj.filters ============================================================================== --- branches/OpenMPT-1.31/build/vs2022win10clang/ext/ancient.vcxproj.filters Mon Jul 15 20:58:24 2024 (r21186) +++ branches/OpenMPT-1.31/build/vs2022win10clang/ext/ancient.vcxproj.filters Mon Jul 15 21:02:26 2024 (r21187) @@ -93,9 +93,15 @@ <ClInclude Include="..\..\..\include\ancient\src\IMPDecompressor.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\IceDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\InputStream.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\LHDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\LHLBDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -144,6 +150,9 @@ <ClInclude Include="..\..\..\include\ancient\src\OutputStream.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\PMCDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\PPDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -311,9 +320,15 @@ <ClCompile Include="..\..\..\include\ancient\src\IMPDecompressor.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\IceDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\InputStream.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\LHDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\LHLBDecompressor.cpp"> <Filter>src</Filter> </ClCompile> @@ -362,6 +377,9 @@ <ClCompile Include="..\..\..\include\ancient\src\OutputStream.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\PMCDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\PPDecompressor.cpp"> <Filter>src</Filter> </ClCompile> Modified: branches/OpenMPT-1.31/build/vs2022win7/ext/ancient.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2022win7/ext/ancient.vcxproj Mon Jul 15 20:58:24 2024 (r21186) +++ branches/OpenMPT-1.31/build/vs2022win7/ext/ancient.vcxproj Mon Jul 15 21:02:26 2024 (r21187) @@ -630,7 +630,9 @@ <ClInclude Include="..\..\..\include\ancient\src\HuffmanDecoder.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\ILZRDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\IMPDecompressor.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\IceDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\InputStream.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\LHDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LHLBDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LIN1Decompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LIN2Decompressor.hpp" /> @@ -647,6 +649,7 @@ <ClInclude Include="..\..\..\include\ancient\src\NONEDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\NUKEDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\OutputStream.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\PMCDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PPDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PPMQDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PackDecompressor.hpp" /> @@ -704,7 +707,9 @@ <ClCompile Include="..\..\..\include\ancient\src\HUFFDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\ILZRDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\IMPDecompressor.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\IceDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\InputStream.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\LHDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LHLBDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LIN1Decompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LIN2Decompressor.cpp" /> @@ -721,6 +726,7 @@ <ClCompile Include="..\..\..\include\ancient\src\NONEDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\NUKEDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\OutputStream.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\PMCDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PPDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PPMQDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PackDecompressor.cpp" /> Modified: branches/OpenMPT-1.31/build/vs2022win7/ext/ancient.vcxproj.filters ============================================================================== --- branches/OpenMPT-1.31/build/vs2022win7/ext/ancient.vcxproj.filters Mon Jul 15 20:58:24 2024 (r21186) +++ branches/OpenMPT-1.31/build/vs2022win7/ext/ancient.vcxproj.filters Mon Jul 15 21:02:26 2024 (r21187) @@ -93,9 +93,15 @@ <ClInclude Include="..\..\..\include\ancient\src\IMPDecompressor.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\IceDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\InputStream.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\LHDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\LHLBDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -144,6 +150,9 @@ <ClInclude Include="..\..\..\include\ancient\src\OutputStream.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\PMCDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\PPDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -311,9 +320,15 @@ <ClCompile Include="..\..\..\include\ancient\src\IMPDecompressor.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\IceDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\InputStream.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\LHDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\LHLBDecompressor.cpp"> <Filter>src</Filter> </ClCompile> @@ -362,6 +377,9 @@ <ClCompile Include="..\..\..\include\ancient\src\OutputStream.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\PMCDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\PPDecompressor.cpp"> <Filter>src</Filter> </ClCompile> Modified: branches/OpenMPT-1.31/build/vs2022win81/ext/ancient.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2022win81/ext/ancient.vcxproj Mon Jul 15 20:58:24 2024 (r21186) +++ branches/OpenMPT-1.31/build/vs2022win81/ext/ancient.vcxproj Mon Jul 15 21:02:26 2024 (r21187) @@ -630,7 +630,9 @@ <ClInclude Include="..\..\..\include\ancient\src\HuffmanDecoder.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\ILZRDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\IMPDecompressor.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\IceDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\InputStream.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\LHDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LHLBDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LIN1Decompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LIN2Decompressor.hpp" /> @@ -647,6 +649,7 @@ <ClInclude Include="..\..\..\include\ancient\src\NONEDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\NUKEDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\OutputStream.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\PMCDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PPDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PPMQDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PackDecompressor.hpp" /> @@ -704,7 +707,9 @@ <ClCompile Include="..\..\..\include\ancient\src\HUFFDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\ILZRDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\IMPDecompressor.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\IceDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\InputStream.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\LHDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LHLBDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LIN1Decompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LIN2Decompressor.cpp" /> @@ -721,6 +726,7 @@ <ClCompile Include="..\..\..\include\ancient\src\NONEDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\NUKEDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\OutputStream.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\PMCDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PPDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PPMQDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PackDecompressor.cpp" /> Modified: branches/OpenMPT-1.31/build/vs2022win81/ext/ancient.vcxproj.filters ============================================================================== --- branches/OpenMPT-1.31/build/vs2022win81/ext/ancient.vcxproj.filters Mon Jul 15 20:58:24 2024 (r21186) +++ branches/OpenMPT-1.31/build/vs2022win81/ext/ancient.vcxproj.filters Mon Jul 15 21:02:26 2024 (r21187) @@ -93,9 +93,15 @@ <ClInclude Include="..\..\..\include\ancient\src\IMPDecompressor.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\IceDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\InputStream.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\LHDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\LHLBDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -144,6 +150,9 @@ <ClInclude Include="..\..\..\include\ancient\src\OutputStream.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\PMCDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\PPDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -311,9 +320,15 @@ <ClCompile Include="..\..\..\include\ancient\src\IMPDecompressor.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\IceDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\InputStream.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\LHDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\LHLBDecompressor.cpp"> <Filter>src</Filter> </ClCompile> @@ -362,6 +377,9 @@ <ClCompile Include="..\..\..\include\ancient\src\OutputStream.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\PMCDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\PPDecompressor.cpp"> <Filter>src</Filter> </ClCompile> Modified: branches/OpenMPT-1.31/include/ancient/OpenMPT.txt ============================================================================== --- branches/OpenMPT-1.31/include/ancient/OpenMPT.txt Mon Jul 15 20:58:24 2024 (r21186) +++ branches/OpenMPT-1.31/include/ancient/OpenMPT.txt Mon Jul 15 21:02:26 2024 (r21187) @@ -1,2 +1,3 @@ - * ancient <https://github.com/temisu/ancient> v2.2.0 (2024-06-07) + * ancient <https://github.com/temisu/ancient> + commit 9929dc420d9810f4d9b435007e9200f3d9f1d620 (2024-07-15) * Unnecssary files have been removed. Modified: branches/OpenMPT-1.31/include/ancient/src/API.cpp ============================================================================== --- branches/OpenMPT-1.31/include/ancient/src/API.cpp Mon Jul 15 20:58:24 2024 (r21186) +++ branches/OpenMPT-1.31/include/ancient/src/API.cpp Mon Jul 15 21:02:26 2024 (r21187) @@ -88,12 +88,12 @@ bool Decompressor::detect(const std::vector<uint8_t> &packedData) noexcept { - return internal::Decompressor::detect(internal::ConstStaticBuffer(packedData.data(), packedData.size())); + return internal::Decompressor::detect(internal::ConstStaticBuffer(packedData.data(), packedData.size()),true); } bool Decompressor::detect(const uint8_t *packedData, size_t packedSize) noexcept { - return internal::Decompressor::detect(internal::ConstStaticBuffer(packedData, packedSize)); + return internal::Decompressor::detect(internal::ConstStaticBuffer(packedData, packedSize),true); } Decompressor::Decompressor(const std::vector<uint8_t> &packedData,bool exactSizeKnown,bool verify) : Modified: branches/OpenMPT-1.31/include/ancient/src/BZIP2Decompressor.cpp ============================================================================== --- branches/OpenMPT-1.31/include/ancient/src/BZIP2Decompressor.cpp Mon Jul 15 20:58:24 2024 (r21186) +++ branches/OpenMPT-1.31/include/ancient/src/BZIP2Decompressor.cpp Mon Jul 15 21:02:26 2024 (r21187) @@ -16,7 +16,7 @@ namespace ancient::internal { -bool BZIP2Decompressor::detectHeader(uint32_t hdr) noexcept +bool BZIP2Decompressor::detectHeader(uint32_t hdr,uint32_t footer) noexcept { return ((hdr&0xffff'ff00U)==FourCC("BZh\0") && (hdr&0xffU)>='1' && (hdr&0xffU)<='9'); } @@ -41,7 +41,7 @@ _packedSize{0} { uint32_t hdr=packedData.readBE32(0); - if (!detectHeader(hdr)) + if (!detectHeader(hdr,0)) throw Decompressor::InvalidFormatError();; _blockSize=((hdr&0xffU)-'0')*100'000; } @@ -52,7 +52,7 @@ _packedSize{_packedData.size()} { uint32_t blockHdr=packedData.readBE32(0); - if (!detectHeader(blockHdr)) + if (!detectHeader(blockHdr,0)) throw Decompressor::InvalidFormatError();; _blockSize=((blockHdr&0xffU)-'0')*100'000; } Modified: branches/OpenMPT-1.31/include/ancient/src/BZIP2Decompressor.hpp ============================================================================== --- branches/OpenMPT-1.31/include/ancient/src/BZIP2Decompressor.hpp Mon Jul 15 20:58:24 2024 (r21186) +++ branches/OpenMPT-1.31/include/ancient/src/BZIP2Decompressor.hpp Mon Jul 15 21:02:26 2024 (r21187) @@ -25,7 +25,7 @@ void decompressImpl(Buffer &rawData,bool verify) final; void decompressImpl(Buffer &rawData,const Buffer &previousData,bool verify) final; - static bool detectHeader(uint32_t hdr) noexcept; + static bool detectHeader(uint32_t hdr,uint32_t footer) noexcept; static bool detectHeaderXPK(uint32_t hdr) noexcept; static std::shared_ptr<Decompressor> create(const Buffer &packedData,bool exactSizeKnown,bool verify); Modified: branches/OpenMPT-1.31/include/ancient/src/CRMDecompressor.cpp ============================================================================== --- branches/OpenMPT-1.31/include/ancient/src/CRMDecompressor.cpp Mon Jul 15 20:58:24 2024 (r21186) +++ branches/OpenMPT-1.31/include/ancient/src/CRMDecompressor.cpp Mon Jul 15 21:02:26 2024 (r21187) @@ -13,7 +13,7 @@ namespace ancient::internal { -bool CRMDecompressor::detectHeader(uint32_t hdr) noexcept +bool CRMDecompressor::detectHeader(uint32_t hdr,uint32_t footer) noexcept { switch (hdr) { @@ -63,7 +63,7 @@ _packedData{packedData} { uint32_t hdr{packedData.readBE32(0)}; - if (!detectHeader(hdr) || packedData.size()<20) + if (!detectHeader(hdr,0) || packedData.size()<20) throw Decompressor::InvalidFormatError(); if (hdr==0x1805'1973U || hdr==FourCC("CD\xb3\xb9") || hdr==FourCC("Iron") || hdr==FourCC("MSS!")) hdr=FourCC("CrM2"); Modified: branches/OpenMPT-1.31/include/ancient/src/CRMDecompressor.hpp ============================================================================== --- branches/OpenMPT-1.31/include/ancient/src/CRMDecompressor.hpp Mon Jul 15 20:58:24 2024 (r21186) +++ branches/OpenMPT-1.31/include/ancient/src/CRMDecompressor.hpp Mon Jul 15 21:02:26 2024 (r21187) @@ -25,7 +25,7 @@ void decompressImpl(Buffer &rawData,bool verify) final; void decompressImpl(Buffer &rawData,const Buffer &previousData,bool verify) final; - static bool detectHeader(uint32_t hdr) noexcept; + static bool detectHeader(uint32_t hdr,uint32_t footer) noexcept; static bool detectHeaderXPK(uint32_t hdr) noexcept; static std::shared_ptr<Decompressor> create(const Buffer &packedData,bool exactSizeKnown,bool verify); Modified: branches/OpenMPT-1.31/include/ancient/src/CompactDecompressor.cpp ============================================================================== --- branches/OpenMPT-1.31/include/ancient/src/CompactDecompressor.cpp Mon Jul 15 20:58:24 2024 (r21186) +++ branches/OpenMPT-1.31/include/ancient/src/CompactDecompressor.cpp Mon Jul 15 21:02:26 2024 (r21187) @@ -11,7 +11,7 @@ namespace ancient::internal { -bool CompactDecompressor::detectHeader(uint32_t hdr) noexcept +bool CompactDecompressor::detectHeader(uint32_t hdr,uint32_t footer) noexcept { // If a compact file has signature of 0x1fff it means the its endianess is wrongly configured // (This is easy since it only knows of vax and pdp-11) @@ -32,7 +32,7 @@ if (_packedData.size()<2U) throw InvalidFormatError(); uint32_t hdr{_packedData.readBE16(0)}; - if (!detectHeader(hdr<<16)) + if (!detectHeader(hdr<<16,0)) throw InvalidFormatError(); if (exactSizeKnown) _packedSize=packedData.size(); Modified: branches/OpenMPT-1.31/include/ancient/src/CompactDecompressor.hpp ============================================================================== --- branches/OpenMPT-1.31/include/ancient/src/CompactDecompressor.hpp Mon Jul 15 20:58:24 2024 (r21186) +++ branches/OpenMPT-1.31/include/ancient/src/CompactDecompressor.hpp Mon Jul 15 21:02:26 2024 (r21187) @@ -21,7 +21,7 @@ void decompressImpl(Buffer &rawData,bool verify) final; - static bool detectHeader(uint32_t hdr) noexcept; + static bool detectHeader(uint32_t hdr,uint32_t footer) noexcept; static std::shared_ptr<Decompressor> create(const Buffer &packedData,bool exactSizeKnown,bool verify); Modified: branches/OpenMPT-1.31/include/ancient/src/CompressDecompressor.cpp ============================================================================== --- branches/OpenMPT-1.31/include/ancient/src/CompressDecompressor.cpp Mon Jul 15 20:58:24 2024 (r21186) +++ branches/OpenMPT-1.31/include/ancient/src/CompressDecompressor.cpp Mon Jul 15 21:02:26 2024 (r21187) @@ -10,7 +10,7 @@ namespace ancient::internal { -bool CompressDecompressor::detectHeader(uint32_t hdr) noexcept +bool CompressDecompressor::detectHeader(uint32_t hdr,uint32_t footer) noexcept { return ((hdr>>16)==0x1f9dU); } @@ -29,7 +29,7 @@ if (_packedData.size()<3U) throw InvalidFormatError(); uint32_t... [truncated message content] |
|
From: <sv...@op...> - 2024-07-15 18:58:35
|
Author: sagamusix Date: Mon Jul 15 20:58:24 2024 New Revision: 21186 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21186 Log: [Var] Update ancient to commit 9929dc420d9810f4d9b435007e9200f3d9f1d620 (2024-07-15). Fixes a crash with malformed PPMQ files and adds support for Pack-Ice and PMC. Added: trunk/OpenMPT/include/ancient/src/IceDecompressor.cpp (contents, props changed) trunk/OpenMPT/include/ancient/src/IceDecompressor.hpp (contents, props changed) trunk/OpenMPT/include/ancient/src/LHDecompressor.cpp (contents, props changed) trunk/OpenMPT/include/ancient/src/LHDecompressor.hpp (contents, props changed) trunk/OpenMPT/include/ancient/src/PMCDecompressor.cpp (contents, props changed) trunk/OpenMPT/include/ancient/src/PMCDecompressor.hpp (contents, props changed) Modified: trunk/OpenMPT/build/vs2017winxp/ext/ancient.vcxproj trunk/OpenMPT/build/vs2017winxp/ext/ancient.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/ext/ancient.vcxproj trunk/OpenMPT/build/vs2017winxpansi/ext/ancient.vcxproj.filters trunk/OpenMPT/build/vs2019win10/ext/ancient.vcxproj trunk/OpenMPT/build/vs2019win10/ext/ancient.vcxproj.filters trunk/OpenMPT/build/vs2019win7/ext/ancient.vcxproj trunk/OpenMPT/build/vs2019win7/ext/ancient.vcxproj.filters trunk/OpenMPT/build/vs2019win81/ext/ancient.vcxproj trunk/OpenMPT/build/vs2019win81/ext/ancient.vcxproj.filters trunk/OpenMPT/build/vs2022win10/ext/ancient.vcxproj trunk/OpenMPT/build/vs2022win10/ext/ancient.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/ext/ancient.vcxproj trunk/OpenMPT/build/vs2022win10clang/ext/ancient.vcxproj.filters trunk/OpenMPT/build/vs2022win7/ext/ancient.vcxproj trunk/OpenMPT/build/vs2022win7/ext/ancient.vcxproj.filters trunk/OpenMPT/build/vs2022win81/ext/ancient.vcxproj trunk/OpenMPT/build/vs2022win81/ext/ancient.vcxproj.filters trunk/OpenMPT/include/ancient/OpenMPT.txt trunk/OpenMPT/include/ancient/src/API.cpp trunk/OpenMPT/include/ancient/src/BZIP2Decompressor.cpp trunk/OpenMPT/include/ancient/src/BZIP2Decompressor.hpp trunk/OpenMPT/include/ancient/src/CRMDecompressor.cpp trunk/OpenMPT/include/ancient/src/CRMDecompressor.hpp trunk/OpenMPT/include/ancient/src/CompactDecompressor.cpp trunk/OpenMPT/include/ancient/src/CompactDecompressor.hpp trunk/OpenMPT/include/ancient/src/CompressDecompressor.cpp trunk/OpenMPT/include/ancient/src/CompressDecompressor.hpp trunk/OpenMPT/include/ancient/src/DEFLATEDecompressor.cpp trunk/OpenMPT/include/ancient/src/DEFLATEDecompressor.hpp trunk/OpenMPT/include/ancient/src/DMSDecompressor.cpp trunk/OpenMPT/include/ancient/src/DMSDecompressor.hpp trunk/OpenMPT/include/ancient/src/Decompressor.cpp trunk/OpenMPT/include/ancient/src/Decompressor.hpp trunk/OpenMPT/include/ancient/src/FreezeDecompressor.cpp trunk/OpenMPT/include/ancient/src/FreezeDecompressor.hpp trunk/OpenMPT/include/ancient/src/IMPDecompressor.cpp trunk/OpenMPT/include/ancient/src/IMPDecompressor.hpp trunk/OpenMPT/include/ancient/src/InputStream.hpp trunk/OpenMPT/include/ancient/src/LOBDecompressor.cpp trunk/OpenMPT/include/ancient/src/LOBDecompressor.hpp trunk/OpenMPT/include/ancient/src/MMCMPDecompressor.cpp trunk/OpenMPT/include/ancient/src/MMCMPDecompressor.hpp trunk/OpenMPT/include/ancient/src/PPDecompressor.cpp trunk/OpenMPT/include/ancient/src/PPDecompressor.hpp trunk/OpenMPT/include/ancient/src/PPMQDecompressor.cpp trunk/OpenMPT/include/ancient/src/PackDecompressor.cpp trunk/OpenMPT/include/ancient/src/PackDecompressor.hpp trunk/OpenMPT/include/ancient/src/RNCDecompressor.cpp trunk/OpenMPT/include/ancient/src/RNCDecompressor.hpp trunk/OpenMPT/include/ancient/src/SCOCompressDecompressor.cpp trunk/OpenMPT/include/ancient/src/SCOCompressDecompressor.hpp trunk/OpenMPT/include/ancient/src/StoneCrackerDecompressor.cpp trunk/OpenMPT/include/ancient/src/StoneCrackerDecompressor.hpp trunk/OpenMPT/include/ancient/src/TPWMDecompressor.cpp trunk/OpenMPT/include/ancient/src/TPWMDecompressor.hpp trunk/OpenMPT/include/ancient/src/VicXDecompressor.cpp trunk/OpenMPT/include/ancient/src/VicXDecompressor.hpp trunk/OpenMPT/include/ancient/src/XPKMain.cpp trunk/OpenMPT/include/ancient/src/XPKMain.hpp Modified: trunk/OpenMPT/build/vs2017winxp/ext/ancient.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/ext/ancient.vcxproj Sun Jul 14 22:07:34 2024 (r21185) +++ trunk/OpenMPT/build/vs2017winxp/ext/ancient.vcxproj Mon Jul 15 20:58:24 2024 (r21186) @@ -609,7 +609,9 @@ <ClInclude Include="..\..\..\include\ancient\src\HuffmanDecoder.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\ILZRDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\IMPDecompressor.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\IceDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\InputStream.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\LHDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LHLBDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LIN1Decompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LIN2Decompressor.hpp" /> @@ -626,6 +628,7 @@ <ClInclude Include="..\..\..\include\ancient\src\NONEDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\NUKEDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\OutputStream.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\PMCDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PPDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PPMQDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PackDecompressor.hpp" /> @@ -683,7 +686,9 @@ <ClCompile Include="..\..\..\include\ancient\src\HUFFDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\ILZRDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\IMPDecompressor.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\IceDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\InputStream.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\LHDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LHLBDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LIN1Decompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LIN2Decompressor.cpp" /> @@ -700,6 +705,7 @@ <ClCompile Include="..\..\..\include\ancient\src\NONEDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\NUKEDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\OutputStream.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\PMCDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PPDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PPMQDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PackDecompressor.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/ext/ancient.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/ext/ancient.vcxproj.filters Sun Jul 14 22:07:34 2024 (r21185) +++ trunk/OpenMPT/build/vs2017winxp/ext/ancient.vcxproj.filters Mon Jul 15 20:58:24 2024 (r21186) @@ -93,9 +93,15 @@ <ClInclude Include="..\..\..\include\ancient\src\IMPDecompressor.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\IceDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\InputStream.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\LHDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\LHLBDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -144,6 +150,9 @@ <ClInclude Include="..\..\..\include\ancient\src\OutputStream.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\PMCDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\PPDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -311,9 +320,15 @@ <ClCompile Include="..\..\..\include\ancient\src\IMPDecompressor.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\IceDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\InputStream.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\LHDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\LHLBDecompressor.cpp"> <Filter>src</Filter> </ClCompile> @@ -362,6 +377,9 @@ <ClCompile Include="..\..\..\include\ancient\src\OutputStream.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\PMCDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\PPDecompressor.cpp"> <Filter>src</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/ext/ancient.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/ext/ancient.vcxproj Sun Jul 14 22:07:34 2024 (r21185) +++ trunk/OpenMPT/build/vs2017winxpansi/ext/ancient.vcxproj Mon Jul 15 20:58:24 2024 (r21186) @@ -609,7 +609,9 @@ <ClInclude Include="..\..\..\include\ancient\src\HuffmanDecoder.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\ILZRDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\IMPDecompressor.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\IceDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\InputStream.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\LHDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LHLBDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LIN1Decompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LIN2Decompressor.hpp" /> @@ -626,6 +628,7 @@ <ClInclude Include="..\..\..\include\ancient\src\NONEDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\NUKEDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\OutputStream.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\PMCDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PPDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PPMQDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PackDecompressor.hpp" /> @@ -683,7 +686,9 @@ <ClCompile Include="..\..\..\include\ancient\src\HUFFDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\ILZRDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\IMPDecompressor.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\IceDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\InputStream.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\LHDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LHLBDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LIN1Decompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LIN2Decompressor.cpp" /> @@ -700,6 +705,7 @@ <ClCompile Include="..\..\..\include\ancient\src\NONEDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\NUKEDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\OutputStream.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\PMCDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PPDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PPMQDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PackDecompressor.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/ext/ancient.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/ext/ancient.vcxproj.filters Sun Jul 14 22:07:34 2024 (r21185) +++ trunk/OpenMPT/build/vs2017winxpansi/ext/ancient.vcxproj.filters Mon Jul 15 20:58:24 2024 (r21186) @@ -93,9 +93,15 @@ <ClInclude Include="..\..\..\include\ancient\src\IMPDecompressor.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\IceDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\InputStream.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\LHDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\LHLBDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -144,6 +150,9 @@ <ClInclude Include="..\..\..\include\ancient\src\OutputStream.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\PMCDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\PPDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -311,9 +320,15 @@ <ClCompile Include="..\..\..\include\ancient\src\IMPDecompressor.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\IceDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\InputStream.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\LHDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\LHLBDecompressor.cpp"> <Filter>src</Filter> </ClCompile> @@ -362,6 +377,9 @@ <ClCompile Include="..\..\..\include\ancient\src\OutputStream.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\PMCDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\PPDecompressor.cpp"> <Filter>src</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win10/ext/ancient.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win10/ext/ancient.vcxproj Sun Jul 14 22:07:34 2024 (r21185) +++ trunk/OpenMPT/build/vs2019win10/ext/ancient.vcxproj Mon Jul 15 20:58:24 2024 (r21186) @@ -1200,7 +1200,9 @@ <ClInclude Include="..\..\..\include\ancient\src\HuffmanDecoder.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\ILZRDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\IMPDecompressor.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\IceDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\InputStream.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\LHDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LHLBDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LIN1Decompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LIN2Decompressor.hpp" /> @@ -1217,6 +1219,7 @@ <ClInclude Include="..\..\..\include\ancient\src\NONEDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\NUKEDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\OutputStream.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\PMCDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PPDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PPMQDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PackDecompressor.hpp" /> @@ -1274,7 +1277,9 @@ <ClCompile Include="..\..\..\include\ancient\src\HUFFDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\ILZRDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\IMPDecompressor.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\IceDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\InputStream.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\LHDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LHLBDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LIN1Decompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LIN2Decompressor.cpp" /> @@ -1291,6 +1296,7 @@ <ClCompile Include="..\..\..\include\ancient\src\NONEDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\NUKEDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\OutputStream.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\PMCDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PPDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PPMQDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PackDecompressor.cpp" /> Modified: trunk/OpenMPT/build/vs2019win10/ext/ancient.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win10/ext/ancient.vcxproj.filters Sun Jul 14 22:07:34 2024 (r21185) +++ trunk/OpenMPT/build/vs2019win10/ext/ancient.vcxproj.filters Mon Jul 15 20:58:24 2024 (r21186) @@ -93,9 +93,15 @@ <ClInclude Include="..\..\..\include\ancient\src\IMPDecompressor.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\IceDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\InputStream.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\LHDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\LHLBDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -144,6 +150,9 @@ <ClInclude Include="..\..\..\include\ancient\src\OutputStream.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\PMCDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\PPDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -311,9 +320,15 @@ <ClCompile Include="..\..\..\include\ancient\src\IMPDecompressor.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\IceDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\InputStream.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\LHDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\LHLBDecompressor.cpp"> <Filter>src</Filter> </ClCompile> @@ -362,6 +377,9 @@ <ClCompile Include="..\..\..\include\ancient\src\OutputStream.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\PMCDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\PPDecompressor.cpp"> <Filter>src</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win7/ext/ancient.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/ext/ancient.vcxproj Sun Jul 14 22:07:34 2024 (r21185) +++ trunk/OpenMPT/build/vs2019win7/ext/ancient.vcxproj Mon Jul 15 20:58:24 2024 (r21186) @@ -618,7 +618,9 @@ <ClInclude Include="..\..\..\include\ancient\src\HuffmanDecoder.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\ILZRDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\IMPDecompressor.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\IceDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\InputStream.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\LHDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LHLBDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LIN1Decompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LIN2Decompressor.hpp" /> @@ -635,6 +637,7 @@ <ClInclude Include="..\..\..\include\ancient\src\NONEDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\NUKEDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\OutputStream.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\PMCDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PPDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PPMQDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PackDecompressor.hpp" /> @@ -692,7 +695,9 @@ <ClCompile Include="..\..\..\include\ancient\src\HUFFDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\ILZRDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\IMPDecompressor.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\IceDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\InputStream.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\LHDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LHLBDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LIN1Decompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LIN2Decompressor.cpp" /> @@ -709,6 +714,7 @@ <ClCompile Include="..\..\..\include\ancient\src\NONEDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\NUKEDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\OutputStream.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\PMCDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PPDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PPMQDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PackDecompressor.cpp" /> Modified: trunk/OpenMPT/build/vs2019win7/ext/ancient.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/ext/ancient.vcxproj.filters Sun Jul 14 22:07:34 2024 (r21185) +++ trunk/OpenMPT/build/vs2019win7/ext/ancient.vcxproj.filters Mon Jul 15 20:58:24 2024 (r21186) @@ -93,9 +93,15 @@ <ClInclude Include="..\..\..\include\ancient\src\IMPDecompressor.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\IceDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\InputStream.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\LHDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\LHLBDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -144,6 +150,9 @@ <ClInclude Include="..\..\..\include\ancient\src\OutputStream.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\PMCDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\PPDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -311,9 +320,15 @@ <ClCompile Include="..\..\..\include\ancient\src\IMPDecompressor.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\IceDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\InputStream.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\LHDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\LHLBDecompressor.cpp"> <Filter>src</Filter> </ClCompile> @@ -362,6 +377,9 @@ <ClCompile Include="..\..\..\include\ancient\src\OutputStream.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\PMCDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\PPDecompressor.cpp"> <Filter>src</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win81/ext/ancient.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win81/ext/ancient.vcxproj Sun Jul 14 22:07:34 2024 (r21185) +++ trunk/OpenMPT/build/vs2019win81/ext/ancient.vcxproj Mon Jul 15 20:58:24 2024 (r21186) @@ -618,7 +618,9 @@ <ClInclude Include="..\..\..\include\ancient\src\HuffmanDecoder.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\ILZRDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\IMPDecompressor.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\IceDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\InputStream.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\LHDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LHLBDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LIN1Decompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LIN2Decompressor.hpp" /> @@ -635,6 +637,7 @@ <ClInclude Include="..\..\..\include\ancient\src\NONEDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\NUKEDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\OutputStream.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\PMCDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PPDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PPMQDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PackDecompressor.hpp" /> @@ -692,7 +695,9 @@ <ClCompile Include="..\..\..\include\ancient\src\HUFFDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\ILZRDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\IMPDecompressor.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\IceDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\InputStream.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\LHDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LHLBDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LIN1Decompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LIN2Decompressor.cpp" /> @@ -709,6 +714,7 @@ <ClCompile Include="..\..\..\include\ancient\src\NONEDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\NUKEDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\OutputStream.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\PMCDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PPDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PPMQDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PackDecompressor.cpp" /> Modified: trunk/OpenMPT/build/vs2019win81/ext/ancient.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win81/ext/ancient.vcxproj.filters Sun Jul 14 22:07:34 2024 (r21185) +++ trunk/OpenMPT/build/vs2019win81/ext/ancient.vcxproj.filters Mon Jul 15 20:58:24 2024 (r21186) @@ -93,9 +93,15 @@ <ClInclude Include="..\..\..\include\ancient\src\IMPDecompressor.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\IceDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\InputStream.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\LHDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\LHLBDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -144,6 +150,9 @@ <ClInclude Include="..\..\..\include\ancient\src\OutputStream.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\PMCDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\PPDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -311,9 +320,15 @@ <ClCompile Include="..\..\..\include\ancient\src\IMPDecompressor.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\IceDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\InputStream.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\LHDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\LHLBDecompressor.cpp"> <Filter>src</Filter> </ClCompile> @@ -362,6 +377,9 @@ <ClCompile Include="..\..\..\include\ancient\src\OutputStream.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\PMCDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\PPDecompressor.cpp"> <Filter>src</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10/ext/ancient.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10/ext/ancient.vcxproj Sun Jul 14 22:07:34 2024 (r21185) +++ trunk/OpenMPT/build/vs2022win10/ext/ancient.vcxproj Mon Jul 15 20:58:24 2024 (r21186) @@ -1224,7 +1224,9 @@ <ClInclude Include="..\..\..\include\ancient\src\HuffmanDecoder.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\ILZRDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\IMPDecompressor.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\IceDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\InputStream.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\LHDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LHLBDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LIN1Decompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LIN2Decompressor.hpp" /> @@ -1241,6 +1243,7 @@ <ClInclude Include="..\..\..\include\ancient\src\NONEDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\NUKEDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\OutputStream.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\PMCDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PPDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PPMQDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PackDecompressor.hpp" /> @@ -1298,7 +1301,9 @@ <ClCompile Include="..\..\..\include\ancient\src\HUFFDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\ILZRDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\IMPDecompressor.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\IceDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\InputStream.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\LHDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LHLBDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LIN1Decompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LIN2Decompressor.cpp" /> @@ -1315,6 +1320,7 @@ <ClCompile Include="..\..\..\include\ancient\src\NONEDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\NUKEDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\OutputStream.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\PMCDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PPDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PPMQDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PackDecompressor.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10/ext/ancient.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10/ext/ancient.vcxproj.filters Sun Jul 14 22:07:34 2024 (r21185) +++ trunk/OpenMPT/build/vs2022win10/ext/ancient.vcxproj.filters Mon Jul 15 20:58:24 2024 (r21186) @@ -93,9 +93,15 @@ <ClInclude Include="..\..\..\include\ancient\src\IMPDecompressor.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\IceDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\InputStream.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\LHDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\LHLBDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -144,6 +150,9 @@ <ClInclude Include="..\..\..\include\ancient\src\OutputStream.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\PMCDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\PPDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -311,9 +320,15 @@ <ClCompile Include="..\..\..\include\ancient\src\IMPDecompressor.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\IceDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\InputStream.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\LHDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\LHLBDecompressor.cpp"> <Filter>src</Filter> </ClCompile> @@ -362,6 +377,9 @@ <ClCompile Include="..\..\..\include\ancient\src\OutputStream.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\PMCDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\PPDecompressor.cpp"> <Filter>src</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10clang/ext/ancient.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/ext/ancient.vcxproj Sun Jul 14 22:07:34 2024 (r21185) +++ trunk/OpenMPT/build/vs2022win10clang/ext/ancient.vcxproj Mon Jul 15 20:58:24 2024 (r21186) @@ -1158,7 +1158,9 @@ <ClInclude Include="..\..\..\include\ancient\src\HuffmanDecoder.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\ILZRDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\IMPDecompressor.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\IceDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\InputStream.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\LHDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LHLBDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LIN1Decompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LIN2Decompressor.hpp" /> @@ -1175,6 +1177,7 @@ <ClInclude Include="..\..\..\include\ancient\src\NONEDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\NUKEDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\OutputStream.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\PMCDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PPDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PPMQDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PackDecompressor.hpp" /> @@ -1232,7 +1235,9 @@ <ClCompile Include="..\..\..\include\ancient\src\HUFFDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\ILZRDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\IMPDecompressor.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\IceDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\InputStream.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\LHDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LHLBDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LIN1Decompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LIN2Decompressor.cpp" /> @@ -1249,6 +1254,7 @@ <ClCompile Include="..\..\..\include\ancient\src\NONEDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\NUKEDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\OutputStream.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\PMCDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PPDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PPMQDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PackDecompressor.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10clang/ext/ancient.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/ext/ancient.vcxproj.filters Sun Jul 14 22:07:34 2024 (r21185) +++ trunk/OpenMPT/build/vs2022win10clang/ext/ancient.vcxproj.filters Mon Jul 15 20:58:24 2024 (r21186) @@ -93,9 +93,15 @@ <ClInclude Include="..\..\..\include\ancient\src\IMPDecompressor.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\IceDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\InputStream.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\LHDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\LHLBDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -144,6 +150,9 @@ <ClInclude Include="..\..\..\include\ancient\src\OutputStream.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\PMCDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\PPDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -311,9 +320,15 @@ <ClCompile Include="..\..\..\include\ancient\src\IMPDecompressor.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\IceDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\InputStream.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\LHDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\LHLBDecompressor.cpp"> <Filter>src</Filter> </ClCompile> @@ -362,6 +377,9 @@ <ClCompile Include="..\..\..\include\ancient\src\OutputStream.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\PMCDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\PPDecompressor.cpp"> <Filter>src</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win7/ext/ancient.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win7/ext/ancient.vcxproj Sun Jul 14 22:07:34 2024 (r21185) +++ trunk/OpenMPT/build/vs2022win7/ext/ancient.vcxproj Mon Jul 15 20:58:24 2024 (r21186) @@ -630,7 +630,9 @@ <ClInclude Include="..\..\..\include\ancient\src\HuffmanDecoder.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\ILZRDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\IMPDecompressor.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\IceDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\InputStream.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\LHDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LHLBDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LIN1Decompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LIN2Decompressor.hpp" /> @@ -647,6 +649,7 @@ <ClInclude Include="..\..\..\include\ancient\src\NONEDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\NUKEDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\OutputStream.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\PMCDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PPDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PPMQDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PackDecompressor.hpp" /> @@ -704,7 +707,9 @@ <ClCompile Include="..\..\..\include\ancient\src\HUFFDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\ILZRDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\IMPDecompressor.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\IceDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\InputStream.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\LHDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LHLBDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LIN1Decompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LIN2Decompressor.cpp" /> @@ -721,6 +726,7 @@ <ClCompile Include="..\..\..\include\ancient\src\NONEDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\NUKEDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\OutputStream.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\PMCDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PPDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PPMQDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PackDecompressor.cpp" /> Modified: trunk/OpenMPT/build/vs2022win7/ext/ancient.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win7/ext/ancient.vcxproj.filters Sun Jul 14 22:07:34 2024 (r21185) +++ trunk/OpenMPT/build/vs2022win7/ext/ancient.vcxproj.filters Mon Jul 15 20:58:24 2024 (r21186) @@ -93,9 +93,15 @@ <ClInclude Include="..\..\..\include\ancient\src\IMPDecompressor.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\IceDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\InputStream.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\LHDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\LHLBDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -144,6 +150,9 @@ <ClInclude Include="..\..\..\include\ancient\src\OutputStream.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\PMCDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\PPDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -311,9 +320,15 @@ <ClCompile Include="..\..\..\include\ancient\src\IMPDecompressor.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\IceDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\InputStream.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\LHDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\LHLBDecompressor.cpp"> <Filter>src</Filter> </ClCompile> @@ -362,6 +377,9 @@ <ClCompile Include="..\..\..\include\ancient\src\OutputStream.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\PMCDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\PPDecompressor.cpp"> <Filter>src</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win81/ext/ancient.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win81/ext/ancient.vcxproj Sun Jul 14 22:07:34 2024 (r21185) +++ trunk/OpenMPT/build/vs2022win81/ext/ancient.vcxproj Mon Jul 15 20:58:24 2024 (r21186) @@ -630,7 +630,9 @@ <ClInclude Include="..\..\..\include\ancient\src\HuffmanDecoder.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\ILZRDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\IMPDecompressor.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\IceDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\InputStream.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\LHDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LHLBDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LIN1Decompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LIN2Decompressor.hpp" /> @@ -647,6 +649,7 @@ <ClInclude Include="..\..\..\include\ancient\src\NONEDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\NUKEDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\OutputStream.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\PMCDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PPDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PPMQDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PackDecompressor.hpp" /> @@ -704,7 +707,9 @@ <ClCompile Include="..\..\..\include\ancient\src\HUFFDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\ILZRDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\IMPDecompressor.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\IceDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\InputStream.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\LHDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LHLBDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LIN1Decompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LIN2Decompressor.cpp" /> @@ -721,6 +726,7 @@ <ClCompile Include="..\..\..\include\ancient\src\NONEDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\NUKEDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\OutputStream.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\PMCDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PPDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PPMQDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PackDecompressor.cpp" /> Modified: trunk/OpenMPT/build/vs2022win81/ext/ancient.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win81/ext/ancient.vcxproj.filters Sun Jul 14 22:07:34 2024 (r21185) +++ trunk/OpenMPT/build/vs2022win81/ext/ancient.vcxproj.filters Mon Jul 15 20:58:24 2024 (r21186) @@ -93,9 +93,15 @@ <ClInclude Include="..\..\..\include\ancient\src\IMPDecompressor.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\IceDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\InputStream.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\LHDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\LHLBDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -144,6 +150,9 @@ <ClInclude Include="..\..\..\include\ancient\src\OutputStream.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\PMCDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\PPDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -311,9 +320,15 @@ <ClCompile Include="..\..\..\include\ancient\src\IMPDecompressor.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\IceDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\InputStream.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\LHDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\LHLBDecompressor.cpp"> <Filter>src</Filter> </ClCompile> @@ -362,6 +377,9 @@ <ClCompile Include="..\..\..\include\ancient\src\OutputStream.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\PMCDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\PPDecompressor.cpp"> <Filter>src</Filter> </ClCompile> Modified: trunk/OpenMPT/include/ancient/OpenMPT.txt ============================================================================== --- trunk/OpenMPT/include/ancient/OpenMPT.txt Sun Jul 14 22:07:34 2024 (r21185) +++ trunk/OpenMPT/include/ancient/OpenMPT.txt Mon Jul 15 20:58:24 2024 (r21186) @@ -1,2 +1,3 @@ - * ancient <https://github.com/temisu/ancient> v2.2.0 (2024-06-07) + * ancient <https://github.com/temisu/ancient> + commit 9929dc420d9810f4d9b435007e9200f3d9f1d620 (2024-07-15) * Unnecssary files have been removed. Modified: trunk/OpenMPT/include/ancient/src/API.cpp ============================================================================== --- trunk/OpenMPT/include/ancient/src/API.cpp Sun Jul 14 22:07:34 2024 (r21185) +++ trunk/OpenMPT/include/ancient/src/API.cpp Mon Jul 15 20:58:24 2024 (r21186) @@ -88,12 +88,12 @@ bool Decompressor::detect(const std::vector<uint8_t> &packedData) noexcept { - return internal::Decompressor::detect(internal::ConstStaticBuffer(packedData.data(), packedData.size())); + return internal::Decompressor::detect(internal::ConstStaticBuffer(packedData.data(), packedData.size()),true); } bool Decompressor::detect(const uint8_t *packedData, size_t packedSize) noexcept { - return internal::Decompressor::detect(internal::ConstStaticBuffer(packedData, packedSize)); + return internal::Decompressor::detect(internal::ConstStaticBuffer(packedData, packedSize),true); } Decompressor::Decompressor(const std::vector<uint8_t> &packedData,bool exactSizeKnown,bool verify) : Modified: trunk/OpenMPT/include/ancient/src/BZIP2Decompressor.cpp ============================================================================== --- trunk/OpenMPT/include/ancient/src/BZIP2Decompressor.cpp Sun Jul 14 22:07:34 2024 (r21185) +++ trunk/OpenMPT/include/ancient/src/BZIP2Decompressor.cpp Mon Jul 15 20:58:24 2024 (r21186) @@ -16,7 +16,7 @@ namespace ancient::internal { -bool BZIP2Decompressor::detectHeader(uint32_t hdr) noexcept +bool BZIP2Decompressor::detectHeader(uint32_t hdr,uint32_t footer) noexcept { return ((hdr&0xffff'ff00U)==FourCC("BZh\0") && (hdr&0xffU)>='1' && (hdr&0xffU)<='9'); } @@ -41,7 +41,7 @@ _packedSize{0} { uint32_t hdr=packedData.readBE32(0); - if (!detectHeader(hdr)) + if (!detectHeader(hdr,0)) throw Decompressor::InvalidFormatError();; _blockSize=((hdr&0xffU)-'0')*100'000; } @@ -52,7 +52,7 @@ _packedSize{_packedData.size()} { uint32_t blockHdr=packedData.readBE32(0); - if (!detectHeader(blockHdr)) + if (!detectHeader(blockHdr,0)) throw Decompressor::InvalidFormatError();; _blockSize=((blockHdr&0xffU)-'0')*100'000; } Modified: trunk/OpenMPT/include/ancient/src/BZIP2Decompressor.hpp ============================================================================== --- trunk/OpenMPT/include/ancient/src/BZIP2Decompressor.hpp Sun Jul 14 22:07:34 2024 (r21185) +++ trunk/OpenMPT/include/ancient/src/BZIP2Decompressor.hpp Mon Jul 15 20:58:24 2024 (r21186) @@ -25,7 +25,7 @@ void decompressImpl(Buffer &rawData,bool verify) final; void decompressImpl(Buffer &rawData,const Buffer &previousData,bool verify) final; - static bool detectHeader(uint32_t hdr) noexcept; + static bool detectHeader(uint32_t hdr,uint32_t footer) noexcept; static bool detectHeaderXPK(uint32_t hdr) noexcept; static std::shared_ptr<Decompressor> create(const Buffer &packedData,bool exactSizeKnown,bool verify); Modified: trunk/OpenMPT/include/ancient/src/CRMDecompressor.cpp ============================================================================== --- trunk/OpenMPT/include/ancient/src/CRMDecompressor.cpp Sun Jul 14 22:07:34 2024 (r21185) +++ trunk/OpenMPT/include/ancient/src/CRMDecompressor.cpp Mon Jul 15 20:58:24 2024 (r21186) @@ -13,7 +13,7 @@ namespace ancient::internal { -bool CRMDecompressor::detectHeader(uint32_t hdr) noexcept +bool CRMDecompressor::detectHeader(uint32_t hdr,uint32_t footer) noexcept { switch (hdr) { @@ -63,7 +63,7 @@ _packedData{packedData} { uint32_t hdr{packedData.readBE32(0)}; - if (!detectHeader(hdr) || packedData.size()<20) + if (!detectHeader(hdr,0) || packedData.size()<20) throw Decompressor::InvalidFormatError(); if (hdr==0x1805'1973U || hdr==FourCC("CD\xb3\xb9") || hdr==FourCC("Iron") || hdr==FourCC("MSS!")) hdr=FourCC("CrM2"); Modified: trunk/OpenMPT/include/ancient/src/CRMDecompressor.hpp ============================================================================== --- trunk/OpenMPT/include/ancient/src/CRMDecompressor.hpp Sun Jul 14 22:07:34 2024 (r21185) +++ trunk/OpenMPT/include/ancient/src/CRMDecompressor.hpp Mon Jul 15 20:58:24 2024 (r21186) @@ -25,7 +25,7 @@ void decompressImpl(Buffer &rawData,bool verify) final; void decompressImpl(Buffer &rawData,const Buffer &previousData,bool verify) final; - static bool detectHeader(uint32_t hdr) noexcept; + static bool detectHeader(uint32_t hdr,uint32_t footer) noexcept; static bool detectHeaderXPK(uint32_t hdr) noexcept; static std::shared_ptr<Decompressor> create(const Buffer &packedData,bool exactSizeKnown,bool verify); Modified: trunk/OpenMPT/include/ancient/src/CompactDecompressor.cpp ============================================================================== --- trunk/OpenMPT/include/ancient/src/CompactDecompressor.cpp Sun Jul 14 22:07:34 2024 (r21185) +++ trunk/OpenMPT/include/ancient/src/CompactDecompressor.cpp Mon Jul 15 20:58:24 2024 (r21186) @@ -11,7 +11,7 @@ namespace ancient::internal { -bool CompactDecompressor::detectHeader(uint32_t hdr) noexcept +bool CompactDecompressor::detectHeader(uint32_t hdr,uint32_t footer) noexcept { // If a compact file has signature of 0x1fff it means the its endianess is wrongly configured // (This is easy since it only knows of vax and pdp-11) @@ -32,7 +32,7 @@ if (_packedData.size()<2U) throw InvalidFormatError(); uint32_t hdr{_packedData.readBE16(0)}; - if (!detectHeader(hdr<<16)) + if (!detectHeader(hdr<<16,0)) throw InvalidFormatError(); if (exactSizeKnown) _packedSize=packedData.size(); Modified: trunk/OpenMPT/include/ancient/src/CompactDecompressor.hpp ============================================================================== --- trunk/OpenMPT/include/ancient/src/CompactDecompressor.hpp Sun Jul 14 22:07:34 2024 (r21185) +++ trunk/OpenMPT/include/ancient/src/CompactDecompressor.hpp Mon Jul 15 20:58:24 2024 (r21186) @@ -21,7 +21,7 @@ void decompressImpl(Buffer &rawData,bool verify) final; - static bool detectHeader(uint32_t hdr) noexcept; + static bool detectHeader(uint32_t hdr,uint32_t footer) noexcept; static std::shared_ptr<Decompressor> create(const Buffer &packedData,bool exactSizeKnown,bool verify); Modified: trunk/OpenMPT/include/ancient/src/CompressDecompressor.cpp ============================================================================== --- trunk/OpenMPT/include/ancient/src/CompressDecompressor.cpp Sun Jul 14 22:07:34 2024 (r21185) +++ trunk/OpenMPT/include/ancient/src/CompressDecompressor.cpp Mon Jul 15 20:58:24 2024 (r21186) @@ -10,7 +10,7 @@ namespace ancient::internal { -bool CompressDecompressor::detectHeader(uint32_t hdr) noexcept +bool CompressDecompressor::detectHeader(uint32_t hdr,uint32_t footer) noexcept { return ((hdr>>16)==0x1f9dU); } @@ -29,7 +29,7 @@ if (_packedData.size()<3U) throw InvalidFormatError(); uint32_t hdr=_packedData.readBE16(0); - if (!detectHeader(hdr<<16)) + if (!detectHeader(hdr<<16,0)) throw InvalidFormatError(); uint8_t tmp{_packedData.read8(2)}; _hasBlocks=tmp&0x80U; Modified: trunk/OpenMPT/include/ancient/src/CompressDecompressor.hpp ============================================================================== --- trunk/OpenMPT/include/ancient/src/CompressDecompressor.hpp Sun Jul 14 22:07:34 2024 (r21185) +++ trunk/OpenMPT/include/ancient/src/CompressDecompressor.hpp Mon Jul 15 20:58:24 2024 (r21186) @@ -21,7 +21,7 @@ void decompressImpl(Buffer &rawData,bool verify) final; - static bool detectHeader(uint32_t hdr) noexcept; + static bool detectHeader(uint32_t hdr,uint32_t footer) noexcept; static std::shared_ptr<Decompressor> create(const Buffer &packedData,bool exactSizeKnown,bool verify); Modified: trunk/OpenMPT/include/ancient/src/DEFLATEDecompressor.cpp ============================================================================== --- trunk/OpenMPT/include/ancient/src/DEFLATEDecompressor.cpp Sun Jul 14 22:07:34 2024 (r21185) +++ trunk/OpenMPT/include/ancient/src/DEFLATEDecompressor.cpp Mon Jul 15 20:58:24 2024 (r21186) @@ -30,7 +30,7 @@ return (s2<<16)|s1; } -bool DEFLATEDecompressor::detectHeader(uint32_t hdr) noexcept +bool DEFLATEDecompressor::detectHeader(uint32_t hdr,uint32_t footer) noexcept { return ((hdr>>16U)==0x1f8bU)||((hdr>>16U)==0x1fa1U); } @@ -83,7 +83,7 @@ if (_packedData.size()<2U) throw InvalidFormatError(); uint32_t hdr{_packedData.readBE16(0)}; - if (!detectHeader(hdr<<16U)) + if (!detectHeader(hdr<<16U,0)) throw InvalidFormatError(); if (hdr==0x1f8bU... [truncated message content] |
|
From: <sv...@op...> - 2024-07-14 20:07:40
|
Author: manx Date: Sun Jul 14 22:07:34 2024 New Revision: 21185 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21185 Log: Merged revision(s) 21184 from branches/OpenMPT-1.29: Merged revision(s) 21183 from branches/OpenMPT-1.30: [Ref] build: CI: GitHub: CPA: Hypervisor option is deprecated. ........ ........ Modified: branches/OpenMPT-1.28/ (props changed) branches/OpenMPT-1.28/.github/workflows/FreeBSD-13.3-Makefile.yml Modified: branches/OpenMPT-1.28/.github/workflows/FreeBSD-13.3-Makefile.yml ============================================================================== --- branches/OpenMPT-1.28/.github/workflows/FreeBSD-13.3-Makefile.yml Sun Jul 14 22:07:05 2024 (r21184) +++ branches/OpenMPT-1.28/.github/workflows/FreeBSD-13.3-Makefile.yml Sun Jul 14 22:07:34 2024 (r21185) @@ -20,7 +20,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: freebsd version: '13.3' @@ -32,7 +31,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: freebsd version: '13.3' @@ -46,7 +44,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: freebsd version: '13.3' @@ -59,7 +56,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: freebsd version: '13.3' @@ -72,7 +68,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: freebsd version: '13.3' |
|
From: <sv...@op...> - 2024-07-14 20:07:12
|
Author: manx Date: Sun Jul 14 22:07:05 2024 New Revision: 21184 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21184 Log: Merged revision(s) 21183 from branches/OpenMPT-1.30: [Ref] build: CI: GitHub: CPA: Hypervisor option is deprecated. ........ Modified: branches/OpenMPT-1.29/ (props changed) branches/OpenMPT-1.29/.github/workflows/FreeBSD-13.3-Makefile.yml Modified: branches/OpenMPT-1.29/.github/workflows/FreeBSD-13.3-Makefile.yml ============================================================================== --- branches/OpenMPT-1.29/.github/workflows/FreeBSD-13.3-Makefile.yml Sun Jul 14 22:06:00 2024 (r21183) +++ branches/OpenMPT-1.29/.github/workflows/FreeBSD-13.3-Makefile.yml Sun Jul 14 22:07:05 2024 (r21184) @@ -20,7 +20,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: freebsd version: '13.3' @@ -32,7 +31,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: freebsd version: '13.3' @@ -46,7 +44,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: freebsd version: '13.3' @@ -59,7 +56,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: freebsd version: '13.3' @@ -72,7 +68,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: freebsd version: '13.3' |
|
From: <sv...@op...> - 2024-07-14 20:06:12
|
Author: manx Date: Sun Jul 14 22:06:00 2024 New Revision: 21183 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21183 Log: [Ref] build: CI: GitHub: CPA: Hypervisor option is deprecated. Modified: branches/OpenMPT-1.30/.github/workflows/FreeBSD-13.3-Makefile.yml branches/OpenMPT-1.30/.github/workflows/FreeBSD-14.1-Makefile.yml branches/OpenMPT-1.30/.github/workflows/OpenBSD-7.4-Makefile.yml branches/OpenMPT-1.30/.github/workflows/OpenBSD-7.5-Makefile.yml Modified: branches/OpenMPT-1.30/.github/workflows/FreeBSD-13.3-Makefile.yml ============================================================================== --- branches/OpenMPT-1.30/.github/workflows/FreeBSD-13.3-Makefile.yml Sun Jul 14 22:04:59 2024 (r21182) +++ branches/OpenMPT-1.30/.github/workflows/FreeBSD-13.3-Makefile.yml Sun Jul 14 22:06:00 2024 (r21183) @@ -20,7 +20,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: freebsd version: '13.3' @@ -32,7 +31,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: freebsd version: '13.3' @@ -46,7 +44,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: freebsd version: '13.3' @@ -59,7 +56,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: freebsd version: '13.3' @@ -72,7 +68,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: freebsd version: '13.3' Modified: branches/OpenMPT-1.30/.github/workflows/FreeBSD-14.1-Makefile.yml ============================================================================== --- branches/OpenMPT-1.30/.github/workflows/FreeBSD-14.1-Makefile.yml Sun Jul 14 22:04:59 2024 (r21182) +++ branches/OpenMPT-1.30/.github/workflows/FreeBSD-14.1-Makefile.yml Sun Jul 14 22:06:00 2024 (r21183) @@ -20,7 +20,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: freebsd version: '14.1' @@ -32,7 +31,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: freebsd version: '14.1' @@ -46,7 +44,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: freebsd version: '14.1' @@ -59,7 +56,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: freebsd version: '14.1' @@ -72,7 +68,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: freebsd version: '14.1' Modified: branches/OpenMPT-1.30/.github/workflows/OpenBSD-7.4-Makefile.yml ============================================================================== --- branches/OpenMPT-1.30/.github/workflows/OpenBSD-7.4-Makefile.yml Sun Jul 14 22:04:59 2024 (r21182) +++ branches/OpenMPT-1.30/.github/workflows/OpenBSD-7.4-Makefile.yml Sun Jul 14 22:06:00 2024 (r21183) @@ -20,7 +20,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: openbsd version: '7.4' @@ -32,7 +31,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: openbsd version: '7.4' @@ -48,7 +46,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: openbsd version: '7.4' @@ -61,7 +58,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: openbsd version: '7.4' @@ -74,7 +70,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: openbsd version: '7.4' Modified: branches/OpenMPT-1.30/.github/workflows/OpenBSD-7.5-Makefile.yml ============================================================================== --- branches/OpenMPT-1.30/.github/workflows/OpenBSD-7.5-Makefile.yml Sun Jul 14 22:04:59 2024 (r21182) +++ branches/OpenMPT-1.30/.github/workflows/OpenBSD-7.5-Makefile.yml Sun Jul 14 22:06:00 2024 (r21183) @@ -20,7 +20,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: openbsd version: '7.5' @@ -32,7 +31,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: openbsd version: '7.5' @@ -48,7 +46,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: openbsd version: '7.5' @@ -61,7 +58,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: openbsd version: '7.5' @@ -74,7 +70,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: openbsd version: '7.5' |
|
From: <sv...@op...> - 2024-07-14 20:05:12
|
Author: manx Date: Sun Jul 14 22:04:59 2024 New Revision: 21182 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21182 Log: Merged revision(s) 21181 from trunk/OpenMPT: [Ref] build: CI: GitHub: CPA: Hypervisor option is deprecated. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/.github/workflows/FreeBSD-Autotools.yml branches/OpenMPT-1.31/.github/workflows/FreeBSD-Makefile.yml branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml branches/OpenMPT-1.31/.github/workflows/OpenBSD-Autotools.yml branches/OpenMPT-1.31/.github/workflows/OpenBSD-Makefile.yml Modified: branches/OpenMPT-1.31/.github/workflows/FreeBSD-Autotools.yml ============================================================================== --- branches/OpenMPT-1.31/.github/workflows/FreeBSD-Autotools.yml Sun Jul 14 22:04:35 2024 (r21181) +++ branches/OpenMPT-1.31/.github/workflows/FreeBSD-Autotools.yml Sun Jul 14 22:04:59 2024 (r21182) @@ -27,7 +27,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: freebsd version: ${{matrix.version}} @@ -39,7 +38,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: freebsd version: ${{matrix.version}} @@ -53,7 +51,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: freebsd version: ${{matrix.version}} @@ -66,7 +63,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: freebsd version: ${{matrix.version}} Modified: branches/OpenMPT-1.31/.github/workflows/FreeBSD-Makefile.yml ============================================================================== --- branches/OpenMPT-1.31/.github/workflows/FreeBSD-Makefile.yml Sun Jul 14 22:04:35 2024 (r21181) +++ branches/OpenMPT-1.31/.github/workflows/FreeBSD-Makefile.yml Sun Jul 14 22:04:59 2024 (r21182) @@ -31,7 +31,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: freebsd version: ${{matrix.version}} @@ -43,7 +42,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: freebsd version: ${{matrix.version}} @@ -57,7 +55,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: freebsd version: ${{matrix.version}} @@ -70,7 +67,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: freebsd version: ${{matrix.version}} @@ -83,7 +79,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: freebsd version: ${{matrix.version}} Modified: branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml ============================================================================== --- branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml Sun Jul 14 22:04:35 2024 (r21181) +++ branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml Sun Jul 14 22:04:59 2024 (r21182) @@ -31,7 +31,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: netbsd version: ${{matrix.version}} @@ -43,7 +42,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: netbsd version: ${{matrix.version}} @@ -62,7 +60,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: netbsd version: ${{matrix.version}} @@ -75,7 +72,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: netbsd version: ${{matrix.version}} @@ -88,7 +84,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: netbsd version: ${{matrix.version}} Modified: branches/OpenMPT-1.31/.github/workflows/OpenBSD-Autotools.yml ============================================================================== --- branches/OpenMPT-1.31/.github/workflows/OpenBSD-Autotools.yml Sun Jul 14 22:04:35 2024 (r21181) +++ branches/OpenMPT-1.31/.github/workflows/OpenBSD-Autotools.yml Sun Jul 14 22:04:59 2024 (r21182) @@ -27,7 +27,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: openbsd version: ${{matrix.version}} @@ -39,7 +38,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: openbsd version: ${{matrix.version}} @@ -55,7 +53,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: openbsd version: ${{matrix.version}} @@ -68,7 +65,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: openbsd version: ${{matrix.version}} Modified: branches/OpenMPT-1.31/.github/workflows/OpenBSD-Makefile.yml ============================================================================== --- branches/OpenMPT-1.31/.github/workflows/OpenBSD-Makefile.yml Sun Jul 14 22:04:35 2024 (r21181) +++ branches/OpenMPT-1.31/.github/workflows/OpenBSD-Makefile.yml Sun Jul 14 22:04:59 2024 (r21182) @@ -31,7 +31,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: openbsd version: ${{matrix.version}} @@ -43,7 +42,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: openbsd version: ${{matrix.version}} @@ -59,7 +57,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: openbsd version: ${{matrix.version}} @@ -72,7 +69,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: openbsd version: ${{matrix.version}} @@ -85,7 +81,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: openbsd version: ${{matrix.version}} |
|
From: <sv...@op...> - 2024-07-14 20:04:42
|
Author: manx Date: Sun Jul 14 22:04:35 2024 New Revision: 21181 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21181 Log: [Ref] build: CI: GitHub: CPA: Hypervisor option is deprecated. Modified: trunk/OpenMPT/.github/workflows/FreeBSD-Autotools.yml trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml trunk/OpenMPT/.github/workflows/OpenBSD-Autotools.yml trunk/OpenMPT/.github/workflows/OpenBSD-Makefile.yml Modified: trunk/OpenMPT/.github/workflows/FreeBSD-Autotools.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/FreeBSD-Autotools.yml Sun Jul 14 18:56:57 2024 (r21180) +++ trunk/OpenMPT/.github/workflows/FreeBSD-Autotools.yml Sun Jul 14 22:04:35 2024 (r21181) @@ -29,7 +29,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: freebsd version: ${{matrix.version}} @@ -41,7 +40,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: freebsd version: ${{matrix.version}} @@ -55,7 +53,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: freebsd version: ${{matrix.version}} @@ -68,7 +65,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: freebsd version: ${{matrix.version}} Modified: trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml Sun Jul 14 18:56:57 2024 (r21180) +++ trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml Sun Jul 14 22:04:35 2024 (r21181) @@ -33,7 +33,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: freebsd version: ${{matrix.version}} @@ -45,7 +44,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: freebsd version: ${{matrix.version}} @@ -59,7 +57,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: freebsd version: ${{matrix.version}} @@ -72,7 +69,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: freebsd version: ${{matrix.version}} @@ -85,7 +81,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: freebsd version: ${{matrix.version}} Modified: trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml Sun Jul 14 18:56:57 2024 (r21180) +++ trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml Sun Jul 14 22:04:35 2024 (r21181) @@ -33,7 +33,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: netbsd version: ${{matrix.version}} @@ -45,7 +44,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: netbsd version: ${{matrix.version}} @@ -64,7 +62,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: netbsd version: ${{matrix.version}} @@ -77,7 +74,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: netbsd version: ${{matrix.version}} @@ -90,7 +86,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: netbsd version: ${{matrix.version}} Modified: trunk/OpenMPT/.github/workflows/OpenBSD-Autotools.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/OpenBSD-Autotools.yml Sun Jul 14 18:56:57 2024 (r21180) +++ trunk/OpenMPT/.github/workflows/OpenBSD-Autotools.yml Sun Jul 14 22:04:35 2024 (r21181) @@ -29,7 +29,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: openbsd version: ${{matrix.version}} @@ -41,7 +40,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: openbsd version: ${{matrix.version}} @@ -57,7 +55,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: openbsd version: ${{matrix.version}} @@ -70,7 +67,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: openbsd version: ${{matrix.version}} Modified: trunk/OpenMPT/.github/workflows/OpenBSD-Makefile.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/OpenBSD-Makefile.yml Sun Jul 14 18:56:57 2024 (r21180) +++ trunk/OpenMPT/.github/workflows/OpenBSD-Makefile.yml Sun Jul 14 22:04:35 2024 (r21181) @@ -33,7 +33,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: openbsd version: ${{matrix.version}} @@ -45,7 +44,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: openbsd version: ${{matrix.version}} @@ -61,7 +59,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: openbsd version: ${{matrix.version}} @@ -74,7 +71,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: openbsd version: ${{matrix.version}} @@ -87,7 +83,6 @@ uses: cross-platform-actions/action@v0.25.0 with: architecture: x86_64 - hypervisor: qemu memory: 4G operating_system: openbsd version: ${{matrix.version}} |
|
From: <sv...@op...> - 2024-07-14 16:57:10
|
Author: manx Date: Sun Jul 14 18:56:57 2024 New Revision: 21180 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21180 Log: Merged revision(s) 21179 from trunk/OpenMPT: [Fix] build: Autotools: Work-around for <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=115049> in Autotools by setting -fno-ipa-ra for all compilers that support this option. This is overly pessimistic, but we have no easy way to check for a specific compiler here, and this is necessary for GCC 8 or earlier which we still support and where we cannot use #pragma GCC optimize. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/build/autotools/configure.ac Modified: branches/OpenMPT-1.31/build/autotools/configure.ac ============================================================================== --- branches/OpenMPT-1.31/build/autotools/configure.ac Sun Jul 14 18:56:24 2024 (r21179) +++ branches/OpenMPT-1.31/build/autotools/configure.ac Sun Jul 14 18:56:57 2024 (r21180) @@ -54,6 +54,18 @@ [] ) +# work-around <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=115049> +# This is somewhat pessimistic, but necessary for GCC 8 or earlier, +# which we still support and where we cannot use #pragma GCC optimize. +AC_LANG_PUSH([C]) +AX_CHECK_COMPILE_FLAG([-fno-ipa-ra], [CFLAGS="$CFLAGS -fno-ipa-ra"]) +AX_CFLAGS_WARN_ALL +AC_LANG_POP([C]) +AC_LANG_PUSH([C++]) +AX_CHECK_COMPILE_FLAG([-fno-ipa-ra], [CXXFLAGS="$CXXFLAGS -fno-ipa-ra"]) +AX_CXXFLAGS_WARN_ALL +AC_LANG_POP([C++]) + LIBOPENMPT_LTVER_CURRENT=!!MPT_LIBOPENMPT_LTVER_CURRENT!! LIBOPENMPT_LTVER_REVISION=!!MPT_LIBOPENMPT_LTVER_REVISION!! |
|
From: <sv...@op...> - 2024-07-14 16:56:36
|
Author: manx Date: Sun Jul 14 18:56:24 2024 New Revision: 21179 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21179 Log: [Fix] build: Autotools: Work-around for <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=115049> in Autotools by setting -fno-ipa-ra for all compilers that support this option. This is overly pessimistic, but we have no easy way to check for a specific compiler here, and this is necessary for GCC 8 or earlier which we still support and where we cannot use #pragma GCC optimize. Modified: trunk/OpenMPT/build/autotools/configure.ac Modified: trunk/OpenMPT/build/autotools/configure.ac ============================================================================== --- trunk/OpenMPT/build/autotools/configure.ac Sun Jul 14 18:53:54 2024 (r21178) +++ trunk/OpenMPT/build/autotools/configure.ac Sun Jul 14 18:56:24 2024 (r21179) @@ -54,6 +54,18 @@ [] ) +# work-around <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=115049> +# This is somewhat pessimistic, but necessary for GCC 8 or earlier, +# which we still support and where we cannot use #pragma GCC optimize. +AC_LANG_PUSH([C]) +AX_CHECK_COMPILE_FLAG([-fno-ipa-ra], [CFLAGS="$CFLAGS -fno-ipa-ra"]) +AX_CFLAGS_WARN_ALL +AC_LANG_POP([C]) +AC_LANG_PUSH([C++]) +AX_CHECK_COMPILE_FLAG([-fno-ipa-ra], [CXXFLAGS="$CXXFLAGS -fno-ipa-ra"]) +AX_CXXFLAGS_WARN_ALL +AC_LANG_POP([C++]) + LIBOPENMPT_LTVER_CURRENT=!!MPT_LIBOPENMPT_LTVER_CURRENT!! LIBOPENMPT_LTVER_REVISION=!!MPT_LIBOPENMPT_LTVER_REVISION!! |
|
From: <sv...@op...> - 2024-07-14 16:54:06
|
Author: manx Date: Sun Jul 14 18:53:54 2024 New Revision: 21178 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21178 Log: Merged revision(s) 21177 from trunk/OpenMPT: [Var] Fix typo. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/common/BuildSettingsCompiler.h Modified: branches/OpenMPT-1.31/common/BuildSettingsCompiler.h ============================================================================== --- branches/OpenMPT-1.31/common/BuildSettingsCompiler.h Sun Jul 14 18:53:30 2024 (r21177) +++ branches/OpenMPT-1.31/common/BuildSettingsCompiler.h Sun Jul 14 18:53:54 2024 (r21178) @@ -51,7 +51,7 @@ // We need to check for 9.0 instead of 9.1 because of // <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1028580>. // It also gets confused when setting global optimization -O1, -// so we have no way of fixing GCC 9 or earlier. +// so we have no way of fixing GCC 8 or earlier. //#pragma GCC optimize("O1") #else #pragma GCC optimize("no-ipa-ra") |
|
From: <sv...@op...> - 2024-07-14 16:53:42
|
Author: manx Date: Sun Jul 14 18:53:30 2024 New Revision: 21177 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21177 Log: [Var] Fix typo. Modified: trunk/OpenMPT/common/BuildSettingsCompiler.h Modified: trunk/OpenMPT/common/BuildSettingsCompiler.h ============================================================================== --- trunk/OpenMPT/common/BuildSettingsCompiler.h Sun Jul 14 18:10:41 2024 (r21176) +++ trunk/OpenMPT/common/BuildSettingsCompiler.h Sun Jul 14 18:53:30 2024 (r21177) @@ -51,7 +51,7 @@ // We need to check for 9.0 instead of 9.1 because of // <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1028580>. // It also gets confused when setting global optimization -O1, -// so we have no way of fixing GCC 9 or earlier. +// so we have no way of fixing GCC 8 or earlier. //#pragma GCC optimize("O1") #else #pragma GCC optimize("no-ipa-ra") |
|
From: <sv...@op...> - 2024-07-14 16:10:47
|
Author: manx Date: Sun Jul 14 18:10:41 2024 New Revision: 21176 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21176 Log: Merged revision(s) 21174 from trunk/OpenMPT: [Reg] Disable work-around for <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=115049> for GCC 9 or earlier becuase it gets confused and prduces a ton of warnings about mismatched optimization options when using #pragma GCC optimize with either "no-ip-ra" or even simply "O1". Let's just hope that the problem is way more unlikely to trigger in earlier GCC. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/common/BuildSettingsCompiler.h Modified: branches/OpenMPT-1.31/common/BuildSettingsCompiler.h ============================================================================== --- branches/OpenMPT-1.31/common/BuildSettingsCompiler.h Sun Jul 14 18:10:07 2024 (r21175) +++ branches/OpenMPT-1.31/common/BuildSettingsCompiler.h Sun Jul 14 18:10:41 2024 (r21176) @@ -46,7 +46,16 @@ #ifdef MPT_COMPILER_SETTING_QUIRK_GCC_NO_IPA_RA // See <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=115049>. +#if MPT_GCC_BEFORE(9, 0, 0) +// Earlier GCC get confused about setting a global function attribute. +// We need to check for 9.0 instead of 9.1 because of +// <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1028580>. +// It also gets confused when setting global optimization -O1, +// so we have no way of fixing GCC 9 or earlier. +//#pragma GCC optimize("O1") +#else #pragma GCC optimize("no-ipa-ra") +#endif #endif // MPT_COMPILER_SETTING_QUIRK_GCC_NO_IPA_RA #endif // MPT_COMPILER_GCC |
Author: manx Date: Sun Jul 14 18:10:07 2024 New Revision: 21175 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21175 Log: Merged revision(s) 21173 from trunk/OpenMPT: [Fix] We must set global compiler settings before including any foreign or system header. Doing it in BuildSettings.h was too late because we already have included libc and libc++ headers via detect_quirks.hpp. Add another BuildSettingsCompiler.h which only depends on detect_compiler.hpp, and move compiler setting quirks detection into detect_compiler.hpp. ........ Added: branches/OpenMPT-1.31/common/BuildSettingsCompiler.h - copied unchanged from r21173, trunk/OpenMPT/common/BuildSettingsCompiler.h Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/build/autotools/Makefile.am branches/OpenMPT-1.31/build/vs2017winxp/OpenMPT-ANSI.vcxproj branches/OpenMPT-1.31/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters branches/OpenMPT-1.31/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj branches/OpenMPT-1.31/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj.filters branches/OpenMPT-1.31/build/vs2017winxp/OpenMPT-UTF8.vcxproj branches/OpenMPT-1.31/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters branches/OpenMPT-1.31/build/vs2017winxp/OpenMPT.vcxproj branches/OpenMPT-1.31/build/vs2017winxp/OpenMPT.vcxproj.filters branches/OpenMPT-1.31/build/vs2017winxp/libopenmpt-small.vcxproj branches/OpenMPT-1.31/build/vs2017winxp/libopenmpt-small.vcxproj.filters branches/OpenMPT-1.31/build/vs2017winxp/libopenmpt.vcxproj branches/OpenMPT-1.31/build/vs2017winxp/libopenmpt.vcxproj.filters branches/OpenMPT-1.31/build/vs2017winxp/libopenmpt_test.vcxproj branches/OpenMPT-1.31/build/vs2017winxp/libopenmpt_test.vcxproj.filters branches/OpenMPT-1.31/build/vs2017winxp/updatesigntool.vcxproj branches/OpenMPT-1.31/build/vs2017winxp/updatesigntool.vcxproj.filters branches/OpenMPT-1.31/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj branches/OpenMPT-1.31/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters branches/OpenMPT-1.31/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj branches/OpenMPT-1.31/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj.filters branches/OpenMPT-1.31/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj branches/OpenMPT-1.31/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters branches/OpenMPT-1.31/build/vs2017winxpansi/OpenMPT.vcxproj branches/OpenMPT-1.31/build/vs2017winxpansi/OpenMPT.vcxproj.filters branches/OpenMPT-1.31/build/vs2017winxpansi/libopenmpt-small.vcxproj branches/OpenMPT-1.31/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters branches/OpenMPT-1.31/build/vs2017winxpansi/libopenmpt.vcxproj branches/OpenMPT-1.31/build/vs2017winxpansi/libopenmpt.vcxproj.filters branches/OpenMPT-1.31/build/vs2017winxpansi/libopenmpt_test.vcxproj branches/OpenMPT-1.31/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters branches/OpenMPT-1.31/build/vs2017winxpansi/updatesigntool.vcxproj branches/OpenMPT-1.31/build/vs2017winxpansi/updatesigntool.vcxproj.filters branches/OpenMPT-1.31/build/vs2019win10/OpenMPT-ANSI.vcxproj branches/OpenMPT-1.31/build/vs2019win10/OpenMPT-ANSI.vcxproj.filters branches/OpenMPT-1.31/build/vs2019win10/OpenMPT-NativeSupport.vcxproj branches/OpenMPT-1.31/build/vs2019win10/OpenMPT-NativeSupport.vcxproj.filters branches/OpenMPT-1.31/build/vs2019win10/OpenMPT-UTF8.vcxproj branches/OpenMPT-1.31/build/vs2019win10/OpenMPT-UTF8.vcxproj.filters branches/OpenMPT-1.31/build/vs2019win10/OpenMPT.vcxproj branches/OpenMPT-1.31/build/vs2019win10/OpenMPT.vcxproj.filters branches/OpenMPT-1.31/build/vs2019win10/libopenmpt-small.vcxproj branches/OpenMPT-1.31/build/vs2019win10/libopenmpt-small.vcxproj.filters branches/OpenMPT-1.31/build/vs2019win10/libopenmpt.vcxproj branches/OpenMPT-1.31/build/vs2019win10/libopenmpt.vcxproj.filters branches/OpenMPT-1.31/build/vs2019win10/libopenmpt_test.vcxproj branches/OpenMPT-1.31/build/vs2019win10/libopenmpt_test.vcxproj.filters branches/OpenMPT-1.31/build/vs2019win10/updatesigntool.vcxproj branches/OpenMPT-1.31/build/vs2019win10/updatesigntool.vcxproj.filters branches/OpenMPT-1.31/build/vs2019win10uwp/libopenmpt-small.vcxproj branches/OpenMPT-1.31/build/vs2019win10uwp/libopenmpt-small.vcxproj.filters branches/OpenMPT-1.31/build/vs2019win10uwp/libopenmpt.vcxproj branches/OpenMPT-1.31/build/vs2019win10uwp/libopenmpt.vcxproj.filters branches/OpenMPT-1.31/build/vs2019win7/OpenMPT-ANSI.vcxproj branches/OpenMPT-1.31/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters branches/OpenMPT-1.31/build/vs2019win7/OpenMPT-NativeSupport.vcxproj branches/OpenMPT-1.31/build/vs2019win7/OpenMPT-NativeSupport.vcxproj.filters branches/OpenMPT-1.31/build/vs2019win7/OpenMPT-UTF8.vcxproj branches/OpenMPT-1.31/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters branches/OpenMPT-1.31/build/vs2019win7/OpenMPT.vcxproj branches/OpenMPT-1.31/build/vs2019win7/OpenMPT.vcxproj.filters branches/OpenMPT-1.31/build/vs2019win7/libopenmpt-small.vcxproj branches/OpenMPT-1.31/build/vs2019win7/libopenmpt-small.vcxproj.filters branches/OpenMPT-1.31/build/vs2019win7/libopenmpt.vcxproj branches/OpenMPT-1.31/build/vs2019win7/libopenmpt.vcxproj.filters branches/OpenMPT-1.31/build/vs2019win7/libopenmpt_test.vcxproj branches/OpenMPT-1.31/build/vs2019win7/libopenmpt_test.vcxproj.filters branches/OpenMPT-1.31/build/vs2019win7/updatesigntool.vcxproj branches/OpenMPT-1.31/build/vs2019win7/updatesigntool.vcxproj.filters branches/OpenMPT-1.31/build/vs2019win81/OpenMPT-ANSI.vcxproj branches/OpenMPT-1.31/build/vs2019win81/OpenMPT-ANSI.vcxproj.filters branches/OpenMPT-1.31/build/vs2019win81/OpenMPT-NativeSupport.vcxproj branches/OpenMPT-1.31/build/vs2019win81/OpenMPT-NativeSupport.vcxproj.filters branches/OpenMPT-1.31/build/vs2019win81/OpenMPT-UTF8.vcxproj branches/OpenMPT-1.31/build/vs2019win81/OpenMPT-UTF8.vcxproj.filters branches/OpenMPT-1.31/build/vs2019win81/OpenMPT.vcxproj branches/OpenMPT-1.31/build/vs2019win81/OpenMPT.vcxproj.filters branches/OpenMPT-1.31/build/vs2019win81/libopenmpt-small.vcxproj branches/OpenMPT-1.31/build/vs2019win81/libopenmpt-small.vcxproj.filters branches/OpenMPT-1.31/build/vs2019win81/libopenmpt.vcxproj branches/OpenMPT-1.31/build/vs2019win81/libopenmpt.vcxproj.filters branches/OpenMPT-1.31/build/vs2019win81/libopenmpt_test.vcxproj branches/OpenMPT-1.31/build/vs2019win81/libopenmpt_test.vcxproj.filters branches/OpenMPT-1.31/build/vs2019win81/updatesigntool.vcxproj branches/OpenMPT-1.31/build/vs2019win81/updatesigntool.vcxproj.filters branches/OpenMPT-1.31/build/vs2022win10/OpenMPT-ANSI.vcxproj branches/OpenMPT-1.31/build/vs2022win10/OpenMPT-ANSI.vcxproj.filters branches/OpenMPT-1.31/build/vs2022win10/OpenMPT-NativeSupport.vcxproj branches/OpenMPT-1.31/build/vs2022win10/OpenMPT-NativeSupport.vcxproj.filters branches/OpenMPT-1.31/build/vs2022win10/OpenMPT-UTF8.vcxproj branches/OpenMPT-1.31/build/vs2022win10/OpenMPT-UTF8.vcxproj.filters branches/OpenMPT-1.31/build/vs2022win10/OpenMPT.vcxproj branches/OpenMPT-1.31/build/vs2022win10/OpenMPT.vcxproj.filters branches/OpenMPT-1.31/build/vs2022win10/libopenmpt-small.vcxproj branches/OpenMPT-1.31/build/vs2022win10/libopenmpt-small.vcxproj.filters branches/OpenMPT-1.31/build/vs2022win10/libopenmpt.vcxproj branches/OpenMPT-1.31/build/vs2022win10/libopenmpt.vcxproj.filters branches/OpenMPT-1.31/build/vs2022win10/libopenmpt_test.vcxproj branches/OpenMPT-1.31/build/vs2022win10/libopenmpt_test.vcxproj.filters branches/OpenMPT-1.31/build/vs2022win10/updatesigntool.vcxproj branches/OpenMPT-1.31/build/vs2022win10/updatesigntool.vcxproj.filters branches/OpenMPT-1.31/build/vs2022win10clang/OpenMPT-ANSI.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/OpenMPT-ANSI.vcxproj.filters branches/OpenMPT-1.31/build/vs2022win10clang/OpenMPT-NativeSupport.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/OpenMPT-NativeSupport.vcxproj.filters branches/OpenMPT-1.31/build/vs2022win10clang/OpenMPT-UTF8.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/OpenMPT-UTF8.vcxproj.filters branches/OpenMPT-1.31/build/vs2022win10clang/OpenMPT.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/OpenMPT.vcxproj.filters branches/OpenMPT-1.31/build/vs2022win10clang/libopenmpt-small.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/libopenmpt-small.vcxproj.filters branches/OpenMPT-1.31/build/vs2022win10clang/libopenmpt.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/libopenmpt.vcxproj.filters branches/OpenMPT-1.31/build/vs2022win10clang/libopenmpt_test.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/libopenmpt_test.vcxproj.filters branches/OpenMPT-1.31/build/vs2022win10clang/updatesigntool.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/updatesigntool.vcxproj.filters branches/OpenMPT-1.31/build/vs2022win10uwp/libopenmpt-small.vcxproj branches/OpenMPT-1.31/build/vs2022win10uwp/libopenmpt-small.vcxproj.filters branches/OpenMPT-1.31/build/vs2022win10uwp/libopenmpt.vcxproj branches/OpenMPT-1.31/build/vs2022win10uwp/libopenmpt.vcxproj.filters branches/OpenMPT-1.31/build/vs2022win7/OpenMPT-ANSI.vcxproj branches/OpenMPT-1.31/build/vs2022win7/OpenMPT-ANSI.vcxproj.filters branches/OpenMPT-1.31/build/vs2022win7/OpenMPT-NativeSupport.vcxproj branches/OpenMPT-1.31/build/vs2022win7/OpenMPT-NativeSupport.vcxproj.filters branches/OpenMPT-1.31/build/vs2022win7/OpenMPT-UTF8.vcxproj branches/OpenMPT-1.31/build/vs2022win7/OpenMPT-UTF8.vcxproj.filters branches/OpenMPT-1.31/build/vs2022win7/OpenMPT.vcxproj branches/OpenMPT-1.31/build/vs2022win7/OpenMPT.vcxproj.filters branches/OpenMPT-1.31/build/vs2022win7/libopenmpt-small.vcxproj branches/OpenMPT-1.31/build/vs2022win7/libopenmpt-small.vcxproj.filters branches/OpenMPT-1.31/build/vs2022win7/libopenmpt.vcxproj branches/OpenMPT-1.31/build/vs2022win7/libopenmpt.vcxproj.filters branches/OpenMPT-1.31/build/vs2022win7/libopenmpt_test.vcxproj branches/OpenMPT-1.31/build/vs2022win7/libopenmpt_test.vcxproj.filters branches/OpenMPT-1.31/build/vs2022win7/updatesigntool.vcxproj branches/OpenMPT-1.31/build/vs2022win7/updatesigntool.vcxproj.filters branches/OpenMPT-1.31/build/vs2022win81/OpenMPT-ANSI.vcxproj branches/OpenMPT-1.31/build/vs2022win81/OpenMPT-ANSI.vcxproj.filters branches/OpenMPT-1.31/build/vs2022win81/OpenMPT-NativeSupport.vcxproj branches/OpenMPT-1.31/build/vs2022win81/OpenMPT-NativeSupport.vcxproj.filters branches/OpenMPT-1.31/build/vs2022win81/OpenMPT-UTF8.vcxproj branches/OpenMPT-1.31/build/vs2022win81/OpenMPT-UTF8.vcxproj.filters branches/OpenMPT-1.31/build/vs2022win81/OpenMPT.vcxproj branches/OpenMPT-1.31/build/vs2022win81/OpenMPT.vcxproj.filters branches/OpenMPT-1.31/build/vs2022win81/libopenmpt-small.vcxproj branches/OpenMPT-1.31/build/vs2022win81/libopenmpt-small.vcxproj.filters branches/OpenMPT-1.31/build/vs2022win81/libopenmpt.vcxproj branches/OpenMPT-1.31/build/vs2022win81/libopenmpt.vcxproj.filters branches/OpenMPT-1.31/build/vs2022win81/libopenmpt_test.vcxproj branches/OpenMPT-1.31/build/vs2022win81/libopenmpt_test.vcxproj.filters branches/OpenMPT-1.31/build/vs2022win81/updatesigntool.vcxproj branches/OpenMPT-1.31/build/vs2022win81/updatesigntool.vcxproj.filters branches/OpenMPT-1.31/build/xcode-ios/libopenmpt.xcodeproj/project.pbxproj branches/OpenMPT-1.31/build/xcode-macosx/libopenmpt.xcodeproj/project.pbxproj branches/OpenMPT-1.31/common/BuildSettings.h branches/OpenMPT-1.31/src/mpt/base/detect_compiler.hpp branches/OpenMPT-1.31/src/mpt/base/detect_quirks.hpp branches/OpenMPT-1.31/src/openmpt/all/BuildSettings.hpp Modified: branches/OpenMPT-1.31/build/autotools/Makefile.am ============================================================================== --- branches/OpenMPT-1.31/build/autotools/Makefile.am Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/autotools/Makefile.am Sun Jul 14 18:10:07 2024 (r21175) @@ -313,6 +313,7 @@ MPT_FILES_SRC_OPENMPT += src/openmpt/soundbase/SampleFormat.hpp MPT_FILES_COMMON = MPT_FILES_COMMON += common/BuildSettings.h +MPT_FILES_COMMON += common/BuildSettingsCompiler.h MPT_FILES_COMMON += common/ComponentManager.cpp MPT_FILES_COMMON += common/ComponentManager.h MPT_FILES_COMMON += common/Dither.h Modified: branches/OpenMPT-1.31/build/vs2017winxp/OpenMPT-ANSI.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2017winxp/OpenMPT-ANSI.vcxproj Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2017winxp/OpenMPT-ANSI.vcxproj Sun Jul 14 18:10:07 2024 (r21175) @@ -758,6 +758,7 @@ </ItemDefinitionGroup> <ItemGroup> <ClInclude Include="..\..\common\BuildSettings.h" /> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> Modified: branches/OpenMPT-1.31/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- branches/OpenMPT-1.31/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters Sun Jul 14 18:10:07 2024 (r21175) @@ -225,6 +225,9 @@ <ClInclude Include="..\..\common\BuildSettings.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> Modified: branches/OpenMPT-1.31/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj Sun Jul 14 18:10:07 2024 (r21175) @@ -638,6 +638,7 @@ </ItemDefinitionGroup> <ItemGroup> <ClInclude Include="..\..\common\BuildSettings.h" /> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> Modified: branches/OpenMPT-1.31/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj.filters ============================================================================== --- branches/OpenMPT-1.31/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj.filters Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj.filters Sun Jul 14 18:10:07 2024 (r21175) @@ -186,6 +186,9 @@ <ClInclude Include="..\..\common\BuildSettings.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> Modified: branches/OpenMPT-1.31/build/vs2017winxp/OpenMPT-UTF8.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2017winxp/OpenMPT-UTF8.vcxproj Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2017winxp/OpenMPT-UTF8.vcxproj Sun Jul 14 18:10:07 2024 (r21175) @@ -758,6 +758,7 @@ </ItemDefinitionGroup> <ItemGroup> <ClInclude Include="..\..\common\BuildSettings.h" /> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> Modified: branches/OpenMPT-1.31/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- branches/OpenMPT-1.31/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters Sun Jul 14 18:10:07 2024 (r21175) @@ -225,6 +225,9 @@ <ClInclude Include="..\..\common\BuildSettings.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> Modified: branches/OpenMPT-1.31/build/vs2017winxp/OpenMPT.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2017winxp/OpenMPT.vcxproj Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2017winxp/OpenMPT.vcxproj Sun Jul 14 18:10:07 2024 (r21175) @@ -758,6 +758,7 @@ </ItemDefinitionGroup> <ItemGroup> <ClInclude Include="..\..\common\BuildSettings.h" /> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> Modified: branches/OpenMPT-1.31/build/vs2017winxp/OpenMPT.vcxproj.filters ============================================================================== --- branches/OpenMPT-1.31/build/vs2017winxp/OpenMPT.vcxproj.filters Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2017winxp/OpenMPT.vcxproj.filters Sun Jul 14 18:10:07 2024 (r21175) @@ -225,6 +225,9 @@ <ClInclude Include="..\..\common\BuildSettings.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> Modified: branches/OpenMPT-1.31/build/vs2017winxp/libopenmpt-small.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2017winxp/libopenmpt-small.vcxproj Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2017winxp/libopenmpt-small.vcxproj Sun Jul 14 18:10:07 2024 (r21175) @@ -644,6 +644,7 @@ </ItemDefinitionGroup> <ItemGroup> <ClInclude Include="..\..\common\BuildSettings.h" /> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> Modified: branches/OpenMPT-1.31/build/vs2017winxp/libopenmpt-small.vcxproj.filters ============================================================================== --- branches/OpenMPT-1.31/build/vs2017winxp/libopenmpt-small.vcxproj.filters Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2017winxp/libopenmpt-small.vcxproj.filters Sun Jul 14 18:10:07 2024 (r21175) @@ -165,6 +165,9 @@ <ClInclude Include="..\..\common\BuildSettings.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> Modified: branches/OpenMPT-1.31/build/vs2017winxp/libopenmpt.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2017winxp/libopenmpt.vcxproj Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2017winxp/libopenmpt.vcxproj Sun Jul 14 18:10:07 2024 (r21175) @@ -644,6 +644,7 @@ </ItemDefinitionGroup> <ItemGroup> <ClInclude Include="..\..\common\BuildSettings.h" /> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> Modified: branches/OpenMPT-1.31/build/vs2017winxp/libopenmpt.vcxproj.filters ============================================================================== --- branches/OpenMPT-1.31/build/vs2017winxp/libopenmpt.vcxproj.filters Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2017winxp/libopenmpt.vcxproj.filters Sun Jul 14 18:10:07 2024 (r21175) @@ -165,6 +165,9 @@ <ClInclude Include="..\..\common\BuildSettings.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> Modified: branches/OpenMPT-1.31/build/vs2017winxp/libopenmpt_test.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2017winxp/libopenmpt_test.vcxproj Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2017winxp/libopenmpt_test.vcxproj Sun Jul 14 18:10:07 2024 (r21175) @@ -674,6 +674,7 @@ </ItemDefinitionGroup> <ItemGroup> <ClInclude Include="..\..\common\BuildSettings.h" /> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> Modified: branches/OpenMPT-1.31/build/vs2017winxp/libopenmpt_test.vcxproj.filters ============================================================================== --- branches/OpenMPT-1.31/build/vs2017winxp/libopenmpt_test.vcxproj.filters Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2017winxp/libopenmpt_test.vcxproj.filters Sun Jul 14 18:10:07 2024 (r21175) @@ -171,6 +171,9 @@ <ClInclude Include="..\..\common\BuildSettings.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> Modified: branches/OpenMPT-1.31/build/vs2017winxp/updatesigntool.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2017winxp/updatesigntool.vcxproj Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2017winxp/updatesigntool.vcxproj Sun Jul 14 18:10:07 2024 (r21175) @@ -626,6 +626,7 @@ </ItemDefinitionGroup> <ItemGroup> <ClInclude Include="..\..\common\BuildSettings.h" /> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> Modified: branches/OpenMPT-1.31/build/vs2017winxp/updatesigntool.vcxproj.filters ============================================================================== --- branches/OpenMPT-1.31/build/vs2017winxp/updatesigntool.vcxproj.filters Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2017winxp/updatesigntool.vcxproj.filters Sun Jul 14 18:10:07 2024 (r21175) @@ -183,6 +183,9 @@ <ClInclude Include="..\..\common\BuildSettings.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> Modified: branches/OpenMPT-1.31/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj Sun Jul 14 18:10:07 2024 (r21175) @@ -758,6 +758,7 @@ </ItemDefinitionGroup> <ItemGroup> <ClInclude Include="..\..\common\BuildSettings.h" /> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> Modified: branches/OpenMPT-1.31/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- branches/OpenMPT-1.31/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters Sun Jul 14 18:10:07 2024 (r21175) @@ -225,6 +225,9 @@ <ClInclude Include="..\..\common\BuildSettings.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> Modified: branches/OpenMPT-1.31/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj Sun Jul 14 18:10:07 2024 (r21175) @@ -638,6 +638,7 @@ </ItemDefinitionGroup> <ItemGroup> <ClInclude Include="..\..\common\BuildSettings.h" /> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> Modified: branches/OpenMPT-1.31/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj.filters ============================================================================== --- branches/OpenMPT-1.31/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj.filters Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj.filters Sun Jul 14 18:10:07 2024 (r21175) @@ -186,6 +186,9 @@ <ClInclude Include="..\..\common\BuildSettings.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> Modified: branches/OpenMPT-1.31/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj Sun Jul 14 18:10:07 2024 (r21175) @@ -758,6 +758,7 @@ </ItemDefinitionGroup> <ItemGroup> <ClInclude Include="..\..\common\BuildSettings.h" /> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> Modified: branches/OpenMPT-1.31/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- branches/OpenMPT-1.31/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters Sun Jul 14 18:10:07 2024 (r21175) @@ -225,6 +225,9 @@ <ClInclude Include="..\..\common\BuildSettings.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> Modified: branches/OpenMPT-1.31/build/vs2017winxpansi/OpenMPT.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2017winxpansi/OpenMPT.vcxproj Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2017winxpansi/OpenMPT.vcxproj Sun Jul 14 18:10:07 2024 (r21175) @@ -758,6 +758,7 @@ </ItemDefinitionGroup> <ItemGroup> <ClInclude Include="..\..\common\BuildSettings.h" /> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> Modified: branches/OpenMPT-1.31/build/vs2017winxpansi/OpenMPT.vcxproj.filters ============================================================================== --- branches/OpenMPT-1.31/build/vs2017winxpansi/OpenMPT.vcxproj.filters Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2017winxpansi/OpenMPT.vcxproj.filters Sun Jul 14 18:10:07 2024 (r21175) @@ -225,6 +225,9 @@ <ClInclude Include="..\..\common\BuildSettings.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> Modified: branches/OpenMPT-1.31/build/vs2017winxpansi/libopenmpt-small.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2017winxpansi/libopenmpt-small.vcxproj Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2017winxpansi/libopenmpt-small.vcxproj Sun Jul 14 18:10:07 2024 (r21175) @@ -644,6 +644,7 @@ </ItemDefinitionGroup> <ItemGroup> <ClInclude Include="..\..\common\BuildSettings.h" /> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> Modified: branches/OpenMPT-1.31/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters ============================================================================== --- branches/OpenMPT-1.31/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters Sun Jul 14 18:10:07 2024 (r21175) @@ -165,6 +165,9 @@ <ClInclude Include="..\..\common\BuildSettings.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> Modified: branches/OpenMPT-1.31/build/vs2017winxpansi/libopenmpt.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2017winxpansi/libopenmpt.vcxproj Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2017winxpansi/libopenmpt.vcxproj Sun Jul 14 18:10:07 2024 (r21175) @@ -644,6 +644,7 @@ </ItemDefinitionGroup> <ItemGroup> <ClInclude Include="..\..\common\BuildSettings.h" /> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> Modified: branches/OpenMPT-1.31/build/vs2017winxpansi/libopenmpt.vcxproj.filters ============================================================================== --- branches/OpenMPT-1.31/build/vs2017winxpansi/libopenmpt.vcxproj.filters Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2017winxpansi/libopenmpt.vcxproj.filters Sun Jul 14 18:10:07 2024 (r21175) @@ -165,6 +165,9 @@ <ClInclude Include="..\..\common\BuildSettings.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> Modified: branches/OpenMPT-1.31/build/vs2017winxpansi/libopenmpt_test.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2017winxpansi/libopenmpt_test.vcxproj Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2017winxpansi/libopenmpt_test.vcxproj Sun Jul 14 18:10:07 2024 (r21175) @@ -674,6 +674,7 @@ </ItemDefinitionGroup> <ItemGroup> <ClInclude Include="..\..\common\BuildSettings.h" /> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> Modified: branches/OpenMPT-1.31/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters ============================================================================== --- branches/OpenMPT-1.31/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters Sun Jul 14 18:10:07 2024 (r21175) @@ -171,6 +171,9 @@ <ClInclude Include="..\..\common\BuildSettings.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> Modified: branches/OpenMPT-1.31/build/vs2017winxpansi/updatesigntool.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2017winxpansi/updatesigntool.vcxproj Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2017winxpansi/updatesigntool.vcxproj Sun Jul 14 18:10:07 2024 (r21175) @@ -626,6 +626,7 @@ </ItemDefinitionGroup> <ItemGroup> <ClInclude Include="..\..\common\BuildSettings.h" /> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> Modified: branches/OpenMPT-1.31/build/vs2017winxpansi/updatesigntool.vcxproj.filters ============================================================================== --- branches/OpenMPT-1.31/build/vs2017winxpansi/updatesigntool.vcxproj.filters Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2017winxpansi/updatesigntool.vcxproj.filters Sun Jul 14 18:10:07 2024 (r21175) @@ -183,6 +183,9 @@ <ClInclude Include="..\..\common\BuildSettings.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> Modified: branches/OpenMPT-1.31/build/vs2019win10/OpenMPT-ANSI.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2019win10/OpenMPT-ANSI.vcxproj Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2019win10/OpenMPT-ANSI.vcxproj Sun Jul 14 18:10:07 2024 (r21175) @@ -1523,6 +1523,7 @@ </ItemDefinitionGroup> <ItemGroup> <ClInclude Include="..\..\common\BuildSettings.h" /> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> Modified: branches/OpenMPT-1.31/build/vs2019win10/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- branches/OpenMPT-1.31/build/vs2019win10/OpenMPT-ANSI.vcxproj.filters Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2019win10/OpenMPT-ANSI.vcxproj.filters Sun Jul 14 18:10:07 2024 (r21175) @@ -237,6 +237,9 @@ <ClInclude Include="..\..\common\BuildSettings.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> Modified: branches/OpenMPT-1.31/build/vs2019win10/OpenMPT-NativeSupport.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2019win10/OpenMPT-NativeSupport.vcxproj Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2019win10/OpenMPT-NativeSupport.vcxproj Sun Jul 14 18:10:07 2024 (r21175) @@ -1259,6 +1259,7 @@ </ItemDefinitionGroup> <ItemGroup> <ClInclude Include="..\..\common\BuildSettings.h" /> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> Modified: branches/OpenMPT-1.31/build/vs2019win10/OpenMPT-NativeSupport.vcxproj.filters ============================================================================== --- branches/OpenMPT-1.31/build/vs2019win10/OpenMPT-NativeSupport.vcxproj.filters Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2019win10/OpenMPT-NativeSupport.vcxproj.filters Sun Jul 14 18:10:07 2024 (r21175) @@ -198,6 +198,9 @@ <ClInclude Include="..\..\common\BuildSettings.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> Modified: branches/OpenMPT-1.31/build/vs2019win10/OpenMPT-UTF8.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2019win10/OpenMPT-UTF8.vcxproj Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2019win10/OpenMPT-UTF8.vcxproj Sun Jul 14 18:10:07 2024 (r21175) @@ -1523,6 +1523,7 @@ </ItemDefinitionGroup> <ItemGroup> <ClInclude Include="..\..\common\BuildSettings.h" /> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> Modified: branches/OpenMPT-1.31/build/vs2019win10/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- branches/OpenMPT-1.31/build/vs2019win10/OpenMPT-UTF8.vcxproj.filters Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2019win10/OpenMPT-UTF8.vcxproj.filters Sun Jul 14 18:10:07 2024 (r21175) @@ -237,6 +237,9 @@ <ClInclude Include="..\..\common\BuildSettings.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> Modified: branches/OpenMPT-1.31/build/vs2019win10/OpenMPT.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2019win10/OpenMPT.vcxproj Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2019win10/OpenMPT.vcxproj Sun Jul 14 18:10:07 2024 (r21175) @@ -1523,6 +1523,7 @@ </ItemDefinitionGroup> <ItemGroup> <ClInclude Include="..\..\common\BuildSettings.h" /> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> Modified: branches/OpenMPT-1.31/build/vs2019win10/OpenMPT.vcxproj.filters ============================================================================== --- branches/OpenMPT-1.31/build/vs2019win10/OpenMPT.vcxproj.filters Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2019win10/OpenMPT.vcxproj.filters Sun Jul 14 18:10:07 2024 (r21175) @@ -237,6 +237,9 @@ <ClInclude Include="..\..\common\BuildSettings.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> Modified: branches/OpenMPT-1.31/build/vs2019win10/libopenmpt-small.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2019win10/libopenmpt-small.vcxproj Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2019win10/libopenmpt-small.vcxproj Sun Jul 14 18:10:07 2024 (r21175) @@ -1271,6 +1271,7 @@ </ItemDefinitionGroup> <ItemGroup> <ClInclude Include="..\..\common\BuildSettings.h" /> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> Modified: branches/OpenMPT-1.31/build/vs2019win10/libopenmpt-small.vcxproj.filters ============================================================================== --- branches/OpenMPT-1.31/build/vs2019win10/libopenmpt-small.vcxproj.filters Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2019win10/libopenmpt-small.vcxproj.filters Sun Jul 14 18:10:07 2024 (r21175) @@ -165,6 +165,9 @@ <ClInclude Include="..\..\common\BuildSettings.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> Modified: branches/OpenMPT-1.31/build/vs2019win10/libopenmpt.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2019win10/libopenmpt.vcxproj Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2019win10/libopenmpt.vcxproj Sun Jul 14 18:10:07 2024 (r21175) @@ -1271,6 +1271,7 @@ </ItemDefinitionGroup> <ItemGroup> <ClInclude Include="..\..\common\BuildSettings.h" /> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> Modified: branches/OpenMPT-1.31/build/vs2019win10/libopenmpt.vcxproj.filters ============================================================================== --- branches/OpenMPT-1.31/build/vs2019win10/libopenmpt.vcxproj.filters Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2019win10/libopenmpt.vcxproj.filters Sun Jul 14 18:10:07 2024 (r21175) @@ -165,6 +165,9 @@ <ClInclude Include="..\..\common\BuildSettings.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> Modified: branches/OpenMPT-1.31/build/vs2019win10/libopenmpt_test.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2019win10/libopenmpt_test.vcxproj Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2019win10/libopenmpt_test.vcxproj Sun Jul 14 18:10:07 2024 (r21175) @@ -1331,6 +1331,7 @@ </ItemDefinitionGroup> <ItemGroup> <ClInclude Include="..\..\common\BuildSettings.h" /> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> Modified: branches/OpenMPT-1.31/build/vs2019win10/libopenmpt_test.vcxproj.filters ============================================================================== --- branches/OpenMPT-1.31/build/vs2019win10/libopenmpt_test.vcxproj.filters Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2019win10/libopenmpt_test.vcxproj.filters Sun Jul 14 18:10:07 2024 (r21175) @@ -177,6 +177,9 @@ <ClInclude Include="..\..\common\BuildSettings.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> Modified: branches/OpenMPT-1.31/build/vs2019win10/updatesigntool.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2019win10/updatesigntool.vcxproj Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2019win10/updatesigntool.vcxproj Sun Jul 14 18:10:07 2024 (r21175) @@ -1307,6 +1307,7 @@ </ItemDefinitionGroup> <ItemGroup> <ClInclude Include="..\..\common\BuildSettings.h" /> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> Modified: branches/OpenMPT-1.31/build/vs2019win10/updatesigntool.vcxproj.filters ============================================================================== --- branches/OpenMPT-1.31/build/vs2019win10/updatesigntool.vcxproj.filters Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2019win10/updatesigntool.vcxproj.filters Sun Jul 14 18:10:07 2024 (r21175) @@ -189,6 +189,9 @@ <ClInclude Include="..\..\common\BuildSettings.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> Modified: branches/OpenMPT-1.31/build/vs2019win10uwp/libopenmpt-small.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2019win10uwp/libopenmpt-small.vcxproj Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2019win10uwp/libopenmpt-small.vcxproj Sun Jul 14 18:10:07 2024 (r21175) @@ -1301,6 +1301,7 @@ </ItemDefinitionGroup> <ItemGroup> <ClInclude Include="..\..\common\BuildSettings.h" /> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> Modified: branches/OpenMPT-1.31/build/vs2019win10uwp/libopenmpt-small.vcxproj.filters ============================================================================== --- branches/OpenMPT-1.31/build/vs2019win10uwp/libopenmpt-small.vcxproj.filters Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2019win10uwp/libopenmpt-small.vcxproj.filters Sun Jul 14 18:10:07 2024 (r21175) @@ -165,6 +165,9 @@ <ClInclude Include="..\..\common\BuildSettings.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> Modified: branches/OpenMPT-1.31/build/vs2019win10uwp/libopenmpt.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2019win10uwp/libopenmpt.vcxproj Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2019win10uwp/libopenmpt.vcxproj Sun Jul 14 18:10:07 2024 (r21175) @@ -1301,6 +1301,7 @@ </ItemDefinitionGroup> <ItemGroup> <ClInclude Include="..\..\common\BuildSettings.h" /> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> Modified: branches/OpenMPT-1.31/build/vs2019win10uwp/libopenmpt.vcxproj.filters ============================================================================== --- branches/OpenMPT-1.31/build/vs2019win10uwp/libopenmpt.vcxproj.filters Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2019win10uwp/libopenmpt.vcxproj.filters Sun Jul 14 18:10:07 2024 (r21175) @@ -165,6 +165,9 @@ <ClInclude Include="..\..\common\BuildSettings.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> Modified: branches/OpenMPT-1.31/build/vs2019win7/OpenMPT-ANSI.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2019win7/OpenMPT-ANSI.vcxproj Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2019win7/OpenMPT-ANSI.vcxproj Sun Jul 14 18:10:07 2024 (r21175) @@ -767,6 +767,7 @@ </ItemDefinitionGroup> <ItemGroup> <ClInclude Include="..\..\common\BuildSettings.h" /> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> Modified: branches/OpenMPT-1.31/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- branches/OpenMPT-1.31/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters Sun Jul 14 18:10:07 2024 (r21175) @@ -237,6 +237,9 @@ <ClInclude Include="..\..\common\BuildSettings.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> Modified: branches/OpenMPT-1.31/build/vs2019win7/OpenMPT-NativeSupport.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2019win7/OpenMPT-NativeSupport.vcxproj Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2019win7/OpenMPT-NativeSupport.vcxproj Sun Jul 14 18:10:07 2024 (r21175) @@ -635,6 +635,7 @@ </ItemDefinitionGroup> <ItemGroup> <ClInclude Include="..\..\common\BuildSettings.h" /> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> Modified: branches/OpenMPT-1.31/build/vs2019win7/OpenMPT-NativeSupport.vcxproj.filters ============================================================================== --- branches/OpenMPT-1.31/build/vs2019win7/OpenMPT-NativeSupport.vcxproj.filters Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2019win7/OpenMPT-NativeSupport.vcxproj.filters Sun Jul 14 18:10:07 2024 (r21175) @@ -198,6 +198,9 @@ <ClInclude Include="..\..\common\BuildSettings.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> Modified: branches/OpenMPT-1.31/build/vs2019win7/OpenMPT-UTF8.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2019win7/OpenMPT-UTF8.vcxproj Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2019win7/OpenMPT-UTF8.vcxproj Sun Jul 14 18:10:07 2024 (r21175) @@ -767,6 +767,7 @@ </ItemDefinitionGroup> <ItemGroup> <ClInclude Include="..\..\common\BuildSettings.h" /> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> Modified: branches/OpenMPT-1.31/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- branches/OpenMPT-1.31/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters Sun Jul 14 18:10:07 2024 (r21175) @@ -237,6 +237,9 @@ <ClInclude Include="..\..\common\BuildSettings.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> Modified: branches/OpenMPT-1.31/build/vs2019win7/OpenMPT.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2019win7/OpenMPT.vcxproj Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2019win7/OpenMPT.vcxproj Sun Jul 14 18:10:07 2024 (r21175) @@ -767,6 +767,7 @@ </ItemDefinitionGroup> <ItemGroup> <ClInclude Include="..\..\common\BuildSettings.h" /> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> Modified: branches/OpenMPT-1.31/build/vs2019win7/OpenMPT.vcxproj.filters ============================================================================== --- branches/OpenMPT-1.31/build/vs2019win7/OpenMPT.vcxproj.filters Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2019win7/OpenMPT.vcxproj.filters Sun Jul 14 18:10:07 2024 (r21175) @@ -237,6 +237,9 @@ <ClInclude Include="..\..\common\BuildSettings.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> Modified: branches/OpenMPT-1.31/build/vs2019win7/libopenmpt-small.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2019win7/libopenmpt-small.vcxproj Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2019win7/libopenmpt-small.vcxproj Sun Jul 14 18:10:07 2024 (r21175) @@ -641,6 +641,7 @@ </ItemDefinitionGroup> <ItemGroup> <ClInclude Include="..\..\common\BuildSettings.h" /> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> Modified: branches/OpenMPT-1.31/build/vs2019win7/libopenmpt-small.vcxproj.filters ============================================================================== --- branches/OpenMPT-1.31/build/vs2019win7/libopenmpt-small.vcxproj.filters Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2019win7/libopenmpt-small.vcxproj.filters Sun Jul 14 18:10:07 2024 (r21175) @@ -165,6 +165,9 @@ <ClInclude Include="..\..\common\BuildSettings.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> Modified: branches/OpenMPT-1.31/build/vs2019win7/libopenmpt.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2019win7/libopenmpt.vcxproj Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2019win7/libopenmpt.vcxproj Sun Jul 14 18:10:07 2024 (r21175) @@ -641,6 +641,7 @@ </ItemDefinitionGroup> <ItemGroup> <ClInclude Include="..\..\common\BuildSettings.h" /> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> Modified: branches/OpenMPT-1.31/build/vs2019win7/libopenmpt.vcxproj.filters ============================================================================== --- branches/OpenMPT-1.31/build/vs2019win7/libopenmpt.vcxproj.filters Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2019win7/libopenmpt.vcxproj.filters Sun Jul 14 18:10:07 2024 (r21175) @@ -165,6 +165,9 @@ <ClInclude Include="..\..\common\BuildSettings.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> Modified: branches/OpenMPT-1.31/build/vs2019win7/libopenmpt_test.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2019win7/libopenmpt_test.vcxproj Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2019win7/libopenmpt_test.vcxproj Sun Jul 14 18:10:07 2024 (r21175) @@ -671,6 +671,7 @@ </ItemDefinitionGroup> <ItemGroup> <ClInclude Include="..\..\common\BuildSettings.h" /> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> Modified: branches/OpenMPT-1.31/build/vs2019win7/libopenmpt_test.vcxproj.filters ============================================================================== --- branches/OpenMPT-1.31/build/vs2019win7/libopenmpt_test.vcxproj.filters Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2019win7/libopenmpt_test.vcxproj.filters Sun Jul 14 18:10:07 2024 (r21175) @@ -177,6 +177,9 @@ <ClInclude Include="..\..\common\BuildSettings.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> Modified: branches/OpenMPT-1.31/build/vs2019win7/updatesigntool.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2019win7/updatesigntool.vcxproj Sun Jul 14 18:07:38 2024 (r21174) +++ branches/OpenMPT-1.31/build/vs2019win7/updatesigntool.vcxproj Sun Jul 14 18:10:07 2024 (r21175) @@ -659,6 +659,7 @@ </ItemDefinitionGroup> <ItemGroup> <ClInclude Include="..\..\common\BuildSettings.h" /> + <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> Modified: branches/OpenMPT-1.31/build/vs2019win7/updatesigntool.vcxproj.filters ============================================================================== --- branch... [truncated message content] |
|
From: <sv...@op...> - 2024-07-14 16:07:45
|
Author: manx Date: Sun Jul 14 18:07:38 2024 New Revision: 21174 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21174 Log: [Reg] Disable work-around for <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=115049> for GCC 9 or earlier becuase it gets confused and prduces a ton of warnings about mismatched optimization options when using #pragma GCC optimize with either "no-ip-ra" or even simply "O1". Let's just hope that the problem is way more unlikely to trigger in earlier GCC. Modified: trunk/OpenMPT/common/BuildSettingsCompiler.h Modified: trunk/OpenMPT/common/BuildSettingsCompiler.h ============================================================================== --- trunk/OpenMPT/common/BuildSettingsCompiler.h Sun Jul 14 17:47:26 2024 (r21173) +++ trunk/OpenMPT/common/BuildSettingsCompiler.h Sun Jul 14 18:07:38 2024 (r21174) @@ -46,7 +46,16 @@ #ifdef MPT_COMPILER_SETTING_QUIRK_GCC_NO_IPA_RA // See <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=115049>. +#if MPT_GCC_BEFORE(9, 0, 0) +// Earlier GCC get confused about setting a global function attribute. +// We need to check for 9.0 instead of 9.1 because of +// <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1028580>. +// It also gets confused when setting global optimization -O1, +// so we have no way of fixing GCC 9 or earlier. +//#pragma GCC optimize("O1") +#else #pragma GCC optimize("no-ipa-ra") +#endif #endif // MPT_COMPILER_SETTING_QUIRK_GCC_NO_IPA_RA #endif // MPT_COMPILER_GCC |
3 messages has been excluded from this view by a project administrator.
