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
(182) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <sv...@op...> - 2024-06-14 21:12:11
|
Author: sagamusix Date: Fri Jun 14 23:11:55 2024 New Revision: 21028 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21028 Log: Merged revision(s) 21023, 21025-21027 from trunk/OpenMPT: [Fix] XM: oggmod doesn't know what stereo samples are. As it is difficult (if possible at all) to reconstruct the waveform of the right channel, we restrict importing of those samples as mono samples instead of not importing them at all (which is what happened until now). The stereo sample path remains present as in theory someone could write a bugfixed oggmod tool that writes proper stereo samples. ........ [Imp] DTM: Detect Digital Tracker 2.3, which is the only version writing the ProTracker-like pattern format. ........ [Fix] AMF: When running out of sample slots, file reading became be misaligned because the sample name was not skipped. ........ [Imp] IT: Detect itwriter (https://github.com/chr15m/itwriter/). ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/soundlib/Load_ams.cpp branches/OpenMPT-1.31/soundlib/Load_dtm.cpp branches/OpenMPT-1.31/soundlib/Load_it.cpp branches/OpenMPT-1.31/soundlib/Load_xm.cpp Modified: branches/OpenMPT-1.31/soundlib/Load_ams.cpp ============================================================================== --- branches/OpenMPT-1.31/soundlib/Load_ams.cpp Fri Jun 14 22:20:17 2024 (r21027) +++ branches/OpenMPT-1.31/soundlib/Load_ams.cpp Fri Jun 14 23:11:55 2024 (r21028) @@ -826,12 +826,12 @@ } uint8 numSamples = file.ReadUint8(); - uint8 sampleAssignment[120]; - MemsetZero(sampleAssignment); // Only really needed for v2.0, where the lowest and highest octave aren't cleared. + std::array<uint8, 120> sampleAssignment; + sampleAssignment.fill(0); // Only really needed for v2.0, where the lowest and highest octave aren't cleared. if(numSamples == 0 - || (fileHeader.versionLow > 0 && !file.ReadArray(sampleAssignment)) // v2.01+: 120 Notes - || (fileHeader.versionLow == 0 && !file.ReadRaw(mpt::span(sampleAssignment + 12, 96)).size())) // v2.0: 96 Notes + || (fileHeader.versionLow > 0 && !file.ReadArray(sampleAssignment)) // v2.01+: 120 Notes + || (fileHeader.versionLow == 0 && !file.ReadRaw(mpt::as_span(sampleAssignment).subspan(12, 96)).size())) // v2.0: 96 Notes { continue; } @@ -878,18 +878,17 @@ // Sample headers - we will have to read them even for shadow samples, and we will have to load them several times, // as it is possible that shadow samples use different sample settings like base frequency or panning. const SAMPLEINDEX firstSmp = GetNumSamples() + 1; + std::string sampleName; for(SAMPLEINDEX smp = 0; smp < numSamples; smp++) { - if(firstSmp + smp >= MAX_SAMPLES) - { - file.Skip(sizeof(AMS2SampleHeader)); - break; - } - file.ReadSizedString<uint8le, mpt::String::spacePadded>(m_szNames[firstSmp + smp]); - + file.ReadSizedString<uint8le, mpt::String::spacePadded>(sampleName); AMS2SampleHeader sampleHeader; file.ReadStruct(sampleHeader); + if(firstSmp + smp >= MAX_SAMPLES) + continue; + sampleHeader.ConvertToMPT(Samples[firstSmp + smp]); + m_szNames[firstSmp + smp] = sampleName; uint16 settings = (instrHeader.shadowInstr & instrIndexMask) | ((smp << sampleIndexShift) & sampleIndexMask) Modified: branches/OpenMPT-1.31/soundlib/Load_dtm.cpp ============================================================================== --- branches/OpenMPT-1.31/soundlib/Load_dtm.cpp Fri Jun 14 22:20:17 2024 (r21027) +++ branches/OpenMPT-1.31/soundlib/Load_dtm.cpp Fri Jun 14 23:11:55 2024 (r21028) @@ -576,6 +576,9 @@ if(patternFormat == DTM_206_PATTERN_FORMAT) { tracker = U_("Digital Home Studio"); + } else if(patternFormat == DTM_PT_PATTERN_FORMAT) + { + tracker = U_("Digital Tracker 2.3"); } else if(FileReader chunk = chunks.GetChunk(DTMChunk::idVERS)) { uint32 version = chunk.ReadUint32BE(); Modified: branches/OpenMPT-1.31/soundlib/Load_it.cpp ============================================================================== --- branches/OpenMPT-1.31/soundlib/Load_it.cpp Fri Jun 14 22:20:17 2024 (r21027) +++ branches/OpenMPT-1.31/soundlib/Load_it.cpp Fri Jun 14 23:11:55 2024 (r21028) @@ -1320,7 +1320,12 @@ madeWithTracker = MPT_UFORMAT("ITMCK {}.{}.{}")((fileHeader.cwtv >> 8) & 0x0F, (fileHeader.cwtv >> 4) & 0x0F, fileHeader.cwtv & 0x0F); break; case 0xD: - madeWithTracker = U_("spc2it"); + if(fileHeader.cwtv == 0xDAEB) + madeWithTracker = U_("spc2it"); + else if(fileHeader.cwtv == 0xD1CE) + madeWithTracker = U_("itwriter"); + else + madeWithTracker = U_("Unknown"); break; } } Modified: branches/OpenMPT-1.31/soundlib/Load_xm.cpp ============================================================================== --- branches/OpenMPT-1.31/soundlib/Load_xm.cpp Fri Jun 14 22:20:17 2024 (r21027) +++ branches/OpenMPT-1.31/soundlib/Load_xm.cpp Fri Jun 14 23:11:55 2024 (r21028) @@ -480,6 +480,13 @@ { decodedSamples = ret; LimitMax(decodedSamples, mpt::saturate_cast<long>(sample.nLength - offset)); + if(offset == 0 && channels == 1 && sample.GetNumChannels() == 2) + { + // oggmod doesn't know what stereo samples are, so it treats them as mono samples, but doesn't clear the unknown stereo flag. + // We just take the left channel in this case, as it is difficult (if possible at all) to properly reconstruct the waveform of the right channel. + // Due to XM's delta-encoding and Vorbis being a lossless codec, samples could distort easily even when the delta encoding was off by a very small amount. + sample.uFlags.reset(CHN_STEREO); + } if(decodedSamples > 0 && channels == sample.GetNumChannels()) { if(sample.uFlags[CHN_16BIT]) |
|
From: <sv...@op...> - 2024-06-14 20:20:25
|
Author: sagamusix Date: Fri Jun 14 22:20:17 2024 New Revision: 21027 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21027 Log: [Imp] IT: Detect itwriter (https://github.com/chr15m/itwriter/). Modified: trunk/OpenMPT/soundlib/Load_it.cpp Modified: trunk/OpenMPT/soundlib/Load_it.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_it.cpp Thu Jun 13 21:56:07 2024 (r21026) +++ trunk/OpenMPT/soundlib/Load_it.cpp Fri Jun 14 22:20:17 2024 (r21027) @@ -1298,7 +1298,12 @@ madeWithTracker = MPT_UFORMAT("ITMCK {}.{}.{}")((fileHeader.cwtv >> 8) & 0x0F, (fileHeader.cwtv >> 4) & 0x0F, fileHeader.cwtv & 0x0F); break; case 0xD: - madeWithTracker = U_("spc2it"); + if(fileHeader.cwtv == 0xDAEB) + madeWithTracker = U_("spc2it"); + else if(fileHeader.cwtv == 0xD1CE) + madeWithTracker = U_("itwriter"); + else + madeWithTracker = U_("Unknown"); break; } } |
|
From: <sv...@op...> - 2024-06-13 19:56:26
|
Author: sagamusix Date: Thu Jun 13 21:56:07 2024 New Revision: 21026 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21026 Log: [Fix] AMF: When running out of sample slots, file reading became be misaligned because the sample name was not skipped. Modified: trunk/OpenMPT/soundlib/Load_ams.cpp Modified: trunk/OpenMPT/soundlib/Load_ams.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_ams.cpp Thu Jun 13 21:43:32 2024 (r21025) +++ trunk/OpenMPT/soundlib/Load_ams.cpp Thu Jun 13 21:56:07 2024 (r21026) @@ -823,12 +823,12 @@ } uint8 numSamples = file.ReadUint8(); - uint8 sampleAssignment[120]; - MemsetZero(sampleAssignment); // Only really needed for v2.0, where the lowest and highest octave aren't cleared. + std::array<uint8, 120> sampleAssignment; + sampleAssignment.fill(0); // Only really needed for v2.0, where the lowest and highest octave aren't cleared. if(numSamples == 0 || (fileHeader.versionLow > 0 && !file.ReadArray(sampleAssignment)) // v2.01+: 120 Notes - || (fileHeader.versionLow == 0 && !file.ReadRaw(mpt::span(sampleAssignment + 12, 96)).size())) // v2.0: 96 Notes + || (fileHeader.versionLow == 0 && !file.ReadRaw(mpt::as_span(sampleAssignment).subspan(12, 96)).size())) // v2.0: 96 Notes { continue; } @@ -875,18 +875,17 @@ // Sample headers - we will have to read them even for shadow samples, and we will have to load them several times, // as it is possible that shadow samples use different sample settings like base frequency or panning. const SAMPLEINDEX firstSmp = GetNumSamples() + 1; + std::string sampleName; for(SAMPLEINDEX smp = 0; smp < numSamples; smp++) { - if(firstSmp + smp >= MAX_SAMPLES) - { - file.Skip(sizeof(AMS2SampleHeader)); - break; - } - file.ReadSizedString<uint8le, mpt::String::spacePadded>(m_szNames[firstSmp + smp]); - + file.ReadSizedString<uint8le, mpt::String::spacePadded>(sampleName); AMS2SampleHeader sampleHeader; file.ReadStruct(sampleHeader); + if(firstSmp + smp >= MAX_SAMPLES) + continue; + sampleHeader.ConvertToMPT(Samples[firstSmp + smp]); + m_szNames[firstSmp + smp] = sampleName; uint16 settings = (instrHeader.shadowInstr & instrIndexMask) | ((smp << sampleIndexShift) & sampleIndexMask) |
|
From: <sv...@op...> - 2024-06-13 19:43:44
|
Author: sagamusix Date: Thu Jun 13 21:43:32 2024 New Revision: 21025 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21025 Log: [Imp] DTM: Detect Digital Tracker 2.3, which is the only version writing the ProTracker-like pattern format. Modified: trunk/OpenMPT/soundlib/Load_dtm.cpp Modified: trunk/OpenMPT/soundlib/Load_dtm.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_dtm.cpp Thu Jun 13 21:42:57 2024 (r21024) +++ trunk/OpenMPT/soundlib/Load_dtm.cpp Thu Jun 13 21:43:32 2024 (r21025) @@ -574,6 +574,9 @@ if(patternFormat == DTM_206_PATTERN_FORMAT) { tracker = U_("Digital Home Studio"); + } else if(patternFormat == DTM_PT_PATTERN_FORMAT) + { + tracker = U_("Digital Tracker 2.3"); } else if(FileReader chunk = chunks.GetChunk(DTMChunk::idVERS)) { uint32 version = chunk.ReadUint32BE(); |
|
From: <sv...@op...> - 2024-06-13 19:43:08
|
Author: sagamusix Date: Thu Jun 13 21:42:57 2024 New Revision: 21024 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21024 Log: [Ref] FTM: Don't set number of instruments. No instruments are created so it's reset to 0 later anyway. Modified: trunk/OpenMPT/soundlib/Load_ftm.cpp Modified: trunk/OpenMPT/soundlib/Load_ftm.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_ftm.cpp Thu Jun 13 21:42:29 2024 (r21023) +++ trunk/OpenMPT/soundlib/Load_ftm.cpp Thu Jun 13 21:42:57 2024 (r21024) @@ -132,7 +132,7 @@ m_songName = mpt::String::ReadBuf(mpt::String::nullTerminated, fileHeader.title); m_songArtist = mpt::ToUnicode(mpt::Charset::Amiga_no_C1, mpt::String::ReadBuf(mpt::String::nullTerminated, fileHeader.artist)); - m_nSamples = m_nInstruments = fileHeader.numSamples; + m_nSamples = fileHeader.numSamples; for(SAMPLEINDEX smp = 1; smp <= m_nSamples; smp++) { Samples[smp].Initialize(MOD_TYPE_MOD); |
|
From: <sv...@op...> - 2024-06-13 19:42:43
|
Author: sagamusix Date: Thu Jun 13 21:42:29 2024 New Revision: 21023 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21023 Log: [Fix] XM: oggmod doesn't know what stereo samples are. As it is difficult (if possible at all) to reconstruct the waveform of the right channel, we restrict importing of those samples as mono samples instead of not importing them at all (which is what happened until now). The stereo sample path remains present as in theory someone could write a bugfixed oggmod tool that writes proper stereo samples. Modified: trunk/OpenMPT/soundlib/Load_xm.cpp Modified: trunk/OpenMPT/soundlib/Load_xm.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_xm.cpp Thu Jun 13 20:04:02 2024 (r21022) +++ trunk/OpenMPT/soundlib/Load_xm.cpp Thu Jun 13 21:42:29 2024 (r21023) @@ -480,6 +480,13 @@ { decodedSamples = ret; LimitMax(decodedSamples, mpt::saturate_cast<long>(sample.nLength - offset)); + if(offset == 0 && channels == 1 && sample.GetNumChannels() == 2) + { + // oggmod doesn't know what stereo samples are, so it treats them as mono samples, but doesn't clear the unknown stereo flag. + // We just take the left channel in this case, as it is difficult (if possible at all) to properly reconstruct the waveform of the right channel. + // Due to XM's delta-encoding and Vorbis being a lossless codec, samples could distort easily even when the delta encoding was off by a very small amount. + sample.uFlags.reset(CHN_STEREO); + } if(decodedSamples > 0 && channels == sample.GetNumChannels()) { if(sample.uFlags[CHN_16BIT]) |
|
From: <sv...@op...> - 2024-06-13 18:04:13
|
Author: sagamusix Date: Thu Jun 13 20:04:02 2024 New Revision: 21022 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21022 Log: [Mod] When removing plugins, go back to just sending one message to all views instead of many to speed up the GUI. Modified: trunk/OpenMPT/mptrack/Modedit.cpp Modified: trunk/OpenMPT/mptrack/Modedit.cpp ============================================================================== --- trunk/OpenMPT/mptrack/Modedit.cpp Thu Jun 13 15:38:48 2024 (r21021) +++ trunk/OpenMPT/mptrack/Modedit.cpp Thu Jun 13 20:04:02 2024 (r21022) @@ -616,11 +616,10 @@ if(srcPlug.GetOutputPlugin() == nPlug) { srcPlug.SetOutputToMaster(); - UpdateAllViews(nullptr, PluginHint(static_cast<PLUGINDEX>(srcPlugSlot + 1)).Info()); } } - UpdateAllViews(nullptr, PluginHint(static_cast<PLUGINDEX>(nPlug + 1)).Info().Names()); } + UpdateAllViews(nullptr, PluginHint().Info().Names()); if(nRemoved && m_SndFile.GetModSpecifications().supportsPlugins) SetModified(); |
|
From: <sv...@op...> - 2024-06-13 13:38:56
|
Author: manx Date: Thu Jun 13 15:38:48 2024 New Revision: 21021 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21021 Log: [Fix] build: download_externals: Do not immediately fail when one single download files, in case we have other possible URLs available. Verification will eventually fail later on anyway. [Fix] build: download_externals: Do not use del to delete files on Windows because it cannot handle forward slashes. Added: trunk/OpenMPT/build/scriptlib/Delete-File.ps1 Modified: trunk/OpenMPT/build/download_externals.sh trunk/OpenMPT/build/scriptlib/download.cmd Modified: trunk/OpenMPT/build/download_externals.sh ============================================================================== --- trunk/OpenMPT/build/download_externals.sh Wed Jun 12 19:56:31 2024 (r21020) +++ trunk/OpenMPT/build/download_externals.sh Thu Jun 13 15:38:48 2024 (r21021) @@ -34,7 +34,7 @@ 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" + curl --location -o "$MPT_GET_FILE_NAME" "$URL" || true echo "Verifying '$URL' ..." if [ -f "$MPT_GET_FILE_NAME" ]; then FILE_SIZE=$(find "$MPT_GET_FILE_NAME" -printf '%s') Added: trunk/OpenMPT/build/scriptlib/Delete-File.ps1 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/OpenMPT/build/scriptlib/Delete-File.ps1 Thu Jun 13 15:38:48 2024 (r21021) @@ -0,0 +1,3 @@ +param([String]$filename="") +Remove-Item $filenme +exit 0 Modified: trunk/OpenMPT/build/scriptlib/download.cmd ============================================================================== --- trunk/OpenMPT/build/scriptlib/download.cmd Wed Jun 12 19:56:31 2024 (r21020) +++ trunk/OpenMPT/build/scriptlib/download.cmd Thu Jun 13 15:38:48 2024 (r21021) @@ -8,7 +8,7 @@ echo "Checking '%MPT_DOWNLOAD_FILENAME%' ..." if exist "%MPT_DOWNLOAD_FILENAME%" ( - powershell -ExecutionPolicy Unrestricted .\build\scriptlib\Verify-File.ps1 -filename %MPT_DOWNLOAD_FILENAME% -filesize %MPT_DOWNLOAD_FILESIZE% -hashvalue %MPT_DOWNLOAD_FILEHASH% || del /Q "%MPT_DOWNLOAD_FILENAME%" + powershell -ExecutionPolicy Unrestricted .\build\scriptlib\Verify-File.ps1 -filename %MPT_DOWNLOAD_FILENAME% -filesize %MPT_DOWNLOAD_FILESIZE% -hashvalue %MPT_DOWNLOAD_FILEHASH% || powershell -ExecutionPolicy Unrestricted .\build\scriptlib\Delete-File.ps1 -filename %MPT_DOWNLOAD_FILENAME% ) if "x%MPT_DOWNLOAD_DO%" == "xyes" ( @@ -16,10 +16,10 @@ if not "%~1" == "" ( if not exist "%MPT_DOWNLOAD_FILENAME%" ( echo "Downloading '%MPT_DOWNLOAD_FILENAME%' from '%~1' ..." - powershell -Command "(New-Object Net.WebClient).DownloadFile('%~1', '%MPT_DOWNLOAD_FILENAME%')" || exit /B 1 + powershell -Command "(New-Object Net.WebClient).DownloadFile('%~1', '%MPT_DOWNLOAD_FILENAME%')" echo "Verifying '%~1' ..." if exist "%MPT_DOWNLOAD_FILENAME%" ( - powershell -ExecutionPolicy Unrestricted .\build\scriptlib\Verify-File.ps1 -filename %MPT_DOWNLOAD_FILENAME% -filesize %MPT_DOWNLOAD_FILESIZE% -hashvalue %MPT_DOWNLOAD_FILEHASH% || del /Q "%MPT_DOWNLOAD_FILENAME%" + powershell -ExecutionPolicy Unrestricted .\build\scriptlib\Verify-File.ps1 -filename %MPT_DOWNLOAD_FILENAME% -filesize %MPT_DOWNLOAD_FILESIZE% -hashvalue %MPT_DOWNLOAD_FILEHASH% || powershell -ExecutionPolicy Unrestricted .\build\scriptlib\Delete-File.ps1 -filename %MPT_DOWNLOAD_FILENAME% ) ) shift |
|
From: <sv...@op...> - 2024-06-12 17:56:49
|
Author: sagamusix Date: Wed Jun 12 19:56:31 2024 New Revision: 21020 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21020 Log: Merged revision(s) 21019 from trunk/OpenMPT: [Fix] DBM: When several instruments referenced the same sample with different properties (volume, loop points, etc.), only one set of properties was imported (fixes DBM.Supernova, https://www.un4seen.com/forum/?topic=15448.msg143091#msg143091) [Imp] DBM: Import second sustain point in case the first sustain point is not set, or if it has a lower index than the first. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/soundlib/Load_dbm.cpp Modified: branches/OpenMPT-1.31/soundlib/Load_dbm.cpp ============================================================================== --- branches/OpenMPT-1.31/soundlib/Load_dbm.cpp Wed Jun 12 19:48:28 2024 (r21019) +++ branches/OpenMPT-1.31/soundlib/Load_dbm.cpp Wed Jun 12 19:56:31 2024 (r21020) @@ -38,17 +38,17 @@ // 32-Bit chunk identifiers enum ChunkIdentifiers { - idNAME = MagicBE("NAME"), - idINFO = MagicBE("INFO"), - idSONG = MagicBE("SONG"), - idINST = MagicBE("INST"), - idVENV = MagicBE("VENV"), - idPENV = MagicBE("PENV"), - idPATT = MagicBE("PATT"), - idPNAM = MagicBE("PNAM"), - idSMPL = MagicBE("SMPL"), - idDSPE = MagicBE("DSPE"), - idMPEG = MagicBE("MPEG"), + idNAME = MagicBE("NAME"), + idINFO = MagicBE("INFO"), + idSONG = MagicBE("SONG"), + idINST = MagicBE("INST"), + idVENV = MagicBE("VENV"), + idPENV = MagicBE("PENV"), + idPATT = MagicBE("PATT"), + idPNAM = MagicBE("PNAM"), + idSMPL = MagicBE("SMPL"), + idDSPE = MagicBE("DSPE"), + idMPEG = MagicBE("MPEG"), }; uint32be id; @@ -85,18 +85,43 @@ { enum DBMInstrFlags { - smpLoop = 0x01, - smpPingPongLoop = 0x02, + smpLoop = 0x01, + smpPingPongLoop = 0x02, }; char name[30]; - uint16be sample; // Sample reference - uint16be volume; // 0...64 + uint16be sample; // Sample reference + uint16be volume; // 0...64 uint32be sampleRate; uint32be loopStart; uint32be loopLength; - int16be panning; // -128...128 - uint16be flags; // See DBMInstrFlags + int16be panning; // -128...128 + uint16be flags; // See DBMInstrFlags + + void ConvertToMPT(ModInstrument &mptIns) const + { + mptIns.name = mpt::String::ReadBuf(mpt::String::maybeNullTerminated, name); + mptIns.nFadeOut = 0; + mptIns.nPan = static_cast<uint16>(panning + 128); + LimitMax(mptIns.nPan, uint32(256)); + mptIns.dwFlags.set(INS_SETPANNING); + } + + void ConvertToMPT(ModSample &mptSmp) const + { + mptSmp.Initialize(); + mptSmp.nVolume = std::min(static_cast<uint16>(volume), uint16(64)) * 4u; + mptSmp.nC5Speed = Util::muldivr(sampleRate, 8303, 8363); + + if(loopLength && (flags & (smpLoop | smpPingPongLoop))) + { + mptSmp.nLoopStart = loopStart; + mptSmp.nLoopEnd = mptSmp.nLoopStart + loopLength; + mptSmp.uFlags.set(CHN_LOOP); + if(flags & smpPingPongLoop) + mptSmp.uFlags.set(CHN_PINGPONGLOOP); + } + } }; MPT_BINARY_STRUCT(DBMInstrument, 50) @@ -107,19 +132,55 @@ { enum DBMEnvelopeFlags { - envEnabled = 0x01, - envSustain = 0x02, - envLoop = 0x04, + envEnabled = 0x01, + envSustain1 = 0x02, + envLoop = 0x04, + envSustain2 = 0x08, }; uint16be instrument; - uint8be flags; // See DBMEnvelopeFlags - uint8be numSegments; // Number of envelope points - 1 + uint8be flags; // See DBMEnvelopeFlags + uint8be numSegments; // Number of envelope points - 1 uint8be sustain1; uint8be loopBegin; uint8be loopEnd; - uint8be sustain2; // Second sustain point + uint8be sustain2; // Second sustain point uint16be data[2 * 32]; + + void ConvertToMPT(InstrumentEnvelope &mptEnv, bool scaleEnv) const + { + if(numSegments) + { + if(flags & envEnabled) mptEnv.dwFlags.set(ENV_ENABLED); + if(flags & (envSustain1 | envSustain2)) mptEnv.dwFlags.set(ENV_SUSTAIN); + if(flags & envLoop) mptEnv.dwFlags.set(ENV_LOOP); + } + + uint8 numPoints = std::min(numSegments.get(), uint8(31)) + 1; + mptEnv.resize(numPoints); + + mptEnv.nLoopStart = loopBegin; + mptEnv.nLoopEnd = loopEnd; + if((flags & (envSustain1 | envSustain2)) == envSustain1) + mptEnv.nSustainStart = mptEnv.nSustainEnd = sustain1; + else if((flags & (envSustain1 | envSustain2)) == envSustain2) + mptEnv.nSustainStart = mptEnv.nSustainEnd = sustain2; + else + mptEnv.nSustainStart = mptEnv.nSustainEnd = std::min(sustain1, sustain2); + + for(uint8 i = 0; i < numPoints; i++) + { + mptEnv[i].tick = data[i * 2]; + uint16 val = data[i * 2 + 1]; + if(scaleEnv) + { + // Panning envelopes are -128...128 in DigiBooster Pro 3.x + val = static_cast<uint16>((val + 128) / 4); + } + LimitMax(val, uint16(64)); + mptEnv[i].value = static_cast<uint8>(val); + } + } }; MPT_BINARY_STRUCT(DBMEnvelope, 136) @@ -137,11 +198,11 @@ CMD_NONE, CMD_PANNINGSLIDE, CMD_NONE, CMD_NONE, CMD_NONE, CMD_NONE, CMD_NONE, #ifndef NO_PLUGINS - CMD_DBMECHO, // Toggle DSP - CMD_MIDI, // Wxx Echo Delay - CMD_MIDI, // Xxx Echo Feedback - CMD_MIDI, // Yxx Echo Mix - CMD_MIDI, // Zxx Echo Cross + CMD_DBMECHO, // Toggle DSP + CMD_MIDI, // Wxx Echo Delay + CMD_MIDI, // Xxx Echo Feedback + CMD_MIDI, // Yxx Echo Mix + CMD_MIDI, // Zxx Echo Cross #endif // NO_PLUGINS }; @@ -197,15 +258,15 @@ case CMD_MODCMDEX: switch(param & 0xF0) { - case 0x30: // Play backwards + case 0x30: // Play backwards command = CMD_S3MCMDEX; param = 0x9F; break; - case 0x40: // Turn off sound in channel (volume / portamento commands after this can't pick up the note anymore) + case 0x40: // Turn off sound in channel (volume / portamento commands after this can't pick up the note anymore) command = CMD_S3MCMDEX; param = 0xC0; break; - case 0x50: // Turn on/off channel + case 0x50: // Turn on/off channel // TODO: Apparently this should also kill the playing note. if((param & 0x0F) <= 0x01) { @@ -213,7 +274,7 @@ param = (param == 0x50) ? 0x00 : 0x40; } break; - case 0x70: // Coarse offset + case 0x70: // Coarse offset command = CMD_S3MCMDEX; param = 0xA0 | (param & 0x0F); break; @@ -258,35 +319,7 @@ uint16 dbmIns = dbmEnv.instrument; if(dbmIns > 0 && dbmIns <= sndFile.GetNumInstruments() && (sndFile.Instruments[dbmIns] != nullptr)) { - ModInstrument *mptIns = sndFile.Instruments[dbmIns]; - InstrumentEnvelope &mptEnv = mptIns->GetEnvelope(envType); - - if(dbmEnv.numSegments) - { - if(dbmEnv.flags & DBMEnvelope::envEnabled) mptEnv.dwFlags.set(ENV_ENABLED); - if(dbmEnv.flags & DBMEnvelope::envSustain) mptEnv.dwFlags.set(ENV_SUSTAIN); - if(dbmEnv.flags & DBMEnvelope::envLoop) mptEnv.dwFlags.set(ENV_LOOP); - } - - uint8 numPoints = std::min(dbmEnv.numSegments.get(), uint8(31)) + 1; - mptEnv.resize(numPoints); - - mptEnv.nLoopStart = dbmEnv.loopBegin; - mptEnv.nLoopEnd = dbmEnv.loopEnd; - mptEnv.nSustainStart = mptEnv.nSustainEnd = dbmEnv.sustain1; - - for(uint8 i = 0; i < numPoints; i++) - { - mptEnv[i].tick = dbmEnv.data[i * 2]; - uint16 val = dbmEnv.data[i * 2 + 1]; - if(scaleEnv) - { - // Panning envelopes are -128...128 in DigiBooster Pro 3.x - val = (val + 128) / 4; - } - LimitMax(val, uint16(64)); - mptEnv[i].value = static_cast<uint8>(val); - } + dbmEnv.ConvertToMPT(sndFile.Instruments[dbmIns]->GetEnvelope(envType), scaleEnv); } } } @@ -407,41 +440,41 @@ #endif // MPT_DBM_USE_REAL_SUBSONGS // Read instruments + std::map<SAMPLEINDEX, SAMPLEINDEX> copySample; if(FileReader instChunk = chunks.GetChunk(DBMChunk::idINST)) { + std::set<SAMPLEINDEX> sampleUsed; for(INSTRUMENTINDEX i = 1; i <= GetNumInstruments(); i++) { DBMInstrument instrHeader; instChunk.ReadStruct(instrHeader); - ModInstrument *mptIns = AllocateInstrument(i, instrHeader.sample); - if(mptIns == nullptr || instrHeader.sample >= MAX_SAMPLES) + SAMPLEINDEX mappedSample = instrHeader.sample; + if(sampleUsed.count(mappedSample) && CanAddMoreSamples()) { - continue; + ModSample mptSmp; + instrHeader.ConvertToMPT(mptSmp); + const ModSample &origSmp = Samples[mappedSample]; + if(mptSmp.nVolume != origSmp.nVolume + || mptSmp.uFlags != origSmp.uFlags + || mptSmp.nLoopStart != origSmp.nLoopStart + || mptSmp.nLoopEnd != origSmp.nLoopEnd + || mptSmp.nC5Speed != origSmp.nC5Speed) + { + // Need to duplicate + mappedSample = ++m_nSamples; + copySample.emplace(mappedSample, instrHeader.sample); + } } + ModInstrument *mptIns = AllocateInstrument(i, mappedSample); + if(mptIns == nullptr || mappedSample >= MAX_SAMPLES) + continue; - mptIns->name = mpt::String::ReadBuf(mpt::String::maybeNullTerminated, instrHeader.name); - m_szNames[instrHeader.sample] = mpt::String::ReadBuf(mpt::String::maybeNullTerminated, instrHeader.name); - - mptIns->nFadeOut = 0; - mptIns->nPan = static_cast<uint16>(instrHeader.panning + 128); - LimitMax(mptIns->nPan, uint32(256)); - mptIns->dwFlags.set(INS_SETPANNING); - + instrHeader.ConvertToMPT(*mptIns); // Sample Info - ModSample &mptSmp = Samples[instrHeader.sample]; - mptSmp.Initialize(); - mptSmp.nVolume = std::min(static_cast<uint16>(instrHeader.volume), uint16(64)) * 4u; - mptSmp.nC5Speed = Util::muldivr(instrHeader.sampleRate, 8303, 8363); - - if(instrHeader.loopLength && (instrHeader.flags & (DBMInstrument::smpLoop | DBMInstrument::smpPingPongLoop))) - { - mptSmp.nLoopStart = instrHeader.loopStart; - mptSmp.nLoopEnd = mptSmp.nLoopStart + instrHeader.loopLength; - mptSmp.uFlags.set(CHN_LOOP); - if(instrHeader.flags & DBMInstrument::smpPingPongLoop) - mptSmp.uFlags.set(CHN_PINGPONGLOOP); - } + instrHeader.ConvertToMPT(Samples[mappedSample]); + m_szNames[mappedSample] = mptIns->name; + sampleUsed.insert(mappedSample); } // Read envelopes @@ -466,7 +499,7 @@ if(patternChunk.IsValid() && (loadFlags & loadPatternData)) { FileReader patternNameChunk = chunks.GetChunk(DBMChunk::idPNAM); - patternNameChunk.Skip(1); // Encoding, should be UTF-8 or ASCII + patternNameChunk.Skip(1); // Encoding (0 = unspecified ASCII-compatible 8-bit encoding, 106 = UTF-8) Patterns.ResizeArray(infoData.patterns); std::vector<std::pair<EffectCommand, ModCommand::PARAM>> lostGlobalCommands; @@ -641,6 +674,13 @@ { for(SAMPLEINDEX smp = 1; smp <= GetNumSamples(); smp++) { + if(auto copyFrom = copySample.find(smp); copyFrom != copySample.end()) + { + Samples[smp].nLength = Samples[copyFrom->second].nLength; + Samples[smp].CopyWaveform(Samples[copyFrom->second]); + continue; + } + uint32 sampleFlags = sampleChunk.ReadUint32BE(); uint32 sampleLength = sampleChunk.ReadUint32BE(); |
|
From: <sv...@op...> - 2024-06-12 17:48:42
|
Author: sagamusix Date: Wed Jun 12 19:48:28 2024 New Revision: 21019 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21019 Log: [Fix] DBM: When several instruments referenced the same sample with different properties (volume, loop points, etc.), only one set of properties was imported (fixes DBM.Supernova, https://www.un4seen.com/forum/?topic=15448.msg143091#msg143091) [Imp] DBM: Import second sustain point in case the first sustain point is not set, or if it has a lower index than the first. Modified: trunk/OpenMPT/soundlib/Load_dbm.cpp Modified: trunk/OpenMPT/soundlib/Load_dbm.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_dbm.cpp Tue Jun 11 16:14:28 2024 (r21018) +++ trunk/OpenMPT/soundlib/Load_dbm.cpp Wed Jun 12 19:48:28 2024 (r21019) @@ -38,17 +38,17 @@ // 32-Bit chunk identifiers enum ChunkIdentifiers { - idNAME = MagicBE("NAME"), - idINFO = MagicBE("INFO"), - idSONG = MagicBE("SONG"), - idINST = MagicBE("INST"), - idVENV = MagicBE("VENV"), - idPENV = MagicBE("PENV"), - idPATT = MagicBE("PATT"), - idPNAM = MagicBE("PNAM"), - idSMPL = MagicBE("SMPL"), - idDSPE = MagicBE("DSPE"), - idMPEG = MagicBE("MPEG"), + idNAME = MagicBE("NAME"), + idINFO = MagicBE("INFO"), + idSONG = MagicBE("SONG"), + idINST = MagicBE("INST"), + idVENV = MagicBE("VENV"), + idPENV = MagicBE("PENV"), + idPATT = MagicBE("PATT"), + idPNAM = MagicBE("PNAM"), + idSMPL = MagicBE("SMPL"), + idDSPE = MagicBE("DSPE"), + idMPEG = MagicBE("MPEG"), }; uint32be id; @@ -85,18 +85,43 @@ { enum DBMInstrFlags { - smpLoop = 0x01, - smpPingPongLoop = 0x02, + smpLoop = 0x01, + smpPingPongLoop = 0x02, }; char name[30]; - uint16be sample; // Sample reference - uint16be volume; // 0...64 + uint16be sample; // Sample reference + uint16be volume; // 0...64 uint32be sampleRate; uint32be loopStart; uint32be loopLength; - int16be panning; // -128...128 - uint16be flags; // See DBMInstrFlags + int16be panning; // -128...128 + uint16be flags; // See DBMInstrFlags + + void ConvertToMPT(ModInstrument &mptIns) const + { + mptIns.name = mpt::String::ReadBuf(mpt::String::maybeNullTerminated, name); + mptIns.nFadeOut = 0; + mptIns.nPan = static_cast<uint16>(panning + 128); + LimitMax(mptIns.nPan, uint32(256)); + mptIns.dwFlags.set(INS_SETPANNING); + } + + void ConvertToMPT(ModSample &mptSmp) const + { + mptSmp.Initialize(); + mptSmp.nVolume = std::min(static_cast<uint16>(volume), uint16(64)) * 4u; + mptSmp.nC5Speed = Util::muldivr(sampleRate, 8303, 8363); + + if(loopLength && (flags & (smpLoop | smpPingPongLoop))) + { + mptSmp.nLoopStart = loopStart; + mptSmp.nLoopEnd = mptSmp.nLoopStart + loopLength; + mptSmp.uFlags.set(CHN_LOOP); + if(flags & smpPingPongLoop) + mptSmp.uFlags.set(CHN_PINGPONGLOOP); + } + } }; MPT_BINARY_STRUCT(DBMInstrument, 50) @@ -107,19 +132,55 @@ { enum DBMEnvelopeFlags { - envEnabled = 0x01, - envSustain = 0x02, - envLoop = 0x04, + envEnabled = 0x01, + envSustain1 = 0x02, + envLoop = 0x04, + envSustain2 = 0x08, }; uint16be instrument; - uint8be flags; // See DBMEnvelopeFlags - uint8be numSegments; // Number of envelope points - 1 + uint8be flags; // See DBMEnvelopeFlags + uint8be numSegments; // Number of envelope points - 1 uint8be sustain1; uint8be loopBegin; uint8be loopEnd; - uint8be sustain2; // Second sustain point + uint8be sustain2; // Second sustain point uint16be data[2 * 32]; + + void ConvertToMPT(InstrumentEnvelope &mptEnv, bool scaleEnv) const + { + if(numSegments) + { + if(flags & envEnabled) mptEnv.dwFlags.set(ENV_ENABLED); + if(flags & (envSustain1 | envSustain2)) mptEnv.dwFlags.set(ENV_SUSTAIN); + if(flags & envLoop) mptEnv.dwFlags.set(ENV_LOOP); + } + + uint8 numPoints = std::min(numSegments.get(), uint8(31)) + 1; + mptEnv.resize(numPoints); + + mptEnv.nLoopStart = loopBegin; + mptEnv.nLoopEnd = loopEnd; + if((flags & (envSustain1 | envSustain2)) == envSustain1) + mptEnv.nSustainStart = mptEnv.nSustainEnd = sustain1; + else if((flags & (envSustain1 | envSustain2)) == envSustain2) + mptEnv.nSustainStart = mptEnv.nSustainEnd = sustain2; + else + mptEnv.nSustainStart = mptEnv.nSustainEnd = std::min(sustain1, sustain2); + + for(uint8 i = 0; i < numPoints; i++) + { + mptEnv[i].tick = data[i * 2]; + uint16 val = data[i * 2 + 1]; + if(scaleEnv) + { + // Panning envelopes are -128...128 in DigiBooster Pro 3.x + val = static_cast<uint16>((val + 128) / 4); + } + LimitMax(val, uint16(64)); + mptEnv[i].value = static_cast<uint8>(val); + } + } }; MPT_BINARY_STRUCT(DBMEnvelope, 136) @@ -137,11 +198,11 @@ CMD_NONE, CMD_PANNINGSLIDE, CMD_NONE, CMD_NONE, CMD_NONE, CMD_NONE, CMD_NONE, #ifndef NO_PLUGINS - CMD_DBMECHO, // Toggle DSP - CMD_MIDI, // Wxx Echo Delay - CMD_MIDI, // Xxx Echo Feedback - CMD_MIDI, // Yxx Echo Mix - CMD_MIDI, // Zxx Echo Cross + CMD_DBMECHO, // Toggle DSP + CMD_MIDI, // Wxx Echo Delay + CMD_MIDI, // Xxx Echo Feedback + CMD_MIDI, // Yxx Echo Mix + CMD_MIDI, // Zxx Echo Cross #endif // NO_PLUGINS }; @@ -197,15 +258,15 @@ case CMD_MODCMDEX: switch(param & 0xF0) { - case 0x30: // Play backwards + case 0x30: // Play backwards command = CMD_S3MCMDEX; param = 0x9F; break; - case 0x40: // Turn off sound in channel (volume / portamento commands after this can't pick up the note anymore) + case 0x40: // Turn off sound in channel (volume / portamento commands after this can't pick up the note anymore) command = CMD_S3MCMDEX; param = 0xC0; break; - case 0x50: // Turn on/off channel + case 0x50: // Turn on/off channel // TODO: Apparently this should also kill the playing note. if((param & 0x0F) <= 0x01) { @@ -213,7 +274,7 @@ param = (param == 0x50) ? 0x00 : 0x40; } break; - case 0x70: // Coarse offset + case 0x70: // Coarse offset command = CMD_S3MCMDEX; param = 0xA0 | (param & 0x0F); break; @@ -258,35 +319,7 @@ uint16 dbmIns = dbmEnv.instrument; if(dbmIns > 0 && dbmIns <= sndFile.GetNumInstruments() && (sndFile.Instruments[dbmIns] != nullptr)) { - ModInstrument *mptIns = sndFile.Instruments[dbmIns]; - InstrumentEnvelope &mptEnv = mptIns->GetEnvelope(envType); - - if(dbmEnv.numSegments) - { - if(dbmEnv.flags & DBMEnvelope::envEnabled) mptEnv.dwFlags.set(ENV_ENABLED); - if(dbmEnv.flags & DBMEnvelope::envSustain) mptEnv.dwFlags.set(ENV_SUSTAIN); - if(dbmEnv.flags & DBMEnvelope::envLoop) mptEnv.dwFlags.set(ENV_LOOP); - } - - uint8 numPoints = std::min(dbmEnv.numSegments.get(), uint8(31)) + 1; - mptEnv.resize(numPoints); - - mptEnv.nLoopStart = dbmEnv.loopBegin; - mptEnv.nLoopEnd = dbmEnv.loopEnd; - mptEnv.nSustainStart = mptEnv.nSustainEnd = dbmEnv.sustain1; - - for(uint8 i = 0; i < numPoints; i++) - { - mptEnv[i].tick = dbmEnv.data[i * 2]; - uint16 val = dbmEnv.data[i * 2 + 1]; - if(scaleEnv) - { - // Panning envelopes are -128...128 in DigiBooster Pro 3.x - val = static_cast<uint16>((val + 128) / 4); - } - LimitMax(val, uint16(64)); - mptEnv[i].value = static_cast<uint8>(val); - } + dbmEnv.ConvertToMPT(sndFile.Instruments[dbmIns]->GetEnvelope(envType), scaleEnv); } } } @@ -405,41 +438,41 @@ #endif // MPT_DBM_USE_REAL_SUBSONGS // Read instruments + std::map<SAMPLEINDEX, SAMPLEINDEX> copySample; if(FileReader instChunk = chunks.GetChunk(DBMChunk::idINST)) { + std::set<SAMPLEINDEX> sampleUsed; for(INSTRUMENTINDEX i = 1; i <= GetNumInstruments(); i++) { DBMInstrument instrHeader; instChunk.ReadStruct(instrHeader); - ModInstrument *mptIns = AllocateInstrument(i, instrHeader.sample); - if(mptIns == nullptr || instrHeader.sample >= MAX_SAMPLES) + SAMPLEINDEX mappedSample = instrHeader.sample; + if(sampleUsed.count(mappedSample) && CanAddMoreSamples()) { - continue; + ModSample mptSmp; + instrHeader.ConvertToMPT(mptSmp); + const ModSample &origSmp = Samples[mappedSample]; + if(mptSmp.nVolume != origSmp.nVolume + || mptSmp.uFlags != origSmp.uFlags + || mptSmp.nLoopStart != origSmp.nLoopStart + || mptSmp.nLoopEnd != origSmp.nLoopEnd + || mptSmp.nC5Speed != origSmp.nC5Speed) + { + // Need to duplicate + mappedSample = ++m_nSamples; + copySample.emplace(mappedSample, instrHeader.sample); + } } + ModInstrument *mptIns = AllocateInstrument(i, mappedSample); + if(mptIns == nullptr || mappedSample >= MAX_SAMPLES) + continue; - mptIns->name = mpt::String::ReadBuf(mpt::String::maybeNullTerminated, instrHeader.name); - m_szNames[instrHeader.sample] = mpt::String::ReadBuf(mpt::String::maybeNullTerminated, instrHeader.name); - - mptIns->nFadeOut = 0; - mptIns->nPan = static_cast<uint16>(instrHeader.panning + 128); - LimitMax(mptIns->nPan, uint32(256)); - mptIns->dwFlags.set(INS_SETPANNING); - + instrHeader.ConvertToMPT(*mptIns); // Sample Info - ModSample &mptSmp = Samples[instrHeader.sample]; - mptSmp.Initialize(); - mptSmp.nVolume = std::min(static_cast<uint16>(instrHeader.volume), uint16(64)) * 4u; - mptSmp.nC5Speed = Util::muldivr(instrHeader.sampleRate, 8303, 8363); - - if(instrHeader.loopLength && (instrHeader.flags & (DBMInstrument::smpLoop | DBMInstrument::smpPingPongLoop))) - { - mptSmp.nLoopStart = instrHeader.loopStart; - mptSmp.nLoopEnd = mptSmp.nLoopStart + instrHeader.loopLength; - mptSmp.uFlags.set(CHN_LOOP); - if(instrHeader.flags & DBMInstrument::smpPingPongLoop) - mptSmp.uFlags.set(CHN_PINGPONGLOOP); - } + instrHeader.ConvertToMPT(Samples[mappedSample]); + m_szNames[mappedSample] = mptIns->name; + sampleUsed.insert(mappedSample); } // Read envelopes @@ -464,7 +497,7 @@ if(patternChunk.IsValid() && (loadFlags & loadPatternData)) { FileReader patternNameChunk = chunks.GetChunk(DBMChunk::idPNAM); - patternNameChunk.Skip(1); // Encoding, should be UTF-8 or ASCII + patternNameChunk.Skip(1); // Encoding (0 = unspecified ASCII-compatible 8-bit encoding, 106 = UTF-8) Patterns.ResizeArray(infoData.patterns); std::vector<std::pair<EffectCommand, ModCommand::PARAM>> lostGlobalCommands; @@ -639,6 +672,13 @@ { for(SAMPLEINDEX smp = 1; smp <= GetNumSamples(); smp++) { + if(auto copyFrom = copySample.find(smp); copyFrom != copySample.end()) + { + Samples[smp].nLength = Samples[copyFrom->second].nLength; + Samples[smp].CopyWaveform(Samples[copyFrom->second]); + continue; + } + uint32 sampleFlags = sampleChunk.ReadUint32BE(); uint32 sampleLength = sampleChunk.ReadUint32BE(); |
|
From: <sv...@op...> - 2024-06-11 14:14:44
|
Author: manx Date: Tue Jun 11 16:14:28 2024 New Revision: 21018 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21018 Log: [Imp] build: Makefile: DJGPP: Add more external-FPU CPU variants. Modified: trunk/OpenMPT/build/make/config-djgpp.mk Modified: trunk/OpenMPT/build/make/config-djgpp.mk ============================================================================== --- trunk/OpenMPT/build/make/config-djgpp.mk Tue Jun 11 16:11:22 2024 (r21017) +++ trunk/OpenMPT/build/make/config-djgpp.mk Tue Jun 11 16:14:28 2024 (r21018) @@ -299,6 +299,10 @@ ibm/486slc := $(___) -march=i486 $(FPU_NONE) -mtune=i386 $(OPT_UARCH_CISC) --param l1-cache-size=12 --param l2-cache-size=$(CACHE_386) ibm/486bl := $(___) -march=i486 $(FPU_NONE) -mtune=i386 $(OPT_UARCH_CISC) --param l1-cache-size=12 --param l2-cache-size=$(CACHE_486) +ibm/386slc+fasmath := $(___) -march=i386 $(FPU_387) -mtune=i386 $(OPT_UARCH_CISC) --param l1-cache-size=6 --param l2-cache-size=$(CACHE_386) +ibm/486slc+fasmath := $(___) -march=i486 $(FPU_387) -mtune=i386 $(OPT_UARCH_CISC) --param l1-cache-size=12 --param l2-cache-size=$(CACHE_386) +ibm/486bl+fasmath := $(___) -march=i486 $(FPU_387) -mtune=i386 $(OPT_UARCH_CISC) --param l1-cache-size=12 --param l2-cache-size=$(CACHE_486) + cyrix/cx486slc := $(___) -march=i486 $(FPU_NONE) -mtune=i486 $(OPT_UARCH_PIPE) --param l1-cache-size=1 --param l2-cache-size=$(CACHE_386) |
|
From: <sv...@op...> - 2024-06-11 14:11:37
|
Author: manx Date: Tue Jun 11 16:11:22 2024 New Revision: 21017 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21017 Log: [Var] InnoSetup: Update to 6.3.1. Fixes <https://bugs.openmpt.org/view.php?id=1788>. [Fix] build/download_externals: Use InnoSetup portable mode to extract the files instead of relying on innounp. This is supported since InnoSetup 6.0.1. [Ref] installer: Rename x64 to x64os due to InnoSetup changing things. [Reg] installer: Remove ia64 installer option. This is unsupported by InnoSetup now. [Mod] OpenMPT: Version is now 1.32.00.18 Modified: trunk/OpenMPT/build/download_externals.cmd trunk/OpenMPT/build/download_externals.txt trunk/OpenMPT/common/versionNumber.h trunk/OpenMPT/installer/install-multi-arch.iss Modified: trunk/OpenMPT/build/download_externals.cmd ============================================================================== --- trunk/OpenMPT/build/download_externals.cmd Tue Jun 11 08:29:13 2024 (r21016) +++ trunk/OpenMPT/build/download_externals.cmd Tue Jun 11 16:11:22 2024 (r21017) @@ -49,11 +49,14 @@ call build\scriptlib\unpack.cmd "build\tools\python3" "build\externals\python-3.12.4-embed-amd64.zip" "." || goto error -call :killdir "build\tools\innounp" || goto error + call :killdir "build\tools\innosetup" || goto error +mkdir "build\tools\innosetup" || goto error +"build\externals\innosetup-6.3.1.exe" /PORTABLE=1 /CURRENTUSER /DIR="%CD%\build\tools\innosetup\{app}" /LOG="%CD%\build\tools\innosetup\setup.log" /SILENT || goto error + +call :killdir "build\tools\innounp" || goto error call :killdir "build\tools\innosetup5" || goto error call build\scriptlib\unpack.cmd "build\tools\innounp" "build\externals\innounp050.rar" "." || goto error -build\tools\innounp\innounp.exe -x -dbuild\tools\innosetup "build\externals\innosetup-6.2.2.exe" || goto error build\tools\innounp\innounp.exe -x -dbuild\tools\innosetup5 "build\externals\isetup-5.5.8-unicode.exe" || goto error call build\scriptlib\unpack.cmd "packageTemplate\ExampleSongs" "build\externals\example_songs_ompt_1_30.7z" "." || goto error Modified: trunk/OpenMPT/build/download_externals.txt ============================================================================== --- trunk/OpenMPT/build/download_externals.txt Tue Jun 11 08:29:13 2024 (r21016) +++ trunk/OpenMPT/build/download_externals.txt Tue Jun 11 16:11:22 2024 (r21017) @@ -6,7 +6,7 @@ "build/externals/htmlhelp.exe" 3509072 d91371244ea98c691b4674ee266c4a2496a296800c176adae069d21f5c52c0763b21cc7859cfffa865b89e50171a2c99a6d14620c32f7d72c0ef04045348f856 "https://web.archive.org/web/20200918004813id_/https://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe" "https://web.archive.org/web/20200918004813id_/http://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe" "build/externals/python-3.12.4-embed-amd64.zip" 11065736 f07be8d84645f2411d061262b378d783498f23a961a9eb3dc3cf5c785af75de551cd4f413c385f47219601d2b09fa6ae88242226b1e31cf009929d3ff5d6673e "https://www.python.org/ftp/python/3.12.4/python-3.12.4-embed-amd64.zip" "build/externals/innounp050.rar" 141621 dbbc809308267a866db9d6b751fdeda6d179e1a65d8ddb14bb51984431ae91493f9a76105e1789b245732043a2c696c869ed10964b48cf59f81e55bd52f85330 "https://netcologne.dl.sourceforge.net/project/innounp/innounp/innounp 0.50/innounp050.rar" "https://deac-fra.dl.sourceforge.net/project/innounp/innounp/innounp 0.50/innounp050.rar" -"build/externals/innosetup-6.2.2.exe" 4722512 496375b1ce9c0d2f8eb3930ebd8366f5c4c938bc1eda47aed415e3f02bd8651a84a770a15f2825bf3c8ed9dbefa355b9eb805dd76bc782f6d8c8096d80443099 "https://files.jrsoftware.org/is/6/innosetup-6.2.2.exe" +"build/externals/innosetup-6.3.1.exe" 5251664 65d8b14febd0f8003c89c468966912f8fd799e48986fee8bd5f0549936f6cb9cd5ff11c5429e0b2587215140e595fcacbc129b6f81cccc09ca518758da4d86bc "https://files.jrsoftware.org/is/6/innosetup-6.3.1.exe" "build/externals/isetup-5.5.8-unicode.exe" 2342456 da7e27d85caec85b4194c7b1412c5a64c0ae12f22d903b94f2f4ee9ea0cb99c91b2d1dbb49262eefae8129e6b91f5c46f26f353011076e77e75f9c955fc5e1cb "https://files.jrsoftware.org/is/5/isetup-5.5.8-unicode.exe" "build/externals/example_songs_ompt_1_30.7z" 4881392 bfecf7f97fd71bd52bcfb38307ccb98c751e6a0fa0c1f31208b22b9392f03ea3da8f9271327df2de4fc2e463e0c13c6a24107fbe18caf8f446b7e7cf93073fa5 "https://download.openmpt.org/resources/modules/example_songs_ompt_1_30.7z" "build/externals/allegro-4.2.3.1-hg.8+r8500.zip" 3872466 46cd8d4d7138b795dbc66994e953d0abc578c6d3c00615e3580237458529d33d7ad9d269a9778918d4b3719d75750d5cca74ff6bf38ad357a766472799ee9e7b "https://lib.openmpt.org/files/libopenmpt/contrib/allegro/allegro-4.2.3.1-hg.8+r8500.zip" "https://mercury.sexy/members/manx/liballegro-4.2/allegro-4.2.3.1-hg.8+r8500.zip" Modified: trunk/OpenMPT/common/versionNumber.h ============================================================================== --- trunk/OpenMPT/common/versionNumber.h Tue Jun 11 08:29:13 2024 (r21016) +++ trunk/OpenMPT/common/versionNumber.h Tue Jun 11 16:11:22 2024 (r21017) @@ -18,6 +18,6 @@ #define VER_MAJORMAJOR 1 #define VER_MAJOR 32 #define VER_MINOR 00 -#define VER_MINORMINOR 17 +#define VER_MINORMINOR 18 OPENMPT_NAMESPACE_END Modified: trunk/OpenMPT/installer/install-multi-arch.iss ============================================================================== --- trunk/OpenMPT/installer/install-multi-arch.iss Tue Jun 11 08:29:13 2024 (r21016) +++ trunk/OpenMPT/installer/install-multi-arch.iss Tue Jun 11 16:11:22 2024 (r21017) @@ -26,7 +26,7 @@ AppPublisherURL=https://openmpt.org/ AppSupportURL=https://forum.openmpt.org/ AppUpdatesURL=https://openmpt.org/ -ArchitecturesInstallIn64BitMode=x64 arm64 ia64 +ArchitecturesInstallIn64BitMode=x64os arm64 ChangesAssociations=yes Compression=lzma2/ultra64 ;DefaultDirName={autopf}\OpenMPT @@ -244,10 +244,6 @@ begin WizardSelectComponents('archx86,archamd64,!archarm,!archarm64'); end; - paIA64: - begin - WizardSelectComponents('archx86,!archamd64,!archarm,!archarm64'); - end; paARM64: begin WizardSelectComponents('archx86,archamd64,archarm,archarm64'); @@ -271,10 +267,6 @@ begin Result := 'amd64'; end; - paIA64: - begin - Result := 'x86'; - end; paARM64: begin Result := 'arm64'; |
|
From: <sv...@op...> - 2024-06-11 06:29:27
|
Author: manx Date: Tue Jun 11 08:29:13 2024 New Revision: 21016 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21016 Log: [Imp] build: Makefile: DJGPP: Add more external-FPU CPU variants. Modified: trunk/OpenMPT/build/make/config-djgpp.mk Modified: trunk/OpenMPT/build/make/config-djgpp.mk ============================================================================== --- trunk/OpenMPT/build/make/config-djgpp.mk Tue Jun 11 08:27:36 2024 (r21015) +++ trunk/OpenMPT/build/make/config-djgpp.mk Tue Jun 11 08:29:13 2024 (r21016) @@ -162,212 +162,217 @@ -generic/early := $(XXX) -march=i386 $(FPU_NONE) -mtune=i386 $(OPT_UARCH_CISC) +generic/early := $(XXX) -march=i386 $(FPU_NONE) -mtune=i386 $(OPT_UARCH_CISC) -generic/compatible:= $(XXX) -march=i386 $(FPU_387) -mtune=pentium $(OPT_UARCH_CISC) -generic/common := $(XXX) -march=i486 $(FPU_387) -mtune=pentium $(OPT_UARCH_CISC) +generic/compatible := $(XXX) -march=i386 $(FPU_387) -mtune=pentium $(OPT_UARCH_CISC) +generic/common := $(XXX) -march=i486 $(FPU_387) -mtune=pentium $(OPT_UARCH_CISC) -generic/late := $(XXX) -march=i686 $(FPU_SSE2) -mtune=generic $(OPT_UARCH_OOOE_128) +generic/late := $(XXX) -march=i686 $(FPU_SSE2) -mtune=generic $(OPT_UARCH_OOOE_128) -virtual/ibmulator := $(___) -march=i386 $(FPU_NONE) -mtune=i386 $(OPT_UARCH_EMUL) +virtual/ibmulator := $(___) -march=i386 $(FPU_NONE) -mtune=i386 $(OPT_UARCH_EMUL) -virtual/ao486 := $(___) -march=i486 $(FPU_NONE) -mtune=i486 $(OPT_UARCH_PIPE) +virtual/ao486 := $(___) -march=i486 $(FPU_NONE) -mtune=i486 $(OPT_UARCH_PIPE) -virtual/bochs := $(___) -march=i686 $(FPU_387) -mtune=generic $(OPT_UARCH_EMUL) +virtual/bochs := $(___) -march=i686 $(FPU_387) -mtune=generic $(OPT_UARCH_EMUL) -virtual/qemu := $(___) -march=i686 $(FPU_SSE2) -mtune=generic $(OPT_UARCH_COMP_128) +virtual/qemu := $(___) -march=i686 $(FPU_SSE2) -mtune=generic $(OPT_UARCH_COMP_128) -virtual/pcem := $(___) -march=i686 $(FPU_387) -mtune=generic $(OPT_UARCH_COMP) -virtual/86box := $(___) -march=i686 $(FPU_387) -mtune=generic $(OPT_UARCH_COMP) -virtual/varcem := $(___) -march=i686 $(FPU_387) -mtune=generic $(OPT_UARCH_COMP) -virtual/pcbox := $(___) -march=i686 $(FPU_387) -mtune=generic $(OPT_UARCH_COMP) +virtual/pcem := $(___) -march=i686 $(FPU_387) -mtune=generic $(OPT_UARCH_COMP) +virtual/86box := $(___) -march=i686 $(FPU_387) -mtune=generic $(OPT_UARCH_COMP) +virtual/varcem := $(___) -march=i686 $(FPU_387) -mtune=generic $(OPT_UARCH_COMP) +virtual/pcbox := $(___) -march=i686 $(FPU_387) -mtune=generic $(OPT_UARCH_COMP) -virtual/unipcemu := $(___) -march=i386 $(FPU_NONE) -mtune=i386 $(OPT_UARCH_EMUL) +virtual/unipcemu := $(___) -march=i386 $(FPU_NONE) -mtune=i386 $(OPT_UARCH_EMUL) -virtual/dosbox := $(___) -march=i486 $(FPU_387) -mtune=i386 $(OPT_UARCH_EMUL) -virtual/dosbox-svn:= $(___) -march=i486 $(FPU_387) -mtune=i386 $(OPT_UARCH_EMUL) -virtual/dosbox-ece:= $(___) -march=i486 $(FPU_387) -mtune=i386 $(OPT_UARCH_EMUL) -virtual/dosbox-sta:= $(___) -march=i486 $(FPU_387) -mtune=i386 $(OPT_UARCH_EMUL) -virtual/dosbox-x := $(___) -march=pentium-mmx $(FPU_MMX) -mtune=i386 $(OPT_UARCH_EMUL) +virtual/dosbox := $(___) -march=i486 $(FPU_387) -mtune=i386 $(OPT_UARCH_EMUL) +virtual/dosbox-svn := $(___) -march=i486 $(FPU_387) -mtune=i386 $(OPT_UARCH_EMUL) +virtual/dosbox-ece := $(___) -march=i486 $(FPU_387) -mtune=i386 $(OPT_UARCH_EMUL) +virtual/dosbox-sta := $(___) -march=i486 $(FPU_387) -mtune=i386 $(OPT_UARCH_EMUL) +virtual/dosbox-x := $(___) -march=pentium-mmx $(FPU_MMX) -mtune=i386 $(OPT_UARCH_EMUL) -generic/nofpu := $(X__) -march=i386 $(FPU_NONE) -mtune=i386 $(OPT_UARCH_CISC) # 386SX, 386DX, 486SX, Cyrix Cx486SLC..Cx486S, NexGen Nx586 +generic/nofpu := $(X__) -march=i386 $(FPU_NONE) -mtune=i386 $(OPT_UARCH_CISC) # 386SX, 386DX, 486SX, Cyrix Cx486SLC..Cx486S, NexGen Nx586 -generic/386 := $(X__) -march=i386 $(FPU_387) -mtune=i386 $(OPT_UARCH_CISC) # 386+387 +generic/386 := $(X__) -march=i386 $(FPU_387) -mtune=i386 $(OPT_UARCH_CISC) # 386+387 -generic/486 := $(XX_) -march=i486 $(FPU_387) -mtune=i486 $(OPT_UARCH_PIPE) # 486DX, AMD Am5x86, Cyrix Cx4x86DX..6x86L, NexGen Nx586-PF +generic/486 := $(XX_) -march=i486 $(FPU_387) -mtune=i486 $(OPT_UARCH_PIPE) # 486DX, AMD Am5x86, Cyrix Cx4x86DX..6x86L, NexGen Nx586-PF -generic/586 := $(XXX) -march=i586 $(FPU_387) -mtune=pentium $(OPT_UARCH_SCAL) # Intel Pentium, AMD K5 -generic/586-mmx := $(XX_) -march=pentium-mmx $(FPU_MMX) -mtune=pentium-mmx $(OPT_UARCH_SCAL_64) # Intel Pentium-MMX, AMD K6, IDT WinChip-C6, Rise mP6 -generic/586-3dnow := $(XX_) -march=k6-2 $(FPU_3DNOW) -mtune=k6-2 $(OPT_UARCH_SCAL_64) # AMD K6-2..K6-3, IDT WinChip-2, VIA-C3-Samuel..VIA C3-Ezra -generic/586-3dnowa:= $(___) -march=k6-3 $(FPU_3DNOWA) -mtune=k6-3 $(OPT_UARCH_SCAL_64) # AMD K6-2+..K6-3+ +generic/586 := $(XXX) -march=i586 $(FPU_387) -mtune=pentium $(OPT_UARCH_SCAL) # Intel Pentium, AMD K5 +generic/586-mmx := $(XX_) -march=pentium-mmx $(FPU_MMX) -mtune=pentium-mmx $(OPT_UARCH_SCAL_64) # Intel Pentium-MMX, AMD K6, IDT WinChip-C6, Rise mP6 +generic/586-3dnow := $(XX_) -march=k6-2 $(FPU_3DNOW) -mtune=k6-2 $(OPT_UARCH_SCAL_64) # AMD K6-2..K6-3, IDT WinChip-2, VIA-C3-Samuel..VIA C3-Ezra +generic/586-3dnowa := $(___) -march=k6-3 $(FPU_3DNOWA) -mtune=k6-3 $(OPT_UARCH_SCAL_64) # AMD K6-2+..K6-3+ -generic/686 := $(___) -march=pentiumpro $(FPU_387) -mtune=pentiumpro $(OPT_UARCH_OOOE) # Intel Pentium-Pro -generic/686-mmx := $(XXX) -march=i686 $(FPU_MMX) -mtune=pentium2 $(OPT_UARCH_OOOE_64) # Intel Pentium-2.., AMD Bulldozer.., VIA C3-Nehemiah.., Cyrix 6x86MX.., Transmeta Crusoe.., NSC Geode-GX1.. -generic/686-3dnow := $(___) -march=i686 $(FPU_3DNOW) -mtune=pentium2 $(OPT_UARCH_OOOE_64) # VIA Cyrix-3-Joshua -generic/686-3dnowa:= $(XX_) -march=athlon $(FPU_3DNOWA) -mtune=athlon $(OPT_UARCH_OOOE_64) # AMD Athlon..K10 +generic/686 := $(___) -march=pentiumpro $(FPU_387) -mtune=pentiumpro $(OPT_UARCH_OOOE) # Intel Pentium-Pro +generic/686-mmx := $(XXX) -march=i686 $(FPU_MMX) -mtune=pentium2 $(OPT_UARCH_OOOE_64) # Intel Pentium-2.., AMD Bulldozer.., VIA C3-Nehemiah.., Cyrix 6x86MX.., Transmeta Crusoe.., NSC Geode-GX1.. +generic/686-3dnow := $(___) -march=i686 $(FPU_3DNOW) -mtune=pentium2 $(OPT_UARCH_OOOE_64) # VIA Cyrix-3-Joshua +generic/686-3dnowa := $(XX_) -march=athlon $(FPU_3DNOWA) -mtune=athlon $(OPT_UARCH_OOOE_64) # AMD Athlon..K10 -generic/sse := $(___) -march=i686 $(FPU_SSE) -mtune=pentium3 $(OPT_UARCH_OOOE_128) # Intel Pentium-3, AMD Athlon-XP, VIA C3-Nehemiah, DM&P Vortex86DX3.. +generic/sse := $(___) -march=i686 $(FPU_SSE) -mtune=pentium3 $(OPT_UARCH_OOOE_128) # Intel Pentium-3, AMD Athlon-XP, VIA C3-Nehemiah, DM&P Vortex86DX3.. -generic/sse2 := $(XX_) -march=i686 $(FPU_SSE2) -mtune=generic $(OPT_UARCH_OOOE_128) # Intel Pentium-4.., AMD Athlon-64.., VIA C7-Esther.., Transmeta Efficeon.. -generic/sse3 := $(___) -march=i686 $(FPU_SSE3) -mtune=generic $(OPT_UARCH_OOOE_128) # Intel Core.., AMD Athlon-64-X2.., VIA C7-Esther.., Transmeta Efficeon-88xx.. -generic/ssse3 := $(___) -march=i686 $(FPU_SSSE3) -mtune=generic $(OPT_UARCH_OOOE_128) # Intel Core-2.., AMD Bobcat.., Via Nano-1000.. -generic/sse4_1 := $(___) -march=i686 $(FPU_SSE4_1) -mtune=generic $(OPT_UARCH_OOOE_128) # Intel Core-1st, AMD Bulldozer.., Via Nano-3000.. -generic/sse4_2 := $(___) -march=i686 $(FPU_SSE4_2) -mtune=generic $(OPT_UARCH_OOOE_128) # Intel Core-1st, AMD Bulldozer.., Via Nano-C.. +generic/sse2 := $(XX_) -march=i686 $(FPU_SSE2) -mtune=generic $(OPT_UARCH_OOOE_128) # Intel Pentium-4.., AMD Athlon-64.., VIA C7-Esther.., Transmeta Efficeon.. +generic/sse3 := $(___) -march=i686 $(FPU_SSE3) -mtune=generic $(OPT_UARCH_OOOE_128) # Intel Core.., AMD Athlon-64-X2.., VIA C7-Esther.., Transmeta Efficeon-88xx.. +generic/ssse3 := $(___) -march=i686 $(FPU_SSSE3) -mtune=generic $(OPT_UARCH_OOOE_128) # Intel Core-2.., AMD Bobcat.., Via Nano-1000.. +generic/sse4_1 := $(___) -march=i686 $(FPU_SSE4_1) -mtune=generic $(OPT_UARCH_OOOE_128) # Intel Core-1st, AMD Bulldozer.., Via Nano-3000.. +generic/sse4_2 := $(___) -march=i686 $(FPU_SSE4_2) -mtune=generic $(OPT_UARCH_OOOE_128) # Intel Core-1st, AMD Bulldozer.., Via Nano-C.. -intel/i386 := $(X__) -march=i386 $(FPU_NONE) -mtune=i386 $(OPT_UARCH_CISC) --param l1-cache-size=0 --param l2-cache-size=$(CACHE_386) -intel/i486sx := $(___) -march=i486 $(FPU_NONE) -mtune=i486 $(OPT_UARCH_PIPE) --param l1-cache-size=6 --param l2-cache-size=$(CACHE_486) -intel/i386+80287 := $(___) -march=i386 $(FPU_287) -mtune=i386 $(OPT_UARCH_CISC) --param l1-cache-size=0 --param l2-cache-size=$(CACHE_386) +intel/i386 := $(X__) -march=i386 $(FPU_NONE) -mtune=i386 $(OPT_UARCH_CISC) --param l1-cache-size=0 --param l2-cache-size=$(CACHE_386) +intel/i486sx := $(___) -march=i486 $(FPU_NONE) -mtune=i486 $(OPT_UARCH_PIPE) --param l1-cache-size=6 --param l2-cache-size=$(CACHE_486) +intel/i386+80287 := $(___) -march=i386 $(FPU_287) -mtune=i386 $(OPT_UARCH_CISC) --param l1-cache-size=0 --param l2-cache-size=$(CACHE_386) -intel/i386+80387 := $(X__) -march=i386 $(FPU_387) -mtune=i386 $(OPT_UARCH_CISC) --param l1-cache-size=0 --param l2-cache-size=$(CACHE_386) -intel/i486dx := $(XXX) -march=i486 $(FPU_387) -mtune=i486 $(OPT_UARCH_PIPE) --param l1-cache-size=6 --param l2-cache-size=$(CACHE_486) -intel/pentium := $(XXX) -march=pentium $(FPU_387) -mtune=pentium $(OPT_UARCH_SCAL) --param l1-cache-size=8 --param l2-cache-size=$(CACHE_S7) -intel/pentium-mmx := $(XXX) -march=pentium-mmx $(FPU_MMX) -mtune=pentium-mmx $(OPT_UARCH_SCAL_64) --param l1-cache-size=16 --param l2-cache-size=$(CACHE_S7) -intel/pentium-pro := $(___) -march=pentiumpro $(FPU_387) -mtune=pentiumpro $(OPT_UARCH_OOOE) --param l1-cache-size=8 --param l2-cache-size=$(CACHE_PENTIUMPRO) -intel/pentium2 := $(XX_) -march=pentium2 $(FPU_MMX) -mtune=pentium2 $(OPT_UARCH_OOOE_64) --param l1-cache-size=16 --param l2-cache-size=$(CACHE_PENTIUM2) -intel/pentium3 := $(X__) -march=pentium3 $(FPU_SSE) -mtune=pentium3 $(OPT_UARCH_OOOE_128) --param l1-cache-size=16 --param l2-cache-size=$(CACHE_PENTIUM3) -intel/pentium4 := $(XX_) -march=pentium4 $(FPU_SSE2) -mtune=pentium4 $(OPT_UARCH_OOOE_128) --param l1-cache-size=8 --param l2-cache-size=$(CACHE_PENTIUM4) -intel/pentium4.1 := $(___) -march=prescott $(FPU_SSE3) -mtune=prescott $(OPT_UARCH_OOOE_128) --param l1-cache-size=8 --param l2-cache-size=$(CACHE_PENTIUM41) -intel/core2 := $(___) -march=core2 $(FPU_SSSE3) -mtune=core2 $(OPT_UARCH_OOOE_128) --param l1-cache-size=32 --param l2-cache-size=$(CACHE_CORE2) +intel/i386+80387 := $(X__) -march=i386 $(FPU_387) -mtune=i386 $(OPT_UARCH_CISC) --param l1-cache-size=0 --param l2-cache-size=$(CACHE_386) +intel/i486sx+i487sx := $(___) -march=i486 $(FPU_387) -mtune=i486 $(OPT_UARCH_PIPE) --param l1-cache-size=6 --param l2-cache-size=$(CACHE_486) +intel/i486dx := $(XXX) -march=i486 $(FPU_387) -mtune=i486 $(OPT_UARCH_PIPE) --param l1-cache-size=6 --param l2-cache-size=$(CACHE_486) +intel/pentium := $(XXX) -march=pentium $(FPU_387) -mtune=pentium $(OPT_UARCH_SCAL) --param l1-cache-size=8 --param l2-cache-size=$(CACHE_S7) +intel/pentium-mmx := $(XXX) -march=pentium-mmx $(FPU_MMX) -mtune=pentium-mmx $(OPT_UARCH_SCAL_64) --param l1-cache-size=16 --param l2-cache-size=$(CACHE_S7) +intel/pentium-pro := $(___) -march=pentiumpro $(FPU_387) -mtune=pentiumpro $(OPT_UARCH_OOOE) --param l1-cache-size=8 --param l2-cache-size=$(CACHE_PENTIUMPRO) +intel/pentium2 := $(XX_) -march=pentium2 $(FPU_MMX) -mtune=pentium2 $(OPT_UARCH_OOOE_64) --param l1-cache-size=16 --param l2-cache-size=$(CACHE_PENTIUM2) +intel/pentium3 := $(X__) -march=pentium3 $(FPU_SSE) -mtune=pentium3 $(OPT_UARCH_OOOE_128) --param l1-cache-size=16 --param l2-cache-size=$(CACHE_PENTIUM3) +intel/pentium4 := $(XX_) -march=pentium4 $(FPU_SSE2) -mtune=pentium4 $(OPT_UARCH_OOOE_128) --param l1-cache-size=8 --param l2-cache-size=$(CACHE_PENTIUM4) +intel/pentium4.1 := $(___) -march=prescott $(FPU_SSE3) -mtune=prescott $(OPT_UARCH_OOOE_128) --param l1-cache-size=8 --param l2-cache-size=$(CACHE_PENTIUM41) +intel/core2 := $(___) -march=core2 $(FPU_SSSE3) -mtune=core2 $(OPT_UARCH_OOOE_128) --param l1-cache-size=32 --param l2-cache-size=$(CACHE_CORE2) -intel/celeron := $(___) -march=pentium2 $(FPU_MMX) -mtune=pentium2 $(OPT_UARCH_OOOE_64) --param l1-cache-size=16 --param l2-cache-size=$(CACHE_CELERON) -intel/pentium-m := $(___) -march=pentium-m $(FPU_SSE2) -mtune=pentium-m $(OPT_UARCH_OOOE_128) --param l1-cache-size=16 --param l2-cache-size=$(CACHE_PENTIUMM) -intel/core := $(___) -march=pentium-m $(FPU_SSE3) -mtune=core2 $(OPT_UARCH_OOOE_128) --param l1-cache-size=32 --param l2-cache-size=$(CACHE_CORE) -intel/atom := $(___) -march=bonnell $(FPU_SSSE3) -mtune=bonnell $(OPT_UARCH_SCAL_128) --param l1-cache-size=24 --param l2-cache-size=$(CACHE_ATOM) +intel/celeron := $(___) -march=pentium2 $(FPU_MMX) -mtune=pentium2 $(OPT_UARCH_OOOE_64) --param l1-cache-size=16 --param l2-cache-size=$(CACHE_CELERON) +intel/pentium-m := $(___) -march=pentium-m $(FPU_SSE2) -mtune=pentium-m $(OPT_UARCH_OOOE_128) --param l1-cache-size=16 --param l2-cache-size=$(CACHE_PENTIUMM) +intel/core := $(___) -march=pentium-m $(FPU_SSE3) -mtune=core2 $(OPT_UARCH_OOOE_128) --param l1-cache-size=32 --param l2-cache-size=$(CACHE_CORE) +intel/atom := $(___) -march=bonnell $(FPU_SSSE3) -mtune=bonnell $(OPT_UARCH_SCAL_128) --param l1-cache-size=24 --param l2-cache-size=$(CACHE_ATOM) -intel/late := $(XX_) -march=i686 $(FPU_SSSE3) -mtune=intel $(OPT_UARCH_OOOE_128) +intel/late := $(XX_) -march=i686 $(FPU_SSSE3) -mtune=intel $(OPT_UARCH_OOOE_128) -amd/am386 := $(___) -march=i386 $(FPU_NONE) -mtune=i386 $(OPT_UARCH_CISC) --param l1-cache-size=0 --param l2-cache-size=$(CACHE_386) -amd/am486sx := $(___) -march=i486 $(FPU_NONE) -mtune=i486 $(OPT_UARCH_PIPE) --param l1-cache-size=6 --param l2-cache-size=$(CACHE_486) +amd/am386 := $(___) -march=i386 $(FPU_NONE) -mtune=i386 $(OPT_UARCH_CISC) --param l1-cache-size=0 --param l2-cache-size=$(CACHE_386) +amd/am486sx := $(___) -march=i486 $(FPU_NONE) -mtune=i486 $(OPT_UARCH_PIPE) --param l1-cache-size=6 --param l2-cache-size=$(CACHE_486) -amd/am386+80387 := $(___) -march=i386 $(FPU_387) -mtune=i386 $(OPT_UARCH_CISC) --param l1-cache-size=0 --param l2-cache-size=$(CACHE_386) -amd/am486dx := $(XX_) -march=i486 $(FPU_387) -mtune=i486 $(OPT_UARCH_PIPE) --param l1-cache-size=6 --param l2-cache-size=$(CACHE_486) -amd/am486dxe := $(XX_) -march=i486 $(FPU_387) -mtune=i486 $(OPT_UARCH_PIPE) --param l1-cache-size=12 --param l2-cache-size=$(CACHE_486) -amd/am5x86 := $(___) -march=i486 $(FPU_387) -mtune=i486 $(OPT_UARCH_PIPE) --param l1-cache-size=12 --param l2-cache-size=$(CACHE_486) -amd/k5 := $(X__) -march=i586 $(FPU_387) -mtune=i586 $(OPT_UARCH_OOOE) --param l1-cache-size=8 --param l2-cache-size=$(CACHE_S7) -amd/k5-pentium := $(X__) -march=i586 $(FPU_387) -mtune=pentium $(OPT_UARCH_OOOE) --param l1-cache-size=8 --param l2-cache-size=$(CACHE_S7) -amd/k5-pentiummmx := $(X__) -march=i586 $(FPU_387) -mtune=pentium-mmx $(OPT_UARCH_OOOE) --param l1-cache-size=8 --param l2-cache-size=$(CACHE_S7) -amd/k5-pentiumpro := $(X__) -march=i586 $(FPU_387) -mtune=pentiumpro $(OPT_UARCH_OOOE) --param l1-cache-size=8 --param l2-cache-size=$(CACHE_S7) -amd/k5-pentium2 := $(X__) -march=i586 $(FPU_387) -mtune=pentium2 $(OPT_UARCH_OOOE) --param l1-cache-size=8 --param l2-cache-size=$(CACHE_S7) -amd/k5-k6 := $(X__) -march=i586 $(FPU_387) -mtune=k6 $(OPT_UARCH_OOOE) --param l1-cache-size=8 --param l2-cache-size=$(CACHE_S7) -amd/k6 := $(XX_) -march=k6 $(FPU_MMX) -mtune=k6 $(OPT_UARCH_OOOE_64) --param l1-cache-size=32 --param l2-cache-size=$(CACHE_S7) -amd/k6-2 := $(XXX) -march=k6-2 $(FPU_3DNOW) -mtune=k6-2 $(OPT_UARCH_OOOE_64) --param l1-cache-size=32 --param l2-cache-size=$(CACHE_SS7) -amd/k6-3 := $(___) -march=k6-3 $(FPU_3DNOW) -mtune=k6-3 $(OPT_UARCH_OOOE_64) --param l1-cache-size=32 --param l2-cache-size=256 -amd/k6-2+ := $(___) -march=k6-3 $(FPU_3DNOWA) -mtune=k6-3 $(OPT_UARCH_OOOE_64) --param l1-cache-size=32 --param l2-cache-size=128 -amd/k6-3+ := $(___) -march=k6-3 $(FPU_3DNOWA) -mtune=k6-3 $(OPT_UARCH_OOOE_64) --param l1-cache-size=32 --param l2-cache-size=256 -amd/athlon := $(XX_) -march=athlon $(FPU_3DNOWA) -mtune=athlon $(OPT_UARCH_OOOE_64) --param l1-cache-size=64 --param l2-cache-size=$(CACHE_ATHLON) -amd/athlon-xp := $(XXX) -march=athlon-xp $(FPU_3DASSE) -mtune=athlon-xp $(OPT_UARCH_OOOE_128) --param l1-cache-size=64 --param l2-cache-size=$(CACHE_ATHLONXP) -amd/athlon64 := $(X__) -march=k8 $(FPU_SSE2) -mtune=k8 $(OPT_UARCH_OOOE_128) --param l1-cache-size=64 --param l2-cache-size=$(CACHE_ATHLON64) -amd/athlon64-sse3 := $(___) -march=k8-sse3 $(FPU_SSE3) -mtune=k8-sse3 $(OPT_UARCH_OOOE_128) --param l1-cache-size=64 --param l2-cache-size=$(CACHE_ATHLON64) -amd/k10 := $(___) -march=amdfam10 $(FPU_SSE4A) -mtune=amdfam10 $(OPT_UARCH_OOOE_128) --param l1-cache-size=64 --param l2-cache-size=512 +amd/am386+80387 := $(___) -march=i386 $(FPU_387) -mtune=i386 $(OPT_UARCH_CISC) --param l1-cache-size=0 --param l2-cache-size=$(CACHE_386) +amd/am486sx+am487sx := $(___) -march=i486 $(FPU_387) -mtune=i486 $(OPT_UARCH_PIPE) --param l1-cache-size=6 --param l2-cache-size=$(CACHE_486) +amd/am486dx := $(XX_) -march=i486 $(FPU_387) -mtune=i486 $(OPT_UARCH_PIPE) --param l1-cache-size=6 --param l2-cache-size=$(CACHE_486) +amd/am486dxe := $(XX_) -march=i486 $(FPU_387) -mtune=i486 $(OPT_UARCH_PIPE) --param l1-cache-size=12 --param l2-cache-size=$(CACHE_486) +amd/am5x86 := $(___) -march=i486 $(FPU_387) -mtune=i486 $(OPT_UARCH_PIPE) --param l1-cache-size=12 --param l2-cache-size=$(CACHE_486) +amd/k5 := $(X__) -march=i586 $(FPU_387) -mtune=i586 $(OPT_UARCH_OOOE) --param l1-cache-size=8 --param l2-cache-size=$(CACHE_S7) +amd/k5-pentium := $(X__) -march=i586 $(FPU_387) -mtune=pentium $(OPT_UARCH_OOOE) --param l1-cache-size=8 --param l2-cache-size=$(CACHE_S7) +amd/k5-pentiummmx := $(X__) -march=i586 $(FPU_387) -mtune=pentium-mmx $(OPT_UARCH_OOOE) --param l1-cache-size=8 --param l2-cache-size=$(CACHE_S7) +amd/k5-pentiumpro := $(X__) -march=i586 $(FPU_387) -mtune=pentiumpro $(OPT_UARCH_OOOE) --param l1-cache-size=8 --param l2-cache-size=$(CACHE_S7) +amd/k5-pentium2 := $(X__) -march=i586 $(FPU_387) -mtune=pentium2 $(OPT_UARCH_OOOE) --param l1-cache-size=8 --param l2-cache-size=$(CACHE_S7) +amd/k5-k6 := $(X__) -march=i586 $(FPU_387) -mtune=k6 $(OPT_UARCH_OOOE) --param l1-cache-size=8 --param l2-cache-size=$(CACHE_S7) +amd/k6 := $(XX_) -march=k6 $(FPU_MMX) -mtune=k6 $(OPT_UARCH_OOOE_64) --param l1-cache-size=32 --param l2-cache-size=$(CACHE_S7) +amd/k6-2 := $(XXX) -march=k6-2 $(FPU_3DNOW) -mtune=k6-2 $(OPT_UARCH_OOOE_64) --param l1-cache-size=32 --param l2-cache-size=$(CACHE_SS7) +amd/k6-3 := $(___) -march=k6-3 $(FPU_3DNOW) -mtune=k6-3 $(OPT_UARCH_OOOE_64) --param l1-cache-size=32 --param l2-cache-size=256 +amd/k6-2+ := $(___) -march=k6-3 $(FPU_3DNOWA) -mtune=k6-3 $(OPT_UARCH_OOOE_64) --param l1-cache-size=32 --param l2-cache-size=128 +amd/k6-3+ := $(___) -march=k6-3 $(FPU_3DNOWA) -mtune=k6-3 $(OPT_UARCH_OOOE_64) --param l1-cache-size=32 --param l2-cache-size=256 +amd/athlon := $(XX_) -march=athlon $(FPU_3DNOWA) -mtune=athlon $(OPT_UARCH_OOOE_64) --param l1-cache-size=64 --param l2-cache-size=$(CACHE_ATHLON) +amd/athlon-xp := $(XXX) -march=athlon-xp $(FPU_3DASSE) -mtune=athlon-xp $(OPT_UARCH_OOOE_128) --param l1-cache-size=64 --param l2-cache-size=$(CACHE_ATHLONXP) +amd/athlon64 := $(X__) -march=k8 $(FPU_SSE2) -mtune=k8 $(OPT_UARCH_OOOE_128) --param l1-cache-size=64 --param l2-cache-size=$(CACHE_ATHLON64) +amd/athlon64-sse3 := $(___) -march=k8-sse3 $(FPU_SSE3) -mtune=k8-sse3 $(OPT_UARCH_OOOE_128) --param l1-cache-size=64 --param l2-cache-size=$(CACHE_ATHLON64) +amd/k10 := $(___) -march=amdfam10 $(FPU_SSE4A) -mtune=amdfam10 $(OPT_UARCH_OOOE_128) --param l1-cache-size=64 --param l2-cache-size=512 -amd/duron := $(X__) -march=athlon $(FPU_3DNOWA) -mtune=athlon $(OPT_UARCH_OOOE_64) --param l1-cache-size=64 --param l2-cache-size=$(CACHE_DURON) -amd/duron-xp := $(___) -march=athlon-xp $(FPU_3DASSE) -mtune=athlon-xp $(OPT_UARCH_OOOE_128) --param l1-cache-size=64 --param l2-cache-size=$(CACHE_DURONXP) -amd/sempron64 := $(___) -march=k8 $(FPU_SSE2) -mtune=k8 $(OPT_UARCH_OOOE_128) --param l1-cache-size=64 --param l2-cache-size=$(CACHE_SEMPRON64) +amd/duron := $(X__) -march=athlon $(FPU_3DNOWA) -mtune=athlon $(OPT_UARCH_OOOE_64) --param l1-cache-size=64 --param l2-cache-size=$(CACHE_DURON) +amd/duron-xp := $(___) -march=athlon-xp $(FPU_3DASSE) -mtune=athlon-xp $(OPT_UARCH_OOOE_128) --param l1-cache-size=64 --param l2-cache-size=$(CACHE_DURONXP) +amd/sempron64 := $(___) -march=k8 $(FPU_SSE2) -mtune=k8 $(OPT_UARCH_OOOE_128) --param l1-cache-size=64 --param l2-cache-size=$(CACHE_SEMPRON64) -amd/geode-gx := $(___) -march=geode $(FPU_3DNOWA) -mtune=geode $(OPT_UARCH_OOOE_64) --param l1-cache-size=16 --param l2-cache-size=0 -amd/geode-lx := $(___) -march=geode $(FPU_3DNOWA) -mtune=geode $(OPT_UARCH_OOOE_64) --param l1-cache-size=64 --param l2-cache-size=128 -amd/geode-nx := $(___) -march=athlon-xp $(FPU_3DASSE) -mtune=athlon-xp $(OPT_UARCH_OOOE_128) --param l1-cache-size=64 --param l2-cache-size=256 -amd/bobcat := $(X__) -march=btver1 $(FPU_SSE4A) -mtune=btver1 $(OPT_UARCH_OOOE_128) --param l1-cache-size=32 --param l2-cache-size=512 -amd/jaguar := $(___) -march=btver2 $(FPU_SSE4A) -mtune=btver2 $(OPT_UARCH_OOOE_128) --param l1-cache-size=32 --param l2-cache-size=1024 +amd/geode-gx := $(___) -march=geode $(FPU_3DNOWA) -mtune=geode $(OPT_UARCH_OOOE_64) --param l1-cache-size=16 --param l2-cache-size=0 +amd/geode-lx := $(___) -march=geode $(FPU_3DNOWA) -mtune=geode $(OPT_UARCH_OOOE_64) --param l1-cache-size=64 --param l2-cache-size=128 +amd/geode-nx := $(___) -march=athlon-xp $(FPU_3DASSE) -mtune=athlon-xp $(OPT_UARCH_OOOE_128) --param l1-cache-size=64 --param l2-cache-size=256 +amd/bobcat := $(X__) -march=btver1 $(FPU_SSE4A) -mtune=btver1 $(OPT_UARCH_OOOE_128) --param l1-cache-size=32 --param l2-cache-size=512 +amd/jaguar := $(___) -march=btver2 $(FPU_SSE4A) -mtune=btver2 $(OPT_UARCH_OOOE_128) --param l1-cache-size=32 --param l2-cache-size=1024 -amd/late := $(XX_) -march=i686 $(FPU_SSE4A) -mtune=generic $(OPT_UARCH_OOOE_128) +amd/late := $(XX_) -march=i686 $(FPU_SSE4A) -mtune=generic $(OPT_UARCH_OOOE_128) -ct/38600 := $(___) -march=i386 $(FPU_NONE) -mtune=i486 $(OPT_UARCH_PIPE) --param l1-cache-size=0 --param l2-cache-size=$(CACHE_386) -ct/38605 := $(___) -march=i386 $(FPU_NONE) -mtune=i486 $(OPT_UARCH_PIPE) --param l1-cache-size=1 --param l2-cache-size=$(CACHE_386) +ct/38600 := $(___) -march=i386 $(FPU_NONE) -mtune=i486 $(OPT_UARCH_PIPE) --param l1-cache-size=0 --param l2-cache-size=$(CACHE_386) +ct/38605 := $(___) -march=i386 $(FPU_NONE) -mtune=i486 $(OPT_UARCH_PIPE) --param l1-cache-size=1 --param l2-cache-size=$(CACHE_386) -nexgen/nx586 := $(___) -march=i486 $(FPU_NONE) $(TUNE_586) $(OPT_UARCH_OOOE) --param l1-cache-size=16 --param l2-cache-size=$(CACHE_486) +nexgen/nx586 := $(___) -march=i486 $(FPU_NONE) $(TUNE_586) $(OPT_UARCH_OOOE) --param l1-cache-size=16 --param l2-cache-size=$(CACHE_486) -nexgen/nx586pf := $(___) -march=i486 $(FPU_387) $(TUNE_586) $(OPT_UARCH_OOOE) --param l1-cache-size=16 --param l2-cache-size=$(CACHE_486) +nexgen/nx586pf := $(___) -march=i486 $(FPU_387) $(TUNE_586) $(OPT_UARCH_OOOE) --param l1-cache-size=16 --param l2-cache-size=$(CACHE_486) -ibm/386slc := $(___) -march=i386 $(FPU_NONE) -mtune=i386 $(OPT_UARCH_CISC) --param l1-cache-size=6 --param l2-cache-size=$(CACHE_386) -ibm/486slc := $(___) -march=i486 $(FPU_NONE) -mtune=i386 $(OPT_UARCH_CISC) --param l1-cache-size=12 --param l2-cache-size=$(CACHE_386) -ibm/486bl := $(___) -march=i486 $(FPU_NONE) -mtune=i386 $(OPT_UARCH_CISC) --param l1-cache-size=12 --param l2-cache-size=$(CACHE_486) +ibm/386slc := $(___) -march=i386 $(FPU_NONE) -mtune=i386 $(OPT_UARCH_CISC) --param l1-cache-size=6 --param l2-cache-size=$(CACHE_386) +ibm/486slc := $(___) -march=i486 $(FPU_NONE) -mtune=i386 $(OPT_UARCH_CISC) --param l1-cache-size=12 --param l2-cache-size=$(CACHE_386) +ibm/486bl := $(___) -march=i486 $(FPU_NONE) -mtune=i386 $(OPT_UARCH_CISC) --param l1-cache-size=12 --param l2-cache-size=$(CACHE_486) -cyrix/cx486slc := $(___) -march=i486 $(FPU_NONE) -mtune=i486 $(OPT_UARCH_PIPE) --param l1-cache-size=1 --param l2-cache-size=$(CACHE_386) -cyrix/cx486dlc := $(___) -march=i486 $(FPU_NONE) -mtune=i486 $(OPT_UARCH_PIPE) --param l1-cache-size=1 --param l2-cache-size=$(CACHE_386) -cyrix/cx4x86s := $(___) -march=i486 $(FPU_NONE) -mtune=i486 $(OPT_UARCH_PIPE) --param l1-cache-size=2 --param l2-cache-size=$(CACHE_486) +cyrix/cx486slc := $(___) -march=i486 $(FPU_NONE) -mtune=i486 $(OPT_UARCH_PIPE) --param l1-cache-size=1 --param l2-cache-size=$(CACHE_386) +cyrix/cx486dlc := $(___) -march=i486 $(FPU_NONE) -mtune=i486 $(OPT_UARCH_PIPE) --param l1-cache-size=1 --param l2-cache-size=$(CACHE_386) +cyrix/cx4x86s := $(___) -march=i486 $(FPU_NONE) -mtune=i486 $(OPT_UARCH_PIPE) --param l1-cache-size=2 --param l2-cache-size=$(CACHE_486) -cyrix/cx4x86dx := $(___) -march=i486 $(FPU_387) -mtune=i486 $(OPT_UARCH_PIPE) --param l1-cache-size=6 --param l2-cache-size=$(CACHE_486) -cyrix/cx5x86 := $(___) -march=i486 $(FPU_387) -mtune=i486 $(OPT_UARCH_SCAL) --param l1-cache-size=12 --param l2-cache-size=$(CACHE_486) -cyrix/6x86 := $(XXX) -march=i486 $(FPU_387) $(TUNE_586) $(OPT_UARCH_OOOE) --param l1-cache-size=12 --param l2-cache-size=$(CACHE_S7) -cyrix/6x86l := $(___) -march=i486 $(FPU_387) $(TUNE_586) $(OPT_UARCH_OOOE) --param l1-cache-size=12 --param l2-cache-size=$(CACHE_S7) -cyrix/6x86mx := $(XX_) -march=i686 $(FPU_MMX) $(TUNE_686MMX) $(OPT_UARCH_OOOE_64) --param l1-cache-size=48 --param l2-cache-size=$(CACHE_SS7) +cyrix/cx486slc+80387 := $(___) -march=i486 $(FPU_387) -mtune=i486 $(OPT_UARCH_PIPE) --param l1-cache-size=1 --param l2-cache-size=$(CACHE_386) +cyrix/cx486dlc+80387 := $(___) -march=i486 $(FPU_387) -mtune=i486 $(OPT_UARCH_PIPE) --param l1-cache-size=1 --param l2-cache-size=$(CACHE_386) +cyrix/cx4x86s+cx487s := $(___) -march=i486 $(FPU_387) -mtune=i486 $(OPT_UARCH_PIPE) --param l1-cache-size=2 --param l2-cache-size=$(CACHE_486) +cyrix/cx4x86dx := $(___) -march=i486 $(FPU_387) -mtune=i486 $(OPT_UARCH_PIPE) --param l1-cache-size=6 --param l2-cache-size=$(CACHE_486) +cyrix/cx5x86 := $(___) -march=i486 $(FPU_387) -mtune=i486 $(OPT_UARCH_SCAL) --param l1-cache-size=12 --param l2-cache-size=$(CACHE_486) +cyrix/6x86 := $(XXX) -march=i486 $(FPU_387) $(TUNE_586) $(OPT_UARCH_OOOE) --param l1-cache-size=12 --param l2-cache-size=$(CACHE_S7) +cyrix/6x86l := $(___) -march=i486 $(FPU_387) $(TUNE_586) $(OPT_UARCH_OOOE) --param l1-cache-size=12 --param l2-cache-size=$(CACHE_S7) +cyrix/6x86mx := $(XX_) -march=i686 $(FPU_MMX) $(TUNE_686MMX) $(OPT_UARCH_OOOE_64) --param l1-cache-size=48 --param l2-cache-size=$(CACHE_SS7) -cyrix/mediagx-gx := $(___) -march=i486 $(FPU_387) -mtune=i486 $(OPT_UARCH_SCAL) --param l1-cache-size=9 --param l2-cache-size=0 -cyrix/mediagx-gxm := $(___) -march=i686 $(FPU_MMX) $(TUNE_686MMX) $(OPT_UARCH_SCAL_64) --param l1-cache-size=9 --param l2-cache-size=0 +cyrix/mediagx-gx := $(___) -march=i486 $(FPU_387) -mtune=i486 $(OPT_UARCH_SCAL) --param l1-cache-size=9 --param l2-cache-size=0 +cyrix/mediagx-gxm := $(___) -march=i686 $(FPU_MMX) $(TUNE_686MMX) $(OPT_UARCH_SCAL_64) --param l1-cache-size=9 --param l2-cache-size=0 -nsc/geode-gx1 := $(___) -march=i686 $(FPU_MMX) $(TUNE_686MMX) $(OPT_UARCH_SCAL_64) --param l1-cache-size=9 --param l2-cache-size=0 -nsc/geode-gx2 := $(___) -march=geode $(FPU_3DNOWA) -mtune=geode $(OPT_UARCH_OOOE_64) --param l1-cache-size=16 --param l2-cache-size=0 +nsc/geode-gx1 := $(___) -march=i686 $(FPU_MMX) $(TUNE_686MMX) $(OPT_UARCH_SCAL_64) --param l1-cache-size=9 --param l2-cache-size=0 +nsc/geode-gx2 := $(___) -march=geode $(FPU_3DNOWA) -mtune=geode $(OPT_UARCH_OOOE_64) --param l1-cache-size=16 --param l2-cache-size=0 -idt/winchip-c6 := $(X__) -march=i586 $(FPU_MMX) -mtune=winchip-c6 $(OPT_UARCH_PIPE_64) --param l1-cache-size=32 --param l2-cache-size=$(CACHE_S7) -idt/winchip2 := $(X__) -march=i586 $(FPU_3DNOW) -mtune=winchip2 $(OPT_UARCH_SCAL_64) --param l1-cache-size=32 --param l2-cache-size=$(CACHE_SS7) +idt/winchip-c6 := $(X__) -march=i586 $(FPU_MMX) -mtune=winchip-c6 $(OPT_UARCH_PIPE_64) --param l1-cache-size=32 --param l2-cache-size=$(CACHE_S7) +idt/winchip2 := $(X__) -march=i586 $(FPU_3DNOW) -mtune=winchip2 $(OPT_UARCH_SCAL_64) --param l1-cache-size=32 --param l2-cache-size=$(CACHE_SS7) -via/cyrix3-joshua := $(___) -march=i686 $(FPU_3DNOW) $(TUNE_686MMX) $(OPT_UARCH_OOOE_64) --param l1-cache-size=48 --param l2-cache-size=256 -via/c3-samuel := $(___) -march=c3 $(FPU_3DNOW) -mtune=c3 $(OPT_UARCH_SCAL_64) --param l1-cache-size=64 --param l2-cache-size=0 -via/c3-samuel2 := $(___) -march=samuel-2 $(FPU_3DNOW) -mtune=samuel-2 $(OPT_UARCH_SCAL_64) --param l1-cache-size=64 --param l2-cache-size=64 -via/c3-ezra := $(___) -march=samuel-2 $(FPU_3DNOW) -mtune=samuel-2 $(OPT_UARCH_SCAL_64) --param l1-cache-size=64 --param l2-cache-size=64 -via/c3-nehemiah := $(___) -march=nehemiah $(FPU_SSE) -mtune=nehemiah $(OPT_UARCH_SCAL_128) --param l1-cache-size=64 --param l2-cache-size=64 -via/c7-esther := $(XX_) -march=esther $(FPU_SSE3) -mtune=esther $(OPT_UARCH_SCAL_128) --param l1-cache-size=64 --param l2-cache-size=128 +via/cyrix3-joshua := $(___) -march=i686 $(FPU_3DNOW) $(TUNE_686MMX) $(OPT_UARCH_OOOE_64) --param l1-cache-size=48 --param l2-cache-size=256 +via/c3-samuel := $(___) -march=c3 $(FPU_3DNOW) -mtune=c3 $(OPT_UARCH_SCAL_64) --param l1-cache-size=64 --param l2-cache-size=0 +via/c3-samuel2 := $(___) -march=samuel-2 $(FPU_3DNOW) -mtune=samuel-2 $(OPT_UARCH_SCAL_64) --param l1-cache-size=64 --param l2-cache-size=64 +via/c3-ezra := $(___) -march=samuel-2 $(FPU_3DNOW) -mtune=samuel-2 $(OPT_UARCH_SCAL_64) --param l1-cache-size=64 --param l2-cache-size=64 +via/c3-nehemiah := $(___) -march=nehemiah $(FPU_SSE) -mtune=nehemiah $(OPT_UARCH_SCAL_128) --param l1-cache-size=64 --param l2-cache-size=64 +via/c7-esther := $(XX_) -march=esther $(FPU_SSE3) -mtune=esther $(OPT_UARCH_SCAL_128) --param l1-cache-size=64 --param l2-cache-size=128 -via/late := $(XX_) -march=i686 $(FPU_SSE3) -mtune=esther $(OPT_UARCH_SCAL_128) +via/late := $(XX_) -march=i686 $(FPU_SSE3) -mtune=esther $(OPT_UARCH_SCAL_128) -umc/u5s := $(___) -march=i486 $(FPU_NONE) -mtune=i486 $(OPT_UARCH_PIPE) --param l1-cache-size=6 --param l2-cache-size=$(CACHE_486) -umc/u5d := $(___) -march=i486 $(FPU_387) -mtune=i486 $(OPT_UARCH_PIPE) --param l1-cache-size=6 --param l2-cache-size=$(CACHE_486) +umc/u5s := $(___) -march=i486 $(FPU_NONE) -mtune=i486 $(OPT_UARCH_PIPE) --param l1-cache-size=6 --param l2-cache-size=$(CACHE_486) +umc/u5d := $(___) -march=i486 $(FPU_387) -mtune=i486 $(OPT_UARCH_PIPE) --param l1-cache-size=6 --param l2-cache-size=$(CACHE_486) -transmeta/crusoe := $(X__) -march=i686 $(FPU_MMX) $(TUNE_686MMX) $(OPT_UARCH_COMP) --param l1-cache-size=64 --param l2-cache-size=256 -transmeta/efficeon:= $(___) -march=i686 $(FPU_SSE2) $(TUNE_686SSE2) $(OPT_UARCH_COMP) --param l1-cache-size=64 --param l2-cache-size=1024 -transmeta/tm8800 := $(___) -march=i686 $(FPU_SSE3) $(TUNE_686SSE3) $(OPT_UARCH_COMP) --param l1-cache-size=64 --param l2-cache-size=1024 +transmeta/crusoe := $(X__) -march=i686 $(FPU_MMX) $(TUNE_686MMX) $(OPT_UARCH_COMP) --param l1-cache-size=64 --param l2-cache-size=256 +transmeta/efficeon := $(___) -march=i686 $(FPU_SSE2) $(TUNE_686SSE2) $(OPT_UARCH_COMP) --param l1-cache-size=64 --param l2-cache-size=1024 +transmeta/tm8800 := $(___) -march=i686 $(FPU_SSE3) $(TUNE_686SSE3) $(OPT_UARCH_COMP) --param l1-cache-size=64 --param l2-cache-size=1024 -uli/m6117c := $(___) -march=i386 $(FPU_NONE) -mtune=i386 $(OPT_UARCH_CISC) --param l1-cache-size=0 --param l2-cache-size=$(CACHE_386) +uli/m6117c := $(___) -march=i386 $(FPU_NONE) -mtune=i386 $(OPT_UARCH_CISC) --param l1-cache-size=0 --param l2-cache-size=$(CACHE_386) -rise/mp6 := $(X__) -march=i586 $(FPU_MMX) $(TUNE_586MMX) $(OPT_UARCH_SCAL_64) --param l1-cache-size=8 --param l2-cache-size=$(CACHE_SS7) +rise/mp6 := $(X__) -march=i586 $(FPU_MMX) $(TUNE_586MMX) $(OPT_UARCH_SCAL_64) --param l1-cache-size=8 --param l2-cache-size=$(CACHE_SS7) -sis/55x := $(___) -march=i586 $(FPU_MMX) $(TUNE_586MMX) $(OPT_UARCH_SCAL_64) --param l1-cache-size=8 --param l2-cache-size=0 +sis/55x := $(___) -march=i586 $(FPU_MMX) $(TUNE_586MMX) $(OPT_UARCH_SCAL_64) --param l1-cache-size=8 --param l2-cache-size=0 -dmnp/m6117d := $(___) -march=i386 $(FPU_NONE) -mtune=i386 $(OPT_UARCH_CISC) --param l1-cache-size=0 --param l2-cache-size=$(CACHE_386) -dmnp/vortex86sx := $(___) -march=i386 $(FPU_NONE) -mtune=i386 $(OPT_UARCH_PIPE) --param l1-cache-size=16 --param l2-cache-size=0 +dmnp/m6117d := $(___) -march=i386 $(FPU_NONE) -mtune=i386 $(OPT_UARCH_CISC) --param l1-cache-size=0 --param l2-cache-size=$(CACHE_386) +dmnp/vortex86sx := $(___) -march=i386 $(FPU_NONE) -mtune=i386 $(OPT_UARCH_PIPE) --param l1-cache-size=16 --param l2-cache-size=0 -dmnp/vortex86dx := $(___) -march=i486 $(FPU_387) -mtune=i486 $(OPT_UARCH_PIPE) --param l1-cache-size=16 --param l2-cache-size=256 -dmnp/vortex86mx := $(___) -march=i486 $(FPU_387) -mtune=i486 $(OPT_UARCH_PIPE) --param l1-cache-size=16 --param l2-cache-size=256 -dmnp/vortex86 := $(___) -march=i586 $(FPU_MMX) $(TUNE_586MMX) $(OPT_UARCH_SCAL_64) --param l1-cache-size=8 --param l2-cache-size=0 -dmnp/vortex86dx2 := $(___) -march=i586 $(FPU_MMX) $(TUNE_586MMX) $(OPT_UARCH_SCAL_64) --param l1-cache-size=16 --param l2-cache-size=256 -dmnp/vortex86mx := $(___) -march=i586 $(FPU_MMX) $(TUNE_586MMX) $(OPT_UARCH_SCAL_64) --param l1-cache-size=16 --param l2-cache-size=128 -dmnp/vortex86dx3 := $(___) -march=i686 $(FPU_SSE) $(TUNE_686SSE) $(OPT_UARCH_SCAL_128) --param l1-cache-size=32 --param l2-cache-size=512 -dmnp/vortex86mx2 := $(___) -march=i686 $(FPU_SSE) $(TUNE_686SSE) $(OPT_UARCH_SCAL_128) --param l1-cache-size=32 --param l2-cache-size=128 +dmnp/vortex86dx := $(___) -march=i486 $(FPU_387) -mtune=i486 $(OPT_UARCH_PIPE) --param l1-cache-size=16 --param l2-cache-size=256 +dmnp/vortex86mx := $(___) -march=i486 $(FPU_387) -mtune=i486 $(OPT_UARCH_PIPE) --param l1-cache-size=16 --param l2-cache-size=256 +dmnp/vortex86 := $(___) -march=i586 $(FPU_MMX) $(TUNE_586MMX) $(OPT_UARCH_SCAL_64) --param l1-cache-size=8 --param l2-cache-size=0 +dmnp/vortex86dx2 := $(___) -march=i586 $(FPU_MMX) $(TUNE_586MMX) $(OPT_UARCH_SCAL_64) --param l1-cache-size=16 --param l2-cache-size=256 +dmnp/vortex86mx := $(___) -march=i586 $(FPU_MMX) $(TUNE_586MMX) $(OPT_UARCH_SCAL_64) --param l1-cache-size=16 --param l2-cache-size=128 +dmnp/vortex86dx3 := $(___) -march=i686 $(FPU_SSE) $(TUNE_686SSE) $(OPT_UARCH_SCAL_128) --param l1-cache-size=32 --param l2-cache-size=512 +dmnp/vortex86mx2 := $(___) -march=i686 $(FPU_SSE) $(TUNE_686SSE) $(OPT_UARCH_SCAL_128) --param l1-cache-size=32 --param l2-cache-size=128 |
|
From: <sv...@op...> - 2024-06-11 06:27:43
|
Author: manx Date: Tue Jun 11 08:27:36 2024 New Revision: 21015 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21015 Log: [Fix] build: download_externals: Fix archive.org links to use original resource specifier. See <https://en.wikipedia.org/wiki/Help:Using_the_Wayback_Machine#Specific_archive_copy>. Modified: branches/OpenMPT-1.28/build/download_externals.cmd Modified: branches/OpenMPT-1.28/build/download_externals.cmd ============================================================================== --- branches/OpenMPT-1.28/build/download_externals.cmd Tue Jun 11 08:22:18 2024 (r21014) +++ branches/OpenMPT-1.28/build/download_externals.cmd Tue Jun 11 08:27:36 2024 (r21015) @@ -46,17 +46,17 @@ ) call build\scriptlib\download.cmd "https://www.7-zip.org/a/7za920.zip" "build\externals\7za920.zip" || goto error - call build\scriptlib\download.cmd "https://web.archive.org/web/20180506151102if_/https://www.7-zip.org/a/7z1805-extra.7z" "build\externals\7z1805-extra.7z" || goto error - call build\scriptlib\download.cmd "https://web.archive.org/web/20180505172153if_/https://www.7-zip.org/a/7z1805.exe" "build\externals\7z1805.exe" || goto error + call build\scriptlib\download.cmd "https://web.archive.org/web/20180506151102id_/https://www.7-zip.org/a/7z1805-extra.7z" "build\externals\7z1805-extra.7z" || goto error + call build\scriptlib\download.cmd "https://web.archive.org/web/20180505172153id_/https://www.7-zip.org/a/7z1805.exe" "build\externals\7z1805.exe" || goto error call build\scriptlib\download.cmd "https://github.com/bkaradzic/GENie/archive/78817a9707c1a02e845fb38b3adcc5353b02d377.zip" "build\externals\GENie-78817a9707c1a02e845fb38b3adcc5353b02d377.zip" || goto error call build\scriptlib\download.cmd "https://github.com/premake/premake-core/releases/download/v5.0.0-alpha13/premake-5.0.0-alpha13-src.zip" "build\externals\premake-5.0.0-alpha13-src.zip" || goto error - call build\scriptlib\download.cmd "https://web.archive.org/web/20131217072017if_/http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" "build\externals\WA5.55_SDK.exe" || goto error + call build\scriptlib\download.cmd "https://web.archive.org/web/20131217072017id_/http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" "build\externals\WA5.55_SDK.exe" || goto error call build\scriptlib\download.cmd "https://www.un4seen.com/files/xmp-sdk.zip" "build\externals\xmp-sdk.zip" || goto error - call build\scriptlib\download.cmd "https://web.archive.org/web/20191011060157if_/https://www.steinberg.net/sdk_downloads/asiosdk2.3.zip" "build\externals\asiosdk2.3.zip" || goto error + call build\scriptlib\download.cmd "https://web.archive.org/web/20191011060157id_/https://www.steinberg.net/sdk_downloads/asiosdk2.3.zip" "build\externals\asiosdk2.3.zip" || goto error - call build\scriptlib\download.cmd "https://web.archive.org/web/20200918004813if_/http://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe" "build\externals\htmlhelp.exe" || goto error + call build\scriptlib\download.cmd "https://web.archive.org/web/20200918004813id_/http://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe" "build\externals\htmlhelp.exe" || goto error call build\scriptlib\download.cmd "https://www.python.org/ftp/python/3.7.2/python-3.7.2.post1-embed-win32.zip" "build\externals\python-3.7.2.post1-embed-win32.zip" || goto error |
|
From: <sv...@op...> - 2024-06-11 06:22:25
|
Author: manx Date: Tue Jun 11 08:22:18 2024 New Revision: 21014 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21014 Log: Merged revision(s) 21013 from branches/OpenMPT-1.30: Merged revision(s) 21012 from branches/OpenMPT-1.31: [Fix] build: download_externals: Fix archive.org links to use original resource specifier. See <https://en.wikipedia.org/wiki/Help:Using_the_Wayback_Machine#Specific_archive_copy>. ........ ........ Modified: branches/OpenMPT-1.29/ (props changed) branches/OpenMPT-1.29/build/download_externals.cmd Modified: branches/OpenMPT-1.29/build/download_externals.cmd ============================================================================== --- branches/OpenMPT-1.29/build/download_externals.cmd Tue Jun 11 08:21:53 2024 (r21013) +++ branches/OpenMPT-1.29/build/download_externals.cmd Tue Jun 11 08:22:18 2024 (r21014) @@ -36,12 +36,12 @@ call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://www.7-zip.org/a/7z1900.exe" "build\externals\7z1900.exe" 2924fd60f5dd636f643b68d402b65c2bfab5536122aa688ebba5ae142c7d04ce8b1c8e078f54db8adadce9d5c6fa74c0794604ecc16a4c5489f9ca70a6d9e1c4 1185968 || goto error -call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://web.archive.org/web/20131217072017if_/http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" "build\externals\WA5.55_SDK.exe" 394375db8a16bf155b5de9376f6290488ab339e503dbdfdc4e2f5bede967799e625c559cca363bc988324f1a8e86e5fd28a9f697422abd7bb3dcde4a766607b5 336166 || goto error +call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://web.archive.org/web/20131217072017id_/http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" "build\externals\WA5.55_SDK.exe" 394375db8a16bf155b5de9376f6290488ab339e503dbdfdc4e2f5bede967799e625c559cca363bc988324f1a8e86e5fd28a9f697422abd7bb3dcde4a766607b5 336166 || goto error call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://www.un4seen.com/files/xmp-sdk.zip" "build\externals\xmp-sdk.zip" 62c442d656d4bb380360368a0f5f01da11b4ed54333d7f54f875a9a5ec390b08921e00bd08e62cd7a0a5fe642e3377023f20a950cc2a42898ff4cda9ab88fc91 322744 || goto error -call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://web.archive.org/web/20200918004813if_/http://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe" "build\externals\htmlhelp.exe" d91371244ea98c691b4674ee266c4a2496a296800c176adae069d21f5c52c0763b21cc7859cfffa865b89e50171a2c99a6d14620c32f7d72c0ef04045348f856 3509072 || goto error +call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://web.archive.org/web/20200918004813id_/http://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe" "build\externals\htmlhelp.exe" d91371244ea98c691b4674ee266c4a2496a296800c176adae069d21f5c52c0763b21cc7859cfffa865b89e50171a2c99a6d14620c32f7d72c0ef04045348f856 3509072 || goto error call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://www.python.org/ftp/python/3.10.1/python-3.10.1-embed-amd64.zip" "build\externals\python-3.10.1-embed-amd64.zip" cb67b15c312cf6e157b5023106b52129998f0cc214fc79e53ffa8b7ef9f34200690d9ab6798401c47be4e6c22bfbfcb3c0fd17e71d9253c53d4572b1d4931029 8484449 || goto error |
|
From: <sv...@op...> - 2024-06-11 06:22:05
|
Author: manx Date: Tue Jun 11 08:21:53 2024 New Revision: 21013 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21013 Log: Merged revision(s) 21012 from branches/OpenMPT-1.31: [Fix] build: download_externals: Fix archive.org links to use original resource specifier. See <https://en.wikipedia.org/wiki/Help:Using_the_Wayback_Machine#Specific_archive_copy>. ........ Modified: branches/OpenMPT-1.30/ (props changed) branches/OpenMPT-1.30/build/download_externals.cmd Modified: branches/OpenMPT-1.30/build/download_externals.cmd ============================================================================== --- branches/OpenMPT-1.30/build/download_externals.cmd Tue Jun 11 08:20:31 2024 (r21012) +++ branches/OpenMPT-1.30/build/download_externals.cmd Tue Jun 11 08:21:53 2024 (r21013) @@ -36,12 +36,12 @@ call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://www.7-zip.org/a/7z2201-x64.exe" "build\externals\7z2201-x64.exe" 965d43f06d104bf6707513c459f18aaf8b049f4a043643d720b184ed9f1bb6c929309c51c3991d5aaff7b9d87031a7248ee3274896521abe955d0e49f901ac94 1575742 || goto error -call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://web.archive.org/web/20131217072017if_/http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" "build\externals\WA5.55_SDK.exe" 394375db8a16bf155b5de9376f6290488ab339e503dbdfdc4e2f5bede967799e625c559cca363bc988324f1a8e86e5fd28a9f697422abd7bb3dcde4a766607b5 336166 || goto error +call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://web.archive.org/web/20131217072017id_/http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" "build\externals\WA5.55_SDK.exe" 394375db8a16bf155b5de9376f6290488ab339e503dbdfdc4e2f5bede967799e625c559cca363bc988324f1a8e86e5fd28a9f697422abd7bb3dcde4a766607b5 336166 || goto error call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://www.un4seen.com/files/xmp-sdk.zip" "build\externals\xmp-sdk.zip" 62c442d656d4bb380360368a0f5f01da11b4ed54333d7f54f875a9a5ec390b08921e00bd08e62cd7a0a5fe642e3377023f20a950cc2a42898ff4cda9ab88fc91 322744 || goto error -call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://web.archive.org/web/20200918004813if_/http://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe" "build\externals\htmlhelp.exe" d91371244ea98c691b4674ee266c4a2496a296800c176adae069d21f5c52c0763b21cc7859cfffa865b89e50171a2c99a6d14620c32f7d72c0ef04045348f856 3509072 || goto error +call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://web.archive.org/web/20200918004813id_/http://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe" "build\externals\htmlhelp.exe" d91371244ea98c691b4674ee266c4a2496a296800c176adae069d21f5c52c0763b21cc7859cfffa865b89e50171a2c99a6d14620c32f7d72c0ef04045348f856 3509072 || goto error call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://www.python.org/ftp/python/3.11.3/python-3.11.3-embed-amd64.zip" "build\externals\python-3.11.3-embed-amd64.zip" d0449f8450adf052b4f7c8fe94444482f1fd59f7dff4de38ddef1741061c60163af310edd0b1ffd93d322da3b4db9cb553a574a949ae4fcb0004594f25881501 10569806 || goto error |
|
From: <sv...@op...> - 2024-06-11 06:20:44
|
Author: manx Date: Tue Jun 11 08:20:31 2024 New Revision: 21012 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21012 Log: [Fix] build: download_externals: Fix archive.org links to use original resource specifier. See <https://en.wikipedia.org/wiki/Help:Using_the_Wayback_Machine#Specific_archive_copy>. Modified: branches/OpenMPT-1.31/build/download_externals.cmd branches/OpenMPT-1.31/build/download_externals.sh Modified: branches/OpenMPT-1.31/build/download_externals.cmd ============================================================================== --- branches/OpenMPT-1.31/build/download_externals.cmd Tue Jun 11 08:19:30 2024 (r21011) +++ branches/OpenMPT-1.31/build/download_externals.cmd Tue Jun 11 08:20:31 2024 (r21012) @@ -36,12 +36,12 @@ call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://7-zip.org/a/7z2406-x64.exe" "build\externals\7z2406-x64.exe" b635b449f49aac29234f677e662be35f72a059401ea0786d956485d07134f9dd10ed284338503f08ff7aad16833cf034eb955ca34e1faf35a8177ccad1f20c75 1619556 || goto error -call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://web.archive.org/web/20131217072017if_/http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" "build\externals\WA5.55_SDK.exe" 394375db8a16bf155b5de9376f6290488ab339e503dbdfdc4e2f5bede967799e625c559cca363bc988324f1a8e86e5fd28a9f697422abd7bb3dcde4a766607b5 336166 || goto error +call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://web.archive.org/web/20131217072017id_/http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" "build\externals\WA5.55_SDK.exe" 394375db8a16bf155b5de9376f6290488ab339e503dbdfdc4e2f5bede967799e625c559cca363bc988324f1a8e86e5fd28a9f697422abd7bb3dcde4a766607b5 336166 || goto error call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://www.un4seen.com/files/xmp-sdk.zip" "build\externals\xmp-sdk.zip" 62c442d656d4bb380360368a0f5f01da11b4ed54333d7f54f875a9a5ec390b08921e00bd08e62cd7a0a5fe642e3377023f20a950cc2a42898ff4cda9ab88fc91 322744 || goto error -call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://web.archive.org/web/20200918004813if_/http://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe" "build\externals\htmlhelp.exe" d91371244ea98c691b4674ee266c4a2496a296800c176adae069d21f5c52c0763b21cc7859cfffa865b89e50171a2c99a6d14620c32f7d72c0ef04045348f856 3509072 || goto error +call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://web.archive.org/web/20200918004813id_/http://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe" "build\externals\htmlhelp.exe" d91371244ea98c691b4674ee266c4a2496a296800c176adae069d21f5c52c0763b21cc7859cfffa865b89e50171a2c99a6d14620c32f7d72c0ef04045348f856 3509072 || goto error call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://www.python.org/ftp/python/3.12.4/python-3.12.4-embed-amd64.zip" "build\externals\python-3.12.4-embed-amd64.zip" f07be8d84645f2411d061262b378d783498f23a961a9eb3dc3cf5c785af75de551cd4f413c385f47219601d2b09fa6ae88242226b1e31cf009929d3ff5d6673e 11065736 || goto error Modified: branches/OpenMPT-1.31/build/download_externals.sh ============================================================================== --- branches/OpenMPT-1.31/build/download_externals.sh Tue Jun 11 08:19:30 2024 (r21011) +++ branches/OpenMPT-1.31/build/download_externals.sh Tue Jun 11 08:20:31 2024 (r21012) @@ -98,7 +98,7 @@ download "build/externals/allegro-4.2.3.1-hg.8+r8500.zip" 3872466 46cd8d4d7138b795dbc66994e953d0abc578c6d3c00615e3580237458529d33d7ad9d269a9778918d4b3719d75750d5cca74ff6bf38ad357a766472799ee9e7b "https://lib.openmpt.org/files/libopenmpt/contrib/allegro/allegro-4.2.3.1-hg.8+r8500.zip" download "build/externals/csdpmi7b.zip" 71339 58c24691d27cead1cec92d334af551f37a3ba31de25a687d99399c28d822ec9f6ffccc9332bfce35e65dae4dd1210b54e54b223a4de17f5adcb11e2da004b834 "https://lib.openmpt.org/files/libopenmpt/contrib/djgpp/cwsdpmi/csdpmi7b.zip https://djgpp.mirror.garr.it/current/v2misc/csdpmi7b.zip" download "build/externals/csdpmi7s.zip" 89872 ea5652d31850d8eb0d15a919de0b51849f58efea0d16ad2aa4687fac4abd223d0ca34a2d1b616b02fafe84651dbef3e506df9262cfb399eb6d9909bffc89bfd3 "https://lib.openmpt.org/files/libopenmpt/contrib/djgpp/cwsdpmi/csdpmi7s.zip https://djgpp.mirror.garr.it/current/v2misc/csdpmi7s.zip" -download "build/externals/WA5.55_SDK.exe" 336166 394375db8a16bf155b5de9376f6290488ab339e503dbdfdc4e2f5bede967799e625c559cca363bc988324f1a8e86e5fd28a9f697422abd7bb3dcde4a766607b5 "http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe https://web.archive.org/web/20131217072017if_/http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" +download "build/externals/WA5.55_SDK.exe" 336166 394375db8a16bf155b5de9376f6290488ab339e503dbdfdc4e2f5bede967799e625c559cca363bc988324f1a8e86e5fd28a9f697422abd7bb3dcde4a766607b5 "http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe https://web.archive.org/web/20131217072017id_/http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" download "build/externals/xmp-sdk.zip" 322744 62c442d656d4bb380360368a0f5f01da11b4ed54333d7f54f875a9a5ec390b08921e00bd08e62cd7a0a5fe642e3377023f20a950cc2a42898ff4cda9ab88fc91 "https://www.un4seen.com/files/xmp-sdk.zip" unpack "include/allegro42" "build/externals/allegro-4.2.3.1-hg.8+r8500.zip" "." |
|
From: <sv...@op...> - 2024-06-11 06:19:38
|
Author: manx Date: Tue Jun 11 08:19:30 2024 New Revision: 21011 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21011 Log: [Fix] build: download_externals: Fix archive.org links to use original resource specifier. See <https://en.wikipedia.org/wiki/Help:Using_the_Wayback_Machine#Specific_archive_copy>. Modified: trunk/OpenMPT/build/download_externals.txt Modified: trunk/OpenMPT/build/download_externals.txt ============================================================================== --- trunk/OpenMPT/build/download_externals.txt Mon Jun 10 15:08:12 2024 (r21010) +++ trunk/OpenMPT/build/download_externals.txt Tue Jun 11 08:19:30 2024 (r21011) @@ -1,9 +1,9 @@ "build/externals/7za920.zip" 384846 84e830c91a0e8ae499cc4814080da6569d8a6acbddc585c8b62abc86c809793aeb669b0a741063a379fd281ade85f120bc27efeb67d63bf961be893eec8bc3b3 "https://7-zip.org/a/7za920.zip" "https://netcologne.dl.sourceforge.net/project/sevenzip/7-Zip/9.20/7za920.zip" "build/externals/7z2406-extra.7z" 1610111 6b88a761f7cc8b8affc074b24750bcdc65cc3ab18d127c8bfdd1eca953d43e21558eb1137c4b934689990564d7d24cf14e249a773dc1e5ddb7316b10d73682f8 "https://7-zip.org/a/7z2406-extra.7z" "https://netcologne.dl.sourceforge.net/project/sevenzip/7-Zip/24.06/7z2406-extra.7z" "build/externals/7z2406-x64.exe" 1619556 b635b449f49aac29234f677e662be35f72a059401ea0786d956485d07134f9dd10ed284338503f08ff7aad16833cf034eb955ca34e1faf35a8177ccad1f20c75 "https://7-zip.org/a/7z2406-x64.exe" "https://netcologne.dl.sourceforge.net/project/sevenzip/7-Zip/24.06/7z2406-x64.exe" -"build/externals/WA5.55_SDK.exe" 336166 394375db8a16bf155b5de9376f6290488ab339e503dbdfdc4e2f5bede967799e625c559cca363bc988324f1a8e86e5fd28a9f697422abd7bb3dcde4a766607b5 "https://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" "http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" "https://web.archive.org/web/20131217072017/http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" +"build/externals/WA5.55_SDK.exe" 336166 394375db8a16bf155b5de9376f6290488ab339e503dbdfdc4e2f5bede967799e625c559cca363bc988324f1a8e86e5fd28a9f697422abd7bb3dcde4a766607b5 "https://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" "http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" "https://web.archive.org/web/20131217072017id_/http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" "build/externals/xmp-sdk.zip" 322744 62c442d656d4bb380360368a0f5f01da11b4ed54333d7f54f875a9a5ec390b08921e00bd08e62cd7a0a5fe642e3377023f20a950cc2a42898ff4cda9ab88fc91 "https://www.un4seen.com/files/xmp-sdk.zip" -"build/externals/htmlhelp.exe" 3509072 d91371244ea98c691b4674ee266c4a2496a296800c176adae069d21f5c52c0763b21cc7859cfffa865b89e50171a2c99a6d14620c32f7d72c0ef04045348f856 "https://web.archive.org/web/20200918004813/https://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe" "https://web.archive.org/web/20200918004813/http://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe" +"build/externals/htmlhelp.exe" 3509072 d91371244ea98c691b4674ee266c4a2496a296800c176adae069d21f5c52c0763b21cc7859cfffa865b89e50171a2c99a6d14620c32f7d72c0ef04045348f856 "https://web.archive.org/web/20200918004813id_/https://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe" "https://web.archive.org/web/20200918004813id_/http://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe" "build/externals/python-3.12.4-embed-amd64.zip" 11065736 f07be8d84645f2411d061262b378d783498f23a961a9eb3dc3cf5c785af75de551cd4f413c385f47219601d2b09fa6ae88242226b1e31cf009929d3ff5d6673e "https://www.python.org/ftp/python/3.12.4/python-3.12.4-embed-amd64.zip" "build/externals/innounp050.rar" 141621 dbbc809308267a866db9d6b751fdeda6d179e1a65d8ddb14bb51984431ae91493f9a76105e1789b245732043a2c696c869ed10964b48cf59f81e55bd52f85330 "https://netcologne.dl.sourceforge.net/project/innounp/innounp/innounp 0.50/innounp050.rar" "https://deac-fra.dl.sourceforge.net/project/innounp/innounp/innounp 0.50/innounp050.rar" "build/externals/innosetup-6.2.2.exe" 4722512 496375b1ce9c0d2f8eb3930ebd8366f5c4c938bc1eda47aed415e3f02bd8651a84a770a15f2825bf3c8ed9dbefa355b9eb805dd76bc782f6d8c8096d80443099 "https://files.jrsoftware.org/is/6/innosetup-6.2.2.exe" |
|
From: <sv...@op...> - 2024-06-10 13:08:24
|
Author: manx Date: Mon Jun 10 15:08:12 2024 New Revision: 21010 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21010 Log: Merged revision(s) 21009 from trunk/OpenMPT: [Fix] build: Makefile: DJGPP: Cx486SLC and Cx486DLC support 486 instructions. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/build/make/config-djgpp.mk Modified: branches/OpenMPT-1.31/build/make/config-djgpp.mk ============================================================================== --- branches/OpenMPT-1.31/build/make/config-djgpp.mk Mon Jun 10 15:06:56 2024 (r21009) +++ branches/OpenMPT-1.31/build/make/config-djgpp.mk Mon Jun 10 15:08:12 2024 (r21010) @@ -222,8 +222,8 @@ -cyrix/cx486slc := $(___) -march=i386 $(FPU_NONE) -mtune=i486 $(OPT_DEF) --param l1-cache-size=1 --param l2-cache-size=$(CACHE_386) -cyrix/cx486dlc := $(___) -march=i386 $(FPU_NONE) -mtune=i486 $(OPT_DEF) --param l1-cache-size=1 --param l2-cache-size=$(CACHE_386) +cyrix/cx486slc := $(___) -march=i486 $(FPU_NONE) -mtune=i486 $(OPT_DEF) --param l1-cache-size=1 --param l2-cache-size=$(CACHE_386) +cyrix/cx486dlc := $(___) -march=i486 $(FPU_NONE) -mtune=i486 $(OPT_DEF) --param l1-cache-size=1 --param l2-cache-size=$(CACHE_386) cyrix/cx4x86s := $(___) -march=i486 $(FPU_NONE) -mtune=i486 $(OPT_DEF) --param l1-cache-size=2 --param l2-cache-size=$(CACHE_486) cyrix/cx4x86dx := $(___) -march=i486 $(FPU_387) -mtune=i486 $(OPT_DEF) --param l1-cache-size=6 --param l2-cache-size=$(CACHE_486) |
|
From: <sv...@op...> - 2024-06-10 13:07:10
|
Author: manx Date: Mon Jun 10 15:06:56 2024 New Revision: 21009 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21009 Log: [Fix] build: Makefile: DJGPP: Cx486SLC and Cx486DLC support 486 instructions. Modified: trunk/OpenMPT/build/make/config-djgpp.mk Modified: trunk/OpenMPT/build/make/config-djgpp.mk ============================================================================== --- trunk/OpenMPT/build/make/config-djgpp.mk Sun Jun 9 13:03:50 2024 (r21008) +++ trunk/OpenMPT/build/make/config-djgpp.mk Mon Jun 10 15:06:56 2024 (r21009) @@ -299,8 +299,8 @@ -cyrix/cx486slc := $(___) -march=i386 $(FPU_NONE) -mtune=i486 $(OPT_UARCH_PIPE) --param l1-cache-size=1 --param l2-cache-size=$(CACHE_386) -cyrix/cx486dlc := $(___) -march=i386 $(FPU_NONE) -mtune=i486 $(OPT_UARCH_PIPE) --param l1-cache-size=1 --param l2-cache-size=$(CACHE_386) +cyrix/cx486slc := $(___) -march=i486 $(FPU_NONE) -mtune=i486 $(OPT_UARCH_PIPE) --param l1-cache-size=1 --param l2-cache-size=$(CACHE_386) +cyrix/cx486dlc := $(___) -march=i486 $(FPU_NONE) -mtune=i486 $(OPT_UARCH_PIPE) --param l1-cache-size=1 --param l2-cache-size=$(CACHE_386) cyrix/cx4x86s := $(___) -march=i486 $(FPU_NONE) -mtune=i486 $(OPT_UARCH_PIPE) --param l1-cache-size=2 --param l2-cache-size=$(CACHE_486) cyrix/cx4x86dx := $(___) -march=i486 $(FPU_387) -mtune=i486 $(OPT_UARCH_PIPE) --param l1-cache-size=6 --param l2-cache-size=$(CACHE_486) |
|
From: <sv...@op...> - 2024-06-09 11:04:02
|
Author: manx Date: Sun Jun 9 13:03:50 2024 New Revision: 21008 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21008 Log: [Ref] Component Manager: Remove support for optional Components shipped in the Components folder. Modified: trunk/OpenMPT/common/ComponentManager.cpp trunk/OpenMPT/common/ComponentManager.h trunk/OpenMPT/mptrack/Mptrack.cpp Modified: trunk/OpenMPT/common/ComponentManager.cpp ============================================================================== --- trunk/OpenMPT/common/ComponentManager.cpp Sun Jun 9 12:48:09 2024 (r21007) +++ trunk/OpenMPT/common/ComponentManager.cpp Sun Jun 9 13:03:50 2024 (r21008) @@ -463,12 +463,6 @@ } -mpt::PathString ComponentManager::GetComponentPath() const -{ - return m_Settings.Path(); -} - - #endif // MPT_COMPONENT_MANAGER Modified: trunk/OpenMPT/common/ComponentManager.h ============================================================================== --- trunk/OpenMPT/common/ComponentManager.h Sun Jun 9 12:48:09 2024 (r21007) +++ trunk/OpenMPT/common/ComponentManager.h Sun Jun 9 13:03:50 2024 (r21008) @@ -308,7 +308,6 @@ virtual bool LoadOnStartup() const = 0; virtual bool KeepLoaded() const = 0; virtual bool IsBlocked(const std::string &key) const = 0; - virtual mpt::PathString Path() const = 0; protected: virtual ~IComponentManagerSettings() = default; }; @@ -321,7 +320,6 @@ bool LoadOnStartup() const override { return false; } bool KeepLoaded() const override { return true; } bool IsBlocked(const std::string & /*key*/ ) const override { return false; } - mpt::PathString Path() const override { return mpt::PathString(); } }; @@ -374,7 +372,6 @@ std::shared_ptr<const IComponent> ReloadComponent(const IComponentFactory &componentFactory); std::vector<std::string> GetRegisteredComponents() const; ComponentInfo GetComponentInfo(std::string name) const; - mpt::PathString GetComponentPath() const; }; @@ -423,12 +420,6 @@ } -inline mpt::PathString GetComponentPath() -{ - return ComponentManager::Instance()->GetComponentPath(); -} - - #else // !MPT_COMPONENT_MANAGER Modified: trunk/OpenMPT/mptrack/Mptrack.cpp ============================================================================== --- trunk/OpenMPT/mptrack/Mptrack.cpp Sun Jun 9 12:48:09 2024 (r21007) +++ trunk/OpenMPT/mptrack/Mptrack.cpp Sun Jun 9 13:03:50 2024 (r21008) @@ -849,14 +849,6 @@ { return conf.IsComponentBlocked(key); } - mpt::PathString Path() const override - { - if(mpt::OS::Windows::Name(mpt::OS::Windows::GetProcessArchitecture()).empty()) - { - return mpt::PathString(); - } - return configPath + P_("Components\\") + mpt::PathString::FromUnicode(mpt::OS::Windows::Name(mpt::OS::Windows::GetProcessArchitecture())) + P_("\\"); - } }; @@ -1011,17 +1003,8 @@ CreateDirectory(m_ConfigPath.AsNative().c_str(), 0); } } - if(!mpt::native_fs{}.is_directory(GetConfigPath() + P_("Components"))) - { - CreateDirectory((GetConfigPath() + P_("Components")).AsNative().c_str(), 0); - } - if(!mpt::native_fs{}.is_directory(GetConfigPath() + P_("Components\\") + mpt::PathString::FromUnicode(mpt::OS::Windows::Name(mpt::OS::Windows::GetProcessArchitecture())))) - { - CreateDirectory((GetConfigPath() + P_("Components\\") + mpt::PathString::FromUnicode(mpt::OS::Windows::Name(mpt::OS::Windows::GetProcessArchitecture()))).AsNative().c_str(), 0); - } // Handle updates from old versions. - if(!IsPortableMode()) { // Move the config files if they're still in the old place. |
|
From: <sv...@op...> - 2024-06-09 10:48:16
|
Author: manx Date: Sun Jun 9 12:48:09 2024 New Revision: 21007 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21007 Log: [Mod] OpenMPT: Version is now 1.31.08.01 Modified: branches/OpenMPT-1.31/common/versionNumber.h Modified: branches/OpenMPT-1.31/common/versionNumber.h ============================================================================== --- branches/OpenMPT-1.31/common/versionNumber.h Sun Jun 9 12:47:29 2024 (r21006) +++ branches/OpenMPT-1.31/common/versionNumber.h Sun Jun 9 12:48:09 2024 (r21007) @@ -18,6 +18,6 @@ #define VER_MAJORMAJOR 1 #define VER_MAJOR 31 #define VER_MINOR 08 -#define VER_MINORMINOR 00 +#define VER_MINORMINOR 01 OPENMPT_NAMESPACE_END |
|
From: <sv...@op...> - 2024-06-09 10:47:42
|
Author: manx Date: Sun Jun 9 12:47:27 2024 New Revision: 21002 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21002 Log: [Mod] OpenMPT: Version is now 1.28.10.64 Modified: branches/OpenMPT-1.28/common/versionNumber.h Modified: branches/OpenMPT-1.28/common/versionNumber.h ============================================================================== --- branches/OpenMPT-1.28/common/versionNumber.h Sun Jun 9 12:47:03 2024 (r21001) +++ branches/OpenMPT-1.28/common/versionNumber.h Sun Jun 9 12:47:27 2024 (r21002) @@ -21,7 +21,7 @@ #define VER_MAJORMAJOR 1 #define VER_MAJOR 28 #define VER_MINOR 10 -#define VER_MINORMINOR 63 +#define VER_MINORMINOR 64 //Numerical value of the version. #define MPT_VERSION_CURRENT MAKE_VERSION_NUMERIC(VER_MAJORMAJOR,VER_MAJOR,VER_MINOR,VER_MINORMINOR) |
|
From: <sv...@op...> - 2024-06-09 10:47:42
|
Author: manx Date: Sun Jun 9 12:47:29 2024 New Revision: 21006 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21006 Log: [Mod] OpenMPT: Version is now 1.28.10.65 Modified: branches/OpenMPT-1.28/common/versionNumber.h Modified: branches/OpenMPT-1.28/common/versionNumber.h ============================================================================== --- branches/OpenMPT-1.28/common/versionNumber.h Sun Jun 9 12:47:29 2024 (r21005) +++ branches/OpenMPT-1.28/common/versionNumber.h Sun Jun 9 12:47:29 2024 (r21006) @@ -21,7 +21,7 @@ #define VER_MAJORMAJOR 1 #define VER_MAJOR 28 #define VER_MINOR 10 -#define VER_MINORMINOR 64 +#define VER_MINORMINOR 65 //Numerical value of the version. #define MPT_VERSION_CURRENT MAKE_VERSION_NUMERIC(VER_MAJORMAJOR,VER_MAJOR,VER_MINOR,VER_MINORMINOR) |
|
From: <sv...@op...> - 2024-06-09 10:47:42
|
Author: manx Date: Sun Jun 9 12:47:27 2024 New Revision: 21003 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21003 Log: [Mod] libopenmpt: Prepare for release. Modified: branches/OpenMPT-1.28/libopenmpt/dox/changelog.md branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.h branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.mk Modified: branches/OpenMPT-1.28/libopenmpt/dox/changelog.md ============================================================================== --- branches/OpenMPT-1.28/libopenmpt/dox/changelog.md Sun Jun 9 12:47:27 2024 (r21002) +++ branches/OpenMPT-1.28/libopenmpt/dox/changelog.md Sun Jun 9 12:47:27 2024 (r21003) @@ -5,7 +5,7 @@ For fully detailed change log, please see the source repository directly. This is just a high-level summary. -### libopenmpt 0.4.43-pre +### libopenmpt 0.4.43 (2024-06-09) * AMS: Default channel panning was broken, using all-center panning instead of MOD-style panning. Modified: branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.h ============================================================================== --- branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.h Sun Jun 9 12:47:27 2024 (r21002) +++ branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.h Sun Jun 9 12:47:27 2024 (r21003) @@ -21,9 +21,9 @@ /*! \brief libopenmpt patch version number */ #define OPENMPT_API_VERSION_PATCH 43 /*! \brief libopenmpt pre-release tag */ -#define OPENMPT_API_VERSION_PREREL "-pre.0" +#define OPENMPT_API_VERSION_PREREL "" /*! \brief libopenmpt pre-release flag */ -#define OPENMPT_API_VERSION_IS_PREREL 1 +#define OPENMPT_API_VERSION_IS_PREREL 0 /*! \brief libopenmpt version number as a single integer value * \since 0.3 Modified: branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.mk ============================================================================== --- branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.mk Sun Jun 9 12:47:27 2024 (r21002) +++ branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.mk Sun Jun 9 12:47:27 2024 (r21003) @@ -1,7 +1,7 @@ LIBOPENMPT_VERSION_MAJOR=0 LIBOPENMPT_VERSION_MINOR=4 LIBOPENMPT_VERSION_PATCH=43 -LIBOPENMPT_VERSION_PREREL=-pre.0 +LIBOPENMPT_VERSION_PREREL= LIBOPENMPT_LTVER_CURRENT=1 LIBOPENMPT_LTVER_REVISION=43 |
3 messages has been excluded from this view by a project administrator.
