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
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <sv...@op...> - 2024-10-31 20:23:15
|
Author: sagamusix Date: Thu Oct 31 21:23:03 2024 New Revision: 22043 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22043 Log: [Fix] Fix djgpp builds. Modified: trunk/OpenMPT/soundlib/InstrumentSynth.cpp Modified: trunk/OpenMPT/soundlib/InstrumentSynth.cpp ============================================================================== --- trunk/OpenMPT/soundlib/InstrumentSynth.cpp Thu Oct 31 21:20:52 2024 (r22042) +++ trunk/OpenMPT/soundlib/InstrumentSynth.cpp Thu Oct 31 21:23:03 2024 (r22043) @@ -980,7 +980,7 @@ int32 target = m_volumeFactor + m_fcVolumeBendSpeed * 256; if(target < 0 || target >= 32768) m_fcVolumeBendRemain = 0; - m_volumeFactor = static_cast<uint16>(std::clamp(target, 0, 16384)); + m_volumeFactor = static_cast<uint16>(std::clamp(target, int32(0), int32(16384))); } return true; } |
|
From: <sv...@op...> - 2024-10-31 20:20:58
|
Author: sagamusix Date: Thu Oct 31 21:20:52 2024 New Revision: 22042 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22042 Log: [Fix] And fix another operator precedence. Modified: trunk/OpenMPT/soundlib/Load_fc.cpp Modified: trunk/OpenMPT/soundlib/Load_fc.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_fc.cpp Thu Oct 31 21:19:56 2024 (r22041) +++ trunk/OpenMPT/soundlib/Load_fc.cpp Thu Oct 31 21:20:52 2024 (r22042) @@ -373,7 +373,7 @@ prevNote[chn] = {p[0], static_cast<uint8>(m->instr)}; } else if(row == 0 && ord > 0 && orderData[ord - 1].channels[chn].noteTranspose != chnInfo.noteTranspose && prevNote[chn][0] > 0) { - m->note = NOTE_MIN + (chnInfo.noteTranspose + prevNote[chn][0]) & 0x7F; + m->note = NOTE_MIN + ((chnInfo.noteTranspose + prevNote[chn][0]) & 0x7F); m->instr = prevNote[chn][1]; m->SetVolumeCommand(VOLCMD_TONEPORTAMENTO, 9); } |
|
From: <sv...@op...> - 2024-10-31 20:20:10
|
Author: sagamusix Date: Thu Oct 31 21:19:56 2024 New Revision: 22041 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22041 Log: [Fix] Fix operator precedence. Modified: trunk/OpenMPT/soundlib/Load_fc.cpp Modified: trunk/OpenMPT/soundlib/Load_fc.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_fc.cpp Thu Oct 31 21:15:14 2024 (r22040) +++ trunk/OpenMPT/soundlib/Load_fc.cpp Thu Oct 31 21:19:56 2024 (r22041) @@ -364,7 +364,7 @@ if(p[0] > 0 && p[0] != 0x49) { - m->note = NOTE_MIN + (chnInfo.noteTranspose + p[0]) & 0x7F; + m->note = NOTE_MIN + ((chnInfo.noteTranspose + p[0]) & 0x7F); if(int instr = (p[1] & 0x3F) + chnInfo.instrTranspose + 1; instr >= 1 && instr <= m_nInstruments) m->instr = static_cast<ModCommand::INSTR>(instr); else |
Author: sagamusix Date: Thu Oct 31 21:15:14 2024 New Revision: 22040 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22040 Log: [New] Can now read Future Composer 1.0 - 1.4 files (https://bugs.openmpt.org/view.php?id=39). [Mod] OpenMPT: Version is now 1.32.00.32 Added: trunk/OpenMPT/soundlib/Load_fc.cpp (contents, props changed) Modified: trunk/OpenMPT/build/android_ndk/Android.mk trunk/OpenMPT/build/autotools/Makefile.am trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2022win10/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win10/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2022win10clang/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win10clang/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2022win10clang/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2022win10uwp/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2022win10uwp/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2022win10uwp/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win10uwp/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2022win7/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win7/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2022win7/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win7/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2022win7/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2022win7/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2022win7/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win7/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2022win7/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2022win7/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2022win8/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win8/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2022win8/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win8/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2022win8/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win8/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2022win8/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2022win8/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2022win8/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win8/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2022win8/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2022win8/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2022win81/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win81/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2022win81/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win81/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2022win81/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win81/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2022win81/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2022win81/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2022win81/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win81/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2022win81/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2022win81/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/xcode-ios/libopenmpt.xcodeproj/project.pbxproj trunk/OpenMPT/build/xcode-macosx/libopenmpt.xcodeproj/project.pbxproj trunk/OpenMPT/common/versionNumber.h trunk/OpenMPT/contrib/fuzzing/all_formats.dict trunk/OpenMPT/installer/filetypes-multi-arch-per-arch-retro.iss trunk/OpenMPT/installer/filetypes-multi-arch-per-arch.iss trunk/OpenMPT/installer/filetypes-multi-arch-retro.iss trunk/OpenMPT/installer/filetypes-multi-arch.iss trunk/OpenMPT/mptrack/EffectInfo.cpp trunk/OpenMPT/soundlib/InstrumentSynth.cpp trunk/OpenMPT/soundlib/InstrumentSynth.h trunk/OpenMPT/soundlib/Load_med.cpp trunk/OpenMPT/soundlib/ModChannel.h trunk/OpenMPT/soundlib/Snd_defs.h trunk/OpenMPT/soundlib/Snd_fx.cpp trunk/OpenMPT/soundlib/Sndfile.cpp trunk/OpenMPT/soundlib/Sndfile.h trunk/OpenMPT/soundlib/Tables.cpp trunk/OpenMPT/soundlib/mod_specifications.cpp trunk/OpenMPT/soundlib/modcommand.cpp trunk/OpenMPT/soundlib/modcommand.h Modified: trunk/OpenMPT/build/android_ndk/Android.mk ============================================================================== --- trunk/OpenMPT/build/android_ndk/Android.mk Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/android_ndk/Android.mk Thu Oct 31 21:15:14 2024 (r22040) @@ -163,6 +163,7 @@ soundlib/Load_dtm.cpp \ soundlib/Load_etx.cpp \ soundlib/Load_far.cpp \ + soundlib/Load_fc.cpp \ soundlib/Load_fmt.cpp \ soundlib/Load_ftm.cpp \ soundlib/Load_gdm.cpp \ Modified: trunk/OpenMPT/build/autotools/Makefile.am ============================================================================== --- trunk/OpenMPT/build/autotools/Makefile.am Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/autotools/Makefile.am Thu Oct 31 21:15:14 2024 (r22040) @@ -403,6 +403,7 @@ MPT_FILES_SOUNDLIB += soundlib/Loaders.h MPT_FILES_SOUNDLIB += soundlib/Load_etx.cpp MPT_FILES_SOUNDLIB += soundlib/Load_far.cpp +MPT_FILES_SOUNDLIB += soundlib/Load_fc.cpp MPT_FILES_SOUNDLIB += soundlib/Load_fmt.cpp MPT_FILES_SOUNDLIB += soundlib/Load_ftm.cpp MPT_FILES_SOUNDLIB += soundlib/Load_gdm.cpp Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj Thu Oct 31 21:15:14 2024 (r22040) @@ -1368,6 +1368,7 @@ <ClCompile Include="..\..\soundlib\Load_dtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_etx.cpp" /> <ClCompile Include="..\..\soundlib\Load_far.cpp" /> + <ClCompile Include="..\..\soundlib\Load_fc.cpp" /> <ClCompile Include="..\..\soundlib\Load_fmt.cpp" /> <ClCompile Include="..\..\soundlib\Load_ftm.cpp" /> <ClCompile Include="..\..\soundlib\Load_gdm.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters Thu Oct 31 21:15:14 2024 (r22040) @@ -2063,6 +2063,9 @@ <ClCompile Include="..\..\soundlib\Load_far.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_fc.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_fmt.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj Thu Oct 31 21:15:14 2024 (r22040) @@ -1368,6 +1368,7 @@ <ClCompile Include="..\..\soundlib\Load_dtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_etx.cpp" /> <ClCompile Include="..\..\soundlib\Load_far.cpp" /> + <ClCompile Include="..\..\soundlib\Load_fc.cpp" /> <ClCompile Include="..\..\soundlib\Load_fmt.cpp" /> <ClCompile Include="..\..\soundlib\Load_ftm.cpp" /> <ClCompile Include="..\..\soundlib\Load_gdm.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters Thu Oct 31 21:15:14 2024 (r22040) @@ -2063,6 +2063,9 @@ <ClCompile Include="..\..\soundlib\Load_far.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_fc.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_fmt.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj Thu Oct 31 21:15:14 2024 (r22040) @@ -1368,6 +1368,7 @@ <ClCompile Include="..\..\soundlib\Load_dtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_etx.cpp" /> <ClCompile Include="..\..\soundlib\Load_far.cpp" /> + <ClCompile Include="..\..\soundlib\Load_fc.cpp" /> <ClCompile Include="..\..\soundlib\Load_fmt.cpp" /> <ClCompile Include="..\..\soundlib\Load_ftm.cpp" /> <ClCompile Include="..\..\soundlib\Load_gdm.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters Thu Oct 31 21:15:14 2024 (r22040) @@ -2063,6 +2063,9 @@ <ClCompile Include="..\..\soundlib\Load_far.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_fc.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_fmt.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj Thu Oct 31 21:15:14 2024 (r22040) @@ -998,6 +998,7 @@ <ClCompile Include="..\..\soundlib\Load_dtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_etx.cpp" /> <ClCompile Include="..\..\soundlib\Load_far.cpp" /> + <ClCompile Include="..\..\soundlib\Load_fc.cpp" /> <ClCompile Include="..\..\soundlib\Load_fmt.cpp" /> <ClCompile Include="..\..\soundlib\Load_ftm.cpp" /> <ClCompile Include="..\..\soundlib\Load_gdm.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj.filters Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj.filters Thu Oct 31 21:15:14 2024 (r22040) @@ -1229,6 +1229,9 @@ <ClCompile Include="..\..\soundlib\Load_far.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_fc.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_fmt.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj Thu Oct 31 21:15:14 2024 (r22040) @@ -998,6 +998,7 @@ <ClCompile Include="..\..\soundlib\Load_dtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_etx.cpp" /> <ClCompile Include="..\..\soundlib\Load_far.cpp" /> + <ClCompile Include="..\..\soundlib\Load_fc.cpp" /> <ClCompile Include="..\..\soundlib\Load_fmt.cpp" /> <ClCompile Include="..\..\soundlib\Load_ftm.cpp" /> <ClCompile Include="..\..\soundlib\Load_gdm.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj.filters Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj.filters Thu Oct 31 21:15:14 2024 (r22040) @@ -1229,6 +1229,9 @@ <ClCompile Include="..\..\soundlib\Load_far.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_fc.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_fmt.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj Thu Oct 31 21:15:14 2024 (r22040) @@ -1040,6 +1040,7 @@ <ClCompile Include="..\..\soundlib\Load_dtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_etx.cpp" /> <ClCompile Include="..\..\soundlib\Load_far.cpp" /> + <ClCompile Include="..\..\soundlib\Load_fc.cpp" /> <ClCompile Include="..\..\soundlib\Load_fmt.cpp" /> <ClCompile Include="..\..\soundlib\Load_ftm.cpp" /> <ClCompile Include="..\..\soundlib\Load_gdm.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters Thu Oct 31 21:15:14 2024 (r22040) @@ -1283,6 +1283,9 @@ <ClCompile Include="..\..\soundlib\Load_far.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_fc.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_fmt.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj Thu Oct 31 21:15:14 2024 (r22040) @@ -1368,6 +1368,7 @@ <ClCompile Include="..\..\soundlib\Load_dtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_etx.cpp" /> <ClCompile Include="..\..\soundlib\Load_far.cpp" /> + <ClCompile Include="..\..\soundlib\Load_fc.cpp" /> <ClCompile Include="..\..\soundlib\Load_fmt.cpp" /> <ClCompile Include="..\..\soundlib\Load_ftm.cpp" /> <ClCompile Include="..\..\soundlib\Load_gdm.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters Thu Oct 31 21:15:14 2024 (r22040) @@ -2063,6 +2063,9 @@ <ClCompile Include="..\..\soundlib\Load_far.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_fc.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_fmt.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj Thu Oct 31 21:15:14 2024 (r22040) @@ -1368,6 +1368,7 @@ <ClCompile Include="..\..\soundlib\Load_dtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_etx.cpp" /> <ClCompile Include="..\..\soundlib\Load_far.cpp" /> + <ClCompile Include="..\..\soundlib\Load_fc.cpp" /> <ClCompile Include="..\..\soundlib\Load_fmt.cpp" /> <ClCompile Include="..\..\soundlib\Load_ftm.cpp" /> <ClCompile Include="..\..\soundlib\Load_gdm.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters Thu Oct 31 21:15:14 2024 (r22040) @@ -2063,6 +2063,9 @@ <ClCompile Include="..\..\soundlib\Load_far.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_fc.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_fmt.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj Thu Oct 31 21:15:14 2024 (r22040) @@ -1368,6 +1368,7 @@ <ClCompile Include="..\..\soundlib\Load_dtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_etx.cpp" /> <ClCompile Include="..\..\soundlib\Load_far.cpp" /> + <ClCompile Include="..\..\soundlib\Load_fc.cpp" /> <ClCompile Include="..\..\soundlib\Load_fmt.cpp" /> <ClCompile Include="..\..\soundlib\Load_ftm.cpp" /> <ClCompile Include="..\..\soundlib\Load_gdm.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters Thu Oct 31 21:15:14 2024 (r22040) @@ -2063,6 +2063,9 @@ <ClCompile Include="..\..\soundlib\Load_far.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_fc.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_fmt.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj Thu Oct 31 21:15:14 2024 (r22040) @@ -998,6 +998,7 @@ <ClCompile Include="..\..\soundlib\Load_dtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_etx.cpp" /> <ClCompile Include="..\..\soundlib\Load_far.cpp" /> + <ClCompile Include="..\..\soundlib\Load_fc.cpp" /> <ClCompile Include="..\..\soundlib\Load_fmt.cpp" /> <ClCompile Include="..\..\soundlib\Load_ftm.cpp" /> <ClCompile Include="..\..\soundlib\Load_gdm.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters Thu Oct 31 21:15:14 2024 (r22040) @@ -1229,6 +1229,9 @@ <ClCompile Include="..\..\soundlib\Load_far.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_fc.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_fmt.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj Thu Oct 31 21:15:14 2024 (r22040) @@ -998,6 +998,7 @@ <ClCompile Include="..\..\soundlib\Load_dtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_etx.cpp" /> <ClCompile Include="..\..\soundlib\Load_far.cpp" /> + <ClCompile Include="..\..\soundlib\Load_fc.cpp" /> <ClCompile Include="..\..\soundlib\Load_fmt.cpp" /> <ClCompile Include="..\..\soundlib\Load_ftm.cpp" /> <ClCompile Include="..\..\soundlib\Load_gdm.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj.filters Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj.filters Thu Oct 31 21:15:14 2024 (r22040) @@ -1229,6 +1229,9 @@ <ClCompile Include="..\..\soundlib\Load_far.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_fc.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_fmt.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj Thu Oct 31 21:15:14 2024 (r22040) @@ -1040,6 +1040,7 @@ <ClCompile Include="..\..\soundlib\Load_dtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_etx.cpp" /> <ClCompile Include="..\..\soundlib\Load_far.cpp" /> + <ClCompile Include="..\..\soundlib\Load_fc.cpp" /> <ClCompile Include="..\..\soundlib\Load_fmt.cpp" /> <ClCompile Include="..\..\soundlib\Load_ftm.cpp" /> <ClCompile Include="..\..\soundlib\Load_gdm.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters Thu Oct 31 21:15:14 2024 (r22040) @@ -1283,6 +1283,9 @@ <ClCompile Include="..\..\soundlib\Load_far.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_fc.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_fmt.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj Thu Oct 31 21:15:14 2024 (r22040) @@ -1387,6 +1387,7 @@ <ClCompile Include="..\..\soundlib\Load_dtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_etx.cpp" /> <ClCompile Include="..\..\soundlib\Load_far.cpp" /> + <ClCompile Include="..\..\soundlib\Load_fc.cpp" /> <ClCompile Include="..\..\soundlib\Load_fmt.cpp" /> <ClCompile Include="..\..\soundlib\Load_ftm.cpp" /> <ClCompile Include="..\..\soundlib\Load_gdm.cpp" /> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters Thu Oct 31 21:15:14 2024 (r22040) @@ -2105,6 +2105,9 @@ <ClCompile Include="..\..\soundlib\Load_far.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_fc.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_fmt.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj Thu Oct 31 21:15:14 2024 (r22040) @@ -1387,6 +1387,7 @@ <ClCompile Include="..\..\soundlib\Load_dtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_etx.cpp" /> <ClCompile Include="..\..\soundlib\Load_far.cpp" /> + <ClCompile Include="..\..\soundlib\Load_fc.cpp" /> <ClCompile Include="..\..\soundlib\Load_fmt.cpp" /> <ClCompile Include="..\..\soundlib\Load_ftm.cpp" /> <ClCompile Include="..\..\soundlib\Load_gdm.cpp" /> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters Thu Oct 31 21:15:14 2024 (r22040) @@ -2105,6 +2105,9 @@ <ClCompile Include="..\..\soundlib\Load_far.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_fc.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_fmt.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj Thu Oct 31 21:15:14 2024 (r22040) @@ -1387,6 +1387,7 @@ <ClCompile Include="..\..\soundlib\Load_dtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_etx.cpp" /> <ClCompile Include="..\..\soundlib\Load_far.cpp" /> + <ClCompile Include="..\..\soundlib\Load_fc.cpp" /> <ClCompile Include="..\..\soundlib\Load_fmt.cpp" /> <ClCompile Include="..\..\soundlib\Load_ftm.cpp" /> <ClCompile Include="..\..\soundlib\Load_gdm.cpp" /> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj.filters Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj.filters Thu Oct 31 21:15:14 2024 (r22040) @@ -2105,6 +2105,9 @@ <ClCompile Include="..\..\soundlib\Load_far.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_fc.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_fmt.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj Thu Oct 31 21:15:14 2024 (r22040) @@ -995,6 +995,7 @@ <ClCompile Include="..\..\soundlib\Load_dtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_etx.cpp" /> <ClCompile Include="..\..\soundlib\Load_far.cpp" /> + <ClCompile Include="..\..\soundlib\Load_fc.cpp" /> <ClCompile Include="..\..\soundlib\Load_fmt.cpp" /> <ClCompile Include="..\..\soundlib\Load_ftm.cpp" /> <ClCompile Include="..\..\soundlib\Load_gdm.cpp" /> Modified: trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj.filters Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj.filters Thu Oct 31 21:15:14 2024 (r22040) @@ -1229,6 +1229,9 @@ <ClCompile Include="..\..\soundlib\Load_far.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_fc.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_fmt.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj Thu Oct 31 21:15:14 2024 (r22040) @@ -995,6 +995,7 @@ <ClCompile Include="..\..\soundlib\Load_dtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_etx.cpp" /> <ClCompile Include="..\..\soundlib\Load_far.cpp" /> + <ClCompile Include="..\..\soundlib\Load_fc.cpp" /> <ClCompile Include="..\..\soundlib\Load_fmt.cpp" /> <ClCompile Include="..\..\soundlib\Load_ftm.cpp" /> <ClCompile Include="..\..\soundlib\Load_gdm.cpp" /> Modified: trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj.filters Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj.filters Thu Oct 31 21:15:14 2024 (r22040) @@ -1229,6 +1229,9 @@ <ClCompile Include="..\..\soundlib\Load_far.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_fc.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_fmt.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj Thu Oct 31 21:15:14 2024 (r22040) @@ -1037,6 +1037,7 @@ <ClCompile Include="..\..\soundlib\Load_dtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_etx.cpp" /> <ClCompile Include="..\..\soundlib\Load_far.cpp" /> + <ClCompile Include="..\..\soundlib\Load_fc.cpp" /> <ClCompile Include="..\..\soundlib\Load_fmt.cpp" /> <ClCompile Include="..\..\soundlib\Load_ftm.cpp" /> <ClCompile Include="..\..\soundlib\Load_gdm.cpp" /> Modified: trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj.filters Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj.filters Thu Oct 31 21:15:14 2024 (r22040) @@ -1289,6 +1289,9 @@ <ClCompile Include="..\..\soundlib\Load_far.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_fc.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_fmt.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj Thu Oct 31 21:15:14 2024 (r22040) @@ -2589,6 +2589,7 @@ <ClCompile Include="..\..\soundlib\Load_dtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_etx.cpp" /> <ClCompile Include="..\..\soundlib\Load_far.cpp" /> + <ClCompile Include="..\..\soundlib\Load_fc.cpp" /> <ClCompile Include="..\..\soundlib\Load_fmt.cpp" /> <ClCompile Include="..\..\soundlib\Load_ftm.cpp" /> <ClCompile Include="..\..\soundlib\Load_gdm.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj.filters Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj.filters Thu Oct 31 21:15:14 2024 (r22040) @@ -2105,6 +2105,9 @@ <ClCompile Include="..\..\soundlib\Load_far.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_fc.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_fmt.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj Thu Oct 31 21:15:14 2024 (r22040) @@ -2589,6 +2589,7 @@ <ClCompile Include="..\..\soundlib\Load_dtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_etx.cpp" /> <ClCompile Include="..\..\soundlib\Load_far.cpp" /> + <ClCompile Include="..\..\soundlib\Load_fc.cpp" /> <ClCompile Include="..\..\soundlib\Load_fmt.cpp" /> <ClCompile Include="..\..\soundlib\Load_ftm.cpp" /> <ClCompile Include="..\..\soundlib\Load_gdm.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj.filters Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj.filters Thu Oct 31 21:15:14 2024 (r22040) @@ -2105,6 +2105,9 @@ <ClCompile Include="..\..\soundlib\Load_far.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_fc.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_fmt.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj Thu Oct 31 21:15:14 2024 (r22040) @@ -2589,6 +2589,7 @@ <ClCompile Include="..\..\soundlib\Load_dtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_etx.cpp" /> <ClCompile Include="..\..\soundlib\Load_far.cpp" /> + <ClCompile Include="..\..\soundlib\Load_fc.cpp" /> <ClCompile Include="..\..\soundlib\Load_fmt.cpp" /> <ClCompile Include="..\..\soundlib\Load_ftm.cpp" /> <ClCompile Include="..\..\soundlib\Load_gdm.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj.filters Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj.filters Thu Oct 31 21:15:14 2024 (r22040) @@ -2105,6 +2105,9 @@ <ClCompile Include="..\..\soundlib\Load_far.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_fc.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_fmt.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj Thu Oct 31 21:15:14 2024 (r22040) @@ -2008,6 +2008,7 @@ <ClCompile Include="..\..\soundlib\Load_dtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_etx.cpp" /> <ClCompile Include="..\..\soundlib\Load_far.cpp" /> + <ClCompile Include="..\..\soundlib\Load_fc.cpp" /> <ClCompile Include="..\..\soundlib\Load_fmt.cpp" /> <ClCompile Include="..\..\soundlib\Load_ftm.cpp" /> <ClCompile Include="..\..\soundlib\Load_gdm.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj.filters Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj.filters Thu Oct 31 21:15:14 2024 (r22040) @@ -1229,6 +1229,9 @@ <ClCompile Include="..\..\soundlib\Load_far.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_fc.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_fmt.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10/libopenmpt.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10/libopenmpt.vcxproj Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2022win10/libopenmpt.vcxproj Thu Oct 31 21:15:14 2024 (r22040) @@ -2008,6 +2008,7 @@ <ClCompile Include="..\..\soundlib\Load_dtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_etx.cpp" /> <ClCompile Include="..\..\soundlib\Load_far.cpp" /> + <ClCompile Include="..\..\soundlib\Load_fc.cpp" /> <ClCompile Include="..\..\soundlib\Load_fmt.cpp" /> <ClCompile Include="..\..\soundlib\Load_ftm.cpp" /> <ClCompile Include="..\..\soundlib\Load_gdm.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10/libopenmpt.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10/libopenmpt.vcxproj.filters Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2022win10/libopenmpt.vcxproj.filters Thu Oct 31 21:15:14 2024 (r22040) @@ -1229,6 +1229,9 @@ <ClCompile Include="..\..\soundlib\Load_far.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_fc.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_fmt.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj Thu Oct 31 21:15:14 2024 (r22040) @@ -2095,6 +2095,7 @@ <ClCompile Include="..\..\soundlib\Load_dtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_etx.cpp" /> <ClCompile Include="..\..\soundlib\Load_far.cpp" /> + <ClCompile Include="..\..\soundlib\Load_fc.cpp" /> <ClCompile Include="..\..\soundlib\Load_fmt.cpp" /> <ClCompile Include="..\..\soundlib\Load_ftm.cpp" /> <ClCompile Include="..\..\soundlib\Load_gdm.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj.filters Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj.filters Thu Oct 31 21:15:14 2024 (r22040) @@ -1289,6 +1289,9 @@ <ClCompile Include="..\..\soundlib\Load_far.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_fc.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_fmt.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj Thu Oct 31 21:15:14 2024 (r22040) @@ -2157,6 +2157,7 @@ <ClCompile Include="..\..\soundlib\Load_dtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_etx.cpp" /> <ClCompile Include="..\..\soundlib\Load_far.cpp" /> + <ClCompile Include="..\..\soundlib\Load_fc.cpp" /> <ClCompile Include="..\..\soundlib\Load_fmt.cpp" /> <ClCompile Include="..\..\soundlib\Load_ftm.cpp" /> <ClCompile Include="..\..\soundlib\Load_gdm.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj.filters Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj.filters Thu Oct 31 21:15:14 2024 (r22040) @@ -2063,6 +2063,9 @@ <ClCompile Include="..\..\soundlib\Load_far.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_fc.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_fmt.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj Thu Oct 31 21:15:14 2024 (r22040) @@ -2157,6 +2157,7 @@ <ClCompile Include="..\..\soundlib\Load_dtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_etx.cpp" /> <ClCompile Include="..\..\soundlib\Load_far.cpp" /> + <ClCompile Include="..\..\soundlib\Load_fc.cpp" /> <ClCompile Include="..\..\soundlib\Load_fmt.cpp" /> <ClCompile Include="..\..\soundlib\Load_ftm.cpp" /> <ClCompile Include="..\..\soundlib\Load_gdm.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj.filters Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj.filters Thu Oct 31 21:15:14 2024 (r22040) @@ -2063,6 +2063,9 @@ <ClCompile Include="..\..\soundlib\Load_far.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_fc.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_fmt.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj Thu Oct 31 21:15:14 2024 (r22040) @@ -2157,6 +2157,7 @@ <ClCompile Include="..\..\soundlib\Load_dtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_etx.cpp" /> <ClCompile Include="..\..\soundlib\Load_far.cpp" /> + <ClCompile Include="..\..\soundlib\Load_fc.cpp" /> <ClCompile Include="..\..\soundlib\Load_fmt.cpp" /> <ClCompile Include="..\..\soundlib\Load_ftm.cpp" /> <ClCompile Include="..\..\soundlib\Load_gdm.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj.filters Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj.filters Thu Oct 31 21:15:14 2024 (r22040) @@ -2063,6 +2063,9 @@ <ClCompile Include="..\..\soundlib\Load_far.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_fc.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_fmt.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10clang/libopenmpt-small.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/libopenmpt-small.vcxproj Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2022win10clang/libopenmpt-small.vcxproj Thu Oct 31 21:15:14 2024 (r22040) @@ -1601,6 +1601,7 @@ <ClCompile Include="..\..\soundlib\Load_dtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_etx.cpp" /> <ClCompile Include="..\..\soundlib\Load_far.cpp" /> + <ClCompile Include="..\..\soundlib\Load_fc.cpp" /> <ClCompile Include="..\..\soundlib\Load_fmt.cpp" /> <ClCompile Include="..\..\soundlib\Load_ftm.cpp" /> <ClCompile Include="..\..\soundlib\Load_gdm.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10clang/libopenmpt-small.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/libopenmpt-small.vcxproj.filters Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2022win10clang/libopenmpt-small.vcxproj.filters Thu Oct 31 21:15:14 2024 (r22040) @@ -1229,6 +1229,9 @@ <ClCompile Include="..\..\soundlib\Load_far.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_fc.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_fmt.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10clang/libopenmpt.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/libopenmpt.vcxproj Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2022win10clang/libopenmpt.vcxproj Thu Oct 31 21:15:14 2024 (r22040) @@ -1601,6 +1601,7 @@ <ClCompile Include="..\..\soundlib\Load_dtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_etx.cpp" /> <ClCompile Include="..\..\soundlib\Load_far.cpp" /> + <ClCompile Include="..\..\soundlib\Load_fc.cpp" /> <ClCompile Include="..\..\soundlib\Load_fmt.cpp" /> <ClCompile Include="..\..\soundlib\Load_ftm.cpp" /> <ClCompile Include="..\..\soundlib\Load_gdm.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10clang/libopenmpt.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/libopenmpt.vcxproj.filters Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2022win10clang/libopenmpt.vcxproj.filters Thu Oct 31 21:15:14 2024 (r22040) @@ -1229,6 +1229,9 @@ <ClCompile Include="..\..\soundlib\Load_far.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_fc.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_fmt.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10clang/libopenmpt_test.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/libopenmpt_test.vcxproj Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2022win10clang/libopenmpt_test.vcxproj Thu Oct 31 21:15:14 2024 (r22040) @@ -1673,6 +1673,7 @@ <ClCompile Include="..\..\soundlib\Load_dtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_etx.cpp" /> <ClCompile Include="..\..\soundlib\Load_far.cpp" /> + <ClCompile Include="..\..\soundlib\Load_fc.cpp" /> <ClCompile Include="..\..\soundlib\Load_fmt.cpp" /> <ClCompile Include="..\..\soundlib\Load_ftm.cpp" /> <ClCompile Include="..\..\soundlib\Load_gdm.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10clang/libopenmpt_test.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/libopenmpt_test.vcxproj.filters Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2022win10clang/libopenmpt_test.vcxproj.filters Thu Oct 31 21:15:14 2024 (r22040) @@ -1289,6 +1289,9 @@ <ClCompile Include="..\..\soundlib\Load_far.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_fc.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_fmt.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10uwp/libopenmpt-small.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10uwp/libopenmpt-small.vcxproj Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2022win10uwp/libopenmpt-small.vcxproj Thu Oct 31 21:15:14 2024 (r22040) @@ -1695,6 +1695,7 @@ <ClCompile Include="..\..\soundlib\Load_dtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_etx.cpp" /> <ClCompile Include="..\..\soundlib\Load_far.cpp" /> + <ClCompile Include="..\..\soundlib\Load_fc.cpp" /> <ClCompile Include="..\..\soundlib\Load_fmt.cpp" /> <ClCompile Include="..\..\soundlib\Load_ftm.cpp" /> <ClCompile Include="..\..\soundlib\Load_gdm.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10uwp/libopenmpt-small.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10uwp/libopenmpt-small.vcxproj.filters Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2022win10uwp/libopenmpt-small.vcxproj.filters Thu Oct 31 21:15:14 2024 (r22040) @@ -1229,6 +1229,9 @@ <ClCompile Include="..\..\soundlib\Load_far.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_fc.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_fmt.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10uwp/libopenmpt.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10uwp/libopenmpt.vcxproj Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2022win10uwp/libopenmpt.vcxproj Thu Oct 31 21:15:14 2024 (r22040) @@ -1695,6 +1695,7 @@ <ClCompile Include="..\..\soundlib\Load_dtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_etx.cpp" /> <ClCompile Include="..\..\soundlib\Load_far.cpp" /> + <ClCompile Include="..\..\soundlib\Load_fc.cpp" /> <ClCompile Include="..\..\soundlib\Load_fmt.cpp" /> <ClCompile Include="..\..\soundlib\Load_ftm.cpp" /> <ClCompile Include="..\..\soundlib\Load_gdm.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10uwp/libopenmpt.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10uwp/libopenmpt.vcxproj.filters Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2022win10uwp/libopenmpt.vcxproj.filters Thu Oct 31 21:15:14 2024 (r22040) @@ -1229,6 +1229,9 @@ <ClCompile Include="..\..\soundlib\Load_far.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_fc.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_fmt.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj Thu Oct 31 21:15:14 2024 (r22040) @@ -1407,6 +1407,7 @@ <ClCompile Include="..\..\soundlib\Load_dtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_etx.cpp" /> <ClCompile Include="..\..\soundlib\Load_far.cpp" /> + <ClCompile Include="..\..\soundlib\Load_fc.cpp" /> <ClCompile Include="..\..\soundlib\Load_fmt.cpp" /> <ClCompile Include="..\..\soundlib\Load_ftm.cpp" /> <ClCompile Include="..\..\soundlib\Load_gdm.cpp" /> Modified: trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj.filters Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj.filters Thu Oct 31 21:15:14 2024 (r22040) @@ -2105,6 +2105,9 @@ <ClCompile Include="..\..\soundlib\Load_far.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_fc.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_fmt.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win7/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win7/OpenMPT-UTF8.vcxproj Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2022win7/OpenMPT-UTF8.vcxproj Thu Oct 31 21:15:14 2024 (r22040) @@ -1407,6 +1407,7 @@ <ClCompile Include="..\..\soundlib\Load_dtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_etx.cpp" /> <ClCompile Include="..\..\soundlib\Load_far.cpp" /> + <ClCompile Include="..\..\soundlib\Load_fc.cpp" /> <ClCompile Include="..\..\soundlib\Load_fmt.cpp" /> <ClCompile Include="..\..\soundlib\Load_ftm.cpp" /> <ClCompile Include="..\..\soundlib\Load_gdm.cpp" /> Modified: trunk/OpenMPT/build/vs2022win7/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win7/OpenMPT-UTF8.vcxproj.filters Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2022win7/OpenMPT-UTF8.vcxproj.filters Thu Oct 31 21:15:14 2024 (r22040) @@ -2105,6 +2105,9 @@ <ClCompile Include="..\..\soundlib\Load_far.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_fc.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_fmt.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win7/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win7/OpenMPT.vcxproj Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2022win7/OpenMPT.vcxproj Thu Oct 31 21:15:14 2024 (r22040) @@ -1407,6 +1407,7 @@ <ClCompile Include="..\..\soundlib\Load_dtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_etx.cpp" /> <ClCompile Include="..\..\soundlib\Load_far.cpp" /> + <ClCompile Include="..\..\soundlib\Load_fc.cpp" /> <ClCompile Include="..\..\soundlib\Load_fmt.cpp" /> <ClCompile Include="..\..\soundlib\Load_ftm.cpp" /> <ClCompile Include="..\..\soundlib\Load_gdm.cpp" /> Modified: trunk/OpenMPT/build/vs2022win7/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win7/OpenMPT.vcxproj.filters Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2022win7/OpenMPT.vcxproj.filters Thu Oct 31 21:15:14 2024 (r22040) @@ -2105,6 +2105,9 @@ <ClCompile Include="..\..\soundlib\Load_far.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_fc.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_fmt.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win7/libopenmpt-small.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win7/libopenmpt-small.vcxproj Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2022win7/libopenmpt-small.vcxproj Thu Oct 31 21:15:14 2024 (r22040) @@ -1015,6 +1015,7 @@ <ClCompile Include="..\..\soundlib\Load_dtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_etx.cpp" /> <ClCompile Include="..\..\soundlib\Load_far.cpp" /> + <ClCompile Include="..\..\soundlib\Load_fc.cpp" /> <ClCompile Include="..\..\soundlib\Load_fmt.cpp" /> <ClCompile Include="..\..\soundlib\Load_ftm.cpp" /> <ClCompile Include="..\..\soundlib\Load_gdm.cpp" /> Modified: trunk/OpenMPT/build/vs2022win7/libopenmpt-small.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win7/libopenmpt-small.vcxproj.filters Thu Oct 31 15:20:03 2024 (r22039) +++ trunk/OpenMPT/build/vs2022win7/libopenmpt-small.vcxproj.filters Thu Oct 31 21:15:14 2024 (r22040) @@ -1229,6 +1229,9 @@ <ClCompile Include="..\..\soundlib\Load_far.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_fc.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_fmt.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win7/libopenmpt.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win7/libopenm... [truncated message content] |
|
From: <sv...@op...> - 2024-10-31 14:20:15
|
Author: manx Date: Thu Oct 31 15:20:03 2024 New Revision: 22039 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22039 Log: [Imp] openmpt123: Use setmode() on DOS. Modified: trunk/OpenMPT/openmpt123/openmpt123_stdio.hpp Modified: trunk/OpenMPT/openmpt123/openmpt123_stdio.hpp ============================================================================== --- trunk/OpenMPT/openmpt123/openmpt123_stdio.hpp Thu Oct 31 15:05:43 2024 (r22038) +++ trunk/OpenMPT/openmpt123/openmpt123_stdio.hpp Thu Oct 31 15:20:03 2024 (r22039) @@ -20,7 +20,10 @@ #include <cstdio> -#if MPT_OS_WINDOWS +#if MPT_OS_DJGPP +#include <fcntl.h> +#include <io.h> +#elif MPT_OS_WINDOWS #include <fcntl.h> #include <io.h> #endif @@ -33,7 +36,47 @@ binary, }; -#if MPT_OS_WINDOWS +#if MPT_OS_DJGPP + +class FILE_mode_guard { +private: + FILE * file; + int old_mode; +public: + FILE_mode_guard( FILE * file, FILE_mode new_mode ) + : file(file) + , old_mode(-1) + { + switch (new_mode) { + case FILE_mode::text: + fflush( file ); + old_mode = setmode( fileno( file ), O_TEXT ); + if ( old_mode == -1 ) { + throw exception( MPT_USTRING("failed to set TEXT mode on file descriptor") ); + } + break; + case FILE_mode::binary: + fflush( file ); + old_mode = setmode( fileno( file ), O_BINARY ); + if ( old_mode == -1 ) { + throw exception( MPT_USTRING("failed to set binary mode on file descriptor") ); + } + break; + } + } + FILE_mode_guard( const FILE_mode_guard & ) = delete; + FILE_mode_guard( FILE_mode_guard && ) = default; + FILE_mode_guard & operator=( const FILE_mode_guard & ) = delete; + FILE_mode_guard & operator=( FILE_mode_guard && ) = default; + ~FILE_mode_guard() { + if ( old_mode != -1 ) { + fflush( file ); + old_mode = setmode( fileno( file ), old_mode ); + } + } +}; + +#elif MPT_OS_WINDOWS class FILE_mode_guard { private: |
|
From: <sv...@op...> - 2024-10-31 14:05:59
|
Author: manx Date: Thu Oct 31 15:05:43 2024 New Revision: 22038 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22038 Log: [Ref] openmpt123: Tiny cleanup in terminal handling. Modified: trunk/OpenMPT/openmpt123/openmpt123_terminal.hpp Modified: trunk/OpenMPT/openmpt123/openmpt123_terminal.hpp ============================================================================== --- trunk/OpenMPT/openmpt123/openmpt123_terminal.hpp Thu Oct 31 12:40:11 2024 (r22037) +++ trunk/OpenMPT/openmpt123/openmpt123_terminal.hpp Thu Oct 31 15:05:43 2024 (r22038) @@ -97,16 +97,28 @@ }; +#if MPT_OS_WINDOWS +inline std::optional<DWORD> StdHandleFromFd( int fd ) { + std::optional<DWORD> stdHandle; + if ( fd == _fileno( stdin ) ) { + stdHandle = STD_INPUT_HANDLE; + } else if ( fd == _fileno( stdout ) ) { + stdHandle = STD_OUTPUT_HANDLE; + } else if ( fd == _fileno( stderr ) ) { + stdHandle = STD_ERROR_HANDLE; + } + return stdHandle; +} +#endif + #if MPT_OS_WINDOWS && !MPT_WINRT_BEFORE(MPT_WIN_10) inline bool IsConsole( DWORD stdHandle ) { HANDLE hStd = GetStdHandle( stdHandle ); - if ( ( hStd != NULL ) && ( hStd != INVALID_HANDLE_VALUE ) ) { - DWORD mode = 0; - if ( GetConsoleMode( hStd, &mode ) != FALSE ) { - return true; - } + if ( ( hStd == NULL ) || ( hStd == INVALID_HANDLE_VALUE ) ) { + return false; } - return false; + DWORD mode = 0; + return GetConsoleMode( hStd, &mode ) != FALSE; } #endif // MPT_OS_WINDOWS && !MPT_WINRT_BEFORE(MPT_WIN_10) @@ -115,15 +127,11 @@ if ( !_isatty( fd ) ) { return false; } - DWORD stdHandle = 0; - if ( fd == 0 ) { - stdHandle = STD_INPUT_HANDLE; - } else if ( fd == 1 ) { - stdHandle = STD_OUTPUT_HANDLE; - } else if ( fd == 2 ) { - stdHandle = STD_ERROR_HANDLE; + std::optional<DWORD> stdHandle = StdHandleFromFd( fd ); + if ( !stdHandle ) { + return false; } - return IsConsole( stdHandle ); + return IsConsole( *stdHandle ); #else return isatty( fd ) ? true : false; #endif |
|
From: <sv...@op...> - 2024-10-31 11:40:23
|
Author: manx Date: Thu Oct 31 12:40:11 2024 New Revision: 22037 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22037 Log: [Var] Run clang-format. Modified: trunk/OpenMPT/src/mpt/base/detect_libc.hpp Modified: trunk/OpenMPT/src/mpt/base/detect_libc.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/base/detect_libc.hpp Thu Oct 31 11:43:37 2024 (r22036) +++ trunk/OpenMPT/src/mpt/base/detect_libc.hpp Thu Oct 31 12:40:11 2024 (r22037) @@ -27,10 +27,10 @@ #elif (defined(__GLIBC__) || defined(__GNU_LIBRARY__)) #define MPT_LIBC_GLIBC 1 #elif defined(_UCRT) -#define MPT_LIBC_MS 1 +#define MPT_LIBC_MS 1 #define MPT_LIBC_MS_UCRT 1 #elif MPT_COMPILER_MSVC -#define MPT_LIBC_MS 1 +#define MPT_LIBC_MS 1 #define MPT_LIBC_MS_MSVCRT 1 #elif MPT_COMPILER_CLANG && MPT_OS_WINDOWS #define MPT_LIBC_MS 1 |
|
From: <sv...@op...> - 2024-10-31 10:43:51
|
Author: manx Date: Thu Oct 31 11:43:37 2024 New Revision: 22036 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22036 Log: [Imp] mpt/base/detect_libc.hpp: Detect different generations of Microsoft's C library. Modified: trunk/OpenMPT/src/mpt/base/detect_libc.hpp trunk/OpenMPT/src/mpt/base/namespace.hpp Modified: trunk/OpenMPT/src/mpt/base/detect_libc.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/base/detect_libc.hpp Tue Oct 29 11:47:25 2024 (r22035) +++ trunk/OpenMPT/src/mpt/base/detect_libc.hpp Thu Oct 31 11:43:37 2024 (r22036) @@ -17,12 +17,21 @@ #define MPT_LIBC_GENERIC 1 #elif (defined(__MINGW32__) || defined(__MINGW64__)) #define MPT_LIBC_MINGW 1 +#if defined(_UCRT) +#define MPT_LIBC_MINGW_UCRT 1 +#elif defined(__MSVCRT__) +#define MPT_LIBC_MINGW_MSVCRT 1 +#elif defined(__CRTDLL__) +#define MPT_LIBC_MINGW_CRTDLL 1 +#endif #elif (defined(__GLIBC__) || defined(__GNU_LIBRARY__)) #define MPT_LIBC_GLIBC 1 #elif defined(_UCRT) #define MPT_LIBC_MS 1 +#define MPT_LIBC_MS_UCRT 1 #elif MPT_COMPILER_MSVC #define MPT_LIBC_MS 1 +#define MPT_LIBC_MS_MSVCRT 1 #elif MPT_COMPILER_CLANG && MPT_OS_WINDOWS #define MPT_LIBC_MS 1 #elif defined(__BIONIC__) @@ -44,9 +53,24 @@ #ifndef MPT_LIBC_MINGW #define MPT_LIBC_MINGW 0 #endif +#ifndef MPT_LIBC_MINGW_UCRT +#define MPT_LIBC_MINGW_UCRT 0 +#endif +#ifndef MPT_LIBC_MINGW_MSVCRT +#define MPT_LIBC_MINGW_MSVCRT 0 +#endif +#ifndef MPT_LIBC_MINGW_CRTDLL +#define MPT_LIBC_MINGW_CRTDLL 0 +#endif #ifndef MPT_LIBC_MS #define MPT_LIBC_MS 0 #endif +#ifndef MPT_LIBC_MS_UCRT +#define MPT_LIBC_MS_UCRT 0 +#endif +#ifndef MPT_LIBC_MS_MSVCRT +#define MPT_LIBC_MS_MSVCRT 0 +#endif #ifndef MPT_LIBC_BIONIC #define MPT_LIBC_BIONIC 0 #endif Modified: trunk/OpenMPT/src/mpt/base/namespace.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/base/namespace.hpp Tue Oct 29 11:47:25 2024 (r22035) +++ trunk/OpenMPT/src/mpt/base/namespace.hpp Thu Oct 31 11:43:37 2024 (r22036) @@ -31,6 +31,47 @@ #if MPT_LIBC_GENERIC #define MPT_VERSION_ABI_LIBC _ #elif MPT_LIBC_MS +#if MPT_LIBC_MS_UCRT +#if MPT_LIBC_MS_SHARED +#ifdef MPT_LIBC_MS_DEBUG +#define MPT_VERSION_ABI_LIBC UMDd +#else +#define MPT_VERSION_ABI_LIBC UMDr +#endif +#elif MPT_LIBC_MS_STATIC +#ifdef MPT_LIBC_MS_DEBUG +#define MPT_VERSION_ABI_LIBC UMTd +#else +#define MPT_VERSION_ABI_LIBC UMTr +#endif +#else +#ifdef MPT_LIBC_MS_DEBUG +#define MPT_VERSION_ABI_LIBC UMd +#else +#define MPT_VERSION_ABI_LIBC UMr +#endif +#endif +#elif MPT_LIBC_MS_MSVCRT +#if MPT_LIBC_MS_SHARED +#ifdef MPT_LIBC_MS_DEBUG +#define MPT_VERSION_ABI_LIBC MMDd +#else +#define MPT_VERSION_ABI_LIBC MMDr +#endif +#elif MPT_LIBC_MS_STATIC +#ifdef MPT_LIBC_MS_DEBUG +#define MPT_VERSION_ABI_LIBC MMTd +#else +#define MPT_VERSION_ABI_LIBC MMTr +#endif +#else +#ifdef MPT_LIBC_MS_DEBUG +#define MPT_VERSION_ABI_LIBC MMd +#else +#define MPT_VERSION_ABI_LIBC MMr +#endif +#endif +#else #if MPT_LIBC_MS_SHARED #ifdef MPT_LIBC_MS_DEBUG #define MPT_VERSION_ABI_LIBC MDd @@ -50,10 +91,19 @@ #define MPT_VERSION_ABI_LIBC Mr #endif #endif +#endif #elif MPT_LIBC_GLIBC #define MPT_VERSION_ABI_LIBC G #elif MPT_LIBC_MINGW +#if MPT_LIBC_MINGW_UCRT +#define MPT_VERSION_ABI_LIBC MWU +#elif MPT_LIBC_MINGW_MSVCRT +#define MPT_VERSION_ABI_LIBC MWM +#elif MPT_LIBC_MINGW_CRTDLL +#define MPT_VERSION_ABI_LIBC MWC +#else #define MPT_VERSION_ABI_LIBC MW +#endif #elif MPT_LIBC_BIONIC #define MPT_VERSION_ABI_LIBC B #elif MPT_LIBC_APPLE |
|
From: <sv...@op...> - 2024-10-29 10:47:31
|
Author: manx Date: Tue Oct 29 11:47:25 2024 New Revision: 22035 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22035 Log: Merged revision(s) 22031 from trunk/OpenMPT: [Fix] mpg123: Silence MSVC static analyzer warning. ........ Modified: branches/OpenMPT-1.28/ (props changed) branches/OpenMPT-1.28/include/mpg123/OpenMPT.txt branches/OpenMPT-1.28/include/mpg123/src/compat/compat.c Modified: branches/OpenMPT-1.28/include/mpg123/OpenMPT.txt ============================================================================== --- branches/OpenMPT-1.28/include/mpg123/OpenMPT.txt Tue Oct 29 11:47:02 2024 (r22034) +++ branches/OpenMPT-1.28/include/mpg123/OpenMPT.txt Tue Oct 29 11:47:25 2024 (r22035) @@ -6,6 +6,8 @@ `OPT_*`. * `ports/Xcode/config.h` has been modified to `#define HAVE_DIRENT_H`. * `src/compat/compat.c` has been modified for DJGPP compatibility. + * `src/compat/compat.c` has been modified to silence MSVC static analyzer + warnings. * Modifications are marked by `// OpenMPT` or `/* OpenMPT */`. * Obviously, unnecessary folders and files have been removed. * For building, premake is used to generate Visual Studio project files. Modified: branches/OpenMPT-1.28/include/mpg123/src/compat/compat.c ============================================================================== --- branches/OpenMPT-1.28/include/mpg123/src/compat/compat.c Tue Oct 29 11:47:02 2024 (r22034) +++ branches/OpenMPT-1.28/include/mpg123/src/compat/compat.c Tue Oct 29 11:47:25 2024 (r22035) @@ -164,8 +164,10 @@ void INT123_compat_binmode(int fd, int enable) { #if defined(HAVE__SETMODE) + (void) /* OpenMPT */ _setmode(fd, enable ? _O_BINARY : _O_TEXT); #elif defined(HAVE_SETMODE) + (void) /* OpenMPT */ setmode(fd, enable ? O_BINARY : O_TEXT); #endif } |
|
From: <sv...@op...> - 2024-10-29 10:47:09
|
Author: manx Date: Tue Oct 29 11:47:02 2024 New Revision: 22034 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22034 Log: Merged revision(s) 22031 from trunk/OpenMPT: [Fix] mpg123: Silence MSVC static analyzer warning. ........ Modified: branches/OpenMPT-1.29/ (props changed) branches/OpenMPT-1.29/include/mpg123/OpenMPT.txt branches/OpenMPT-1.29/include/mpg123/src/compat/compat.c Modified: branches/OpenMPT-1.29/include/mpg123/OpenMPT.txt ============================================================================== --- branches/OpenMPT-1.29/include/mpg123/OpenMPT.txt Tue Oct 29 11:46:33 2024 (r22033) +++ branches/OpenMPT-1.29/include/mpg123/OpenMPT.txt Tue Oct 29 11:47:02 2024 (r22034) @@ -7,6 +7,8 @@ `OPT_*`. * `ports/Xcode/config.h` has been modified to `#define HAVE_DIRENT_H`. * `src/compat/compat.c` has been modified for DJGPP compatibility. + * `src/compat/compat.c` has been modified to silence MSVC static analyzer + warnings. * Modifications are marked by `// OpenMPT` or `/* OpenMPT */`. * Obviously, unnecessary folders and files have been removed. * For building, premake is used to generate Visual Studio project files. Modified: branches/OpenMPT-1.29/include/mpg123/src/compat/compat.c ============================================================================== --- branches/OpenMPT-1.29/include/mpg123/src/compat/compat.c Tue Oct 29 11:46:33 2024 (r22033) +++ branches/OpenMPT-1.29/include/mpg123/src/compat/compat.c Tue Oct 29 11:47:02 2024 (r22034) @@ -164,8 +164,10 @@ void INT123_compat_binmode(int fd, int enable) { #if defined(HAVE__SETMODE) + (void) /* OpenMPT */ _setmode(fd, enable ? _O_BINARY : _O_TEXT); #elif defined(HAVE_SETMODE) + (void) /* OpenMPT */ setmode(fd, enable ? O_BINARY : O_TEXT); #endif } |
|
From: <sv...@op...> - 2024-10-29 10:46:40
|
Author: manx Date: Tue Oct 29 11:46:33 2024 New Revision: 22033 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22033 Log: Merged revision(s) 22031 from trunk/OpenMPT: [Fix] mpg123: Silence MSVC static analyzer warning. ........ Modified: branches/OpenMPT-1.30/ (props changed) branches/OpenMPT-1.30/include/mpg123/OpenMPT.txt branches/OpenMPT-1.30/include/mpg123/src/compat/compat.c Modified: branches/OpenMPT-1.30/include/mpg123/OpenMPT.txt ============================================================================== --- branches/OpenMPT-1.30/include/mpg123/OpenMPT.txt Tue Oct 29 11:46:08 2024 (r22032) +++ branches/OpenMPT-1.30/include/mpg123/OpenMPT.txt Tue Oct 29 11:46:33 2024 (r22033) @@ -7,6 +7,8 @@ `OPT_*`. * `ports/Xcode/config.h` has been modified to `#define HAVE_DIRENT_H`. * `src/compat/compat.c` has been modified for DJGPP compatibility. + * `src/compat/compat.c` has been modified to silence MSVC static analyzer + warnings. * Modifications are marked by `// OpenMPT` or `/* OpenMPT */`. * Obviously, unnecessary folders and files have been removed. * For building, premake is used to generate Visual Studio project files. Modified: branches/OpenMPT-1.30/include/mpg123/src/compat/compat.c ============================================================================== --- branches/OpenMPT-1.30/include/mpg123/src/compat/compat.c Tue Oct 29 11:46:08 2024 (r22032) +++ branches/OpenMPT-1.30/include/mpg123/src/compat/compat.c Tue Oct 29 11:46:33 2024 (r22033) @@ -164,8 +164,10 @@ void INT123_compat_binmode(int fd, int enable) { #if defined(HAVE__SETMODE) + (void) /* OpenMPT */ _setmode(fd, enable ? _O_BINARY : _O_TEXT); #elif defined(HAVE_SETMODE) + (void) /* OpenMPT */ setmode(fd, enable ? O_BINARY : O_TEXT); #endif } |
|
From: <sv...@op...> - 2024-10-29 10:46:20
|
Author: manx Date: Tue Oct 29 11:46:08 2024 New Revision: 22032 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22032 Log: Merged revision(s) 22031 from trunk/OpenMPT: [Fix] mpg123: Silence MSVC static analyzer warning. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/include/mpg123/OpenMPT.txt branches/OpenMPT-1.31/include/mpg123/src/compat/compat.c Modified: branches/OpenMPT-1.31/include/mpg123/OpenMPT.txt ============================================================================== --- branches/OpenMPT-1.31/include/mpg123/OpenMPT.txt Tue Oct 29 11:45:44 2024 (r22031) +++ branches/OpenMPT-1.31/include/mpg123/OpenMPT.txt Tue Oct 29 11:46:08 2024 (r22032) @@ -7,6 +7,8 @@ `OPT_*`. * `ports/Xcode/config.h` has been modified to `#define HAVE_DIRENT_H`. * `src/compat/compat.c` has been modified for DJGPP compatibility. + * `src/compat/compat.c` has been modified to silence MSVC static analyzer + warnings. * Modifications are marked by `// OpenMPT` or `/* OpenMPT */`. * Obviously, unnecessary folders and files have been removed. * For building, premake is used to generate Visual Studio project files. Modified: branches/OpenMPT-1.31/include/mpg123/src/compat/compat.c ============================================================================== --- branches/OpenMPT-1.31/include/mpg123/src/compat/compat.c Tue Oct 29 11:45:44 2024 (r22031) +++ branches/OpenMPT-1.31/include/mpg123/src/compat/compat.c Tue Oct 29 11:46:08 2024 (r22032) @@ -164,8 +164,10 @@ void INT123_compat_binmode(int fd, int enable) { #if defined(HAVE__SETMODE) + (void) /* OpenMPT */ _setmode(fd, enable ? _O_BINARY : _O_TEXT); #elif defined(HAVE_SETMODE) + (void) /* OpenMPT */ setmode(fd, enable ? O_BINARY : O_TEXT); #endif } |
|
From: <sv...@op...> - 2024-10-29 10:45:56
|
Author: manx Date: Tue Oct 29 11:45:44 2024 New Revision: 22031 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22031 Log: [Fix] mpg123: Silence MSVC static analyzer warning. Modified: trunk/OpenMPT/include/mpg123/OpenMPT.txt trunk/OpenMPT/include/mpg123/src/compat/compat.c Modified: trunk/OpenMPT/include/mpg123/OpenMPT.txt ============================================================================== --- trunk/OpenMPT/include/mpg123/OpenMPT.txt Mon Oct 28 18:51:52 2024 (r22030) +++ trunk/OpenMPT/include/mpg123/OpenMPT.txt Tue Oct 29 11:45:44 2024 (r22031) @@ -7,6 +7,8 @@ `OPT_*`. * `ports/Xcode/config.h` has been modified to `#define HAVE_DIRENT_H`. * `src/compat/compat.c` has been modified for DJGPP compatibility. + * `src/compat/compat.c` has been modified to silence MSVC static analyzer + warnings. * Modifications are marked by `// OpenMPT` or `/* OpenMPT */`. * Obviously, unnecessary folders and files have been removed. * For building, premake is used to generate Visual Studio project files. Modified: trunk/OpenMPT/include/mpg123/src/compat/compat.c ============================================================================== --- trunk/OpenMPT/include/mpg123/src/compat/compat.c Mon Oct 28 18:51:52 2024 (r22030) +++ trunk/OpenMPT/include/mpg123/src/compat/compat.c Tue Oct 29 11:45:44 2024 (r22031) @@ -164,8 +164,10 @@ void INT123_compat_binmode(int fd, int enable) { #if defined(HAVE__SETMODE) + (void) /* OpenMPT */ _setmode(fd, enable ? _O_BINARY : _O_TEXT); #elif defined(HAVE_SETMODE) + (void) /* OpenMPT */ setmode(fd, enable ? O_BINARY : O_TEXT); #endif } |
|
From: <sv...@op...> - 2024-10-28 17:51:58
|
Author: sagamusix Date: Mon Oct 28 18:51:52 2024 New Revision: 22030 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22030 Log: [Imp] S3M: Read IT timer from S3Ms made with Schism Tracker. [Imp] S3M: Store IT timer as well. [Mod] OpenMPT: Version is now 1.32.00.31 Modified: trunk/OpenMPT/common/versionNumber.h trunk/OpenMPT/soundlib/Load_s3m.cpp Modified: trunk/OpenMPT/common/versionNumber.h ============================================================================== --- trunk/OpenMPT/common/versionNumber.h Mon Oct 28 18:17:56 2024 (r22029) +++ trunk/OpenMPT/common/versionNumber.h Mon Oct 28 18:51:52 2024 (r22030) @@ -16,4 +16,4 @@ #define VER_MAJORMAJOR 1 #define VER_MAJOR 32 #define VER_MINOR 00 -#define VER_MINORMINOR 30 +#define VER_MINORMINOR 31 Modified: trunk/OpenMPT/soundlib/Load_s3m.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_s3m.cpp Mon Oct 28 18:17:56 2024 (r22029) +++ trunk/OpenMPT/soundlib/Load_s3m.cpp Mon Oct 28 18:51:52 2024 (r22030) @@ -18,6 +18,7 @@ #include "mpt/io/io_stdstream.hpp" #include "../common/mptFileIO.h" #ifdef MODPLUG_TRACKER +#include "../mptrack/Moddoc.h" #include "../mptrack/TrackerSettings.h" #endif // MODPLUG_TRACKER #endif // MODPLUG_NO_FILESAVE @@ -252,6 +253,7 @@ const bool usePanningTable = fileHeader.usePanningTable == S3MFileHeader::idPanning; const bool offsetsAreCanonical = !patternOffsets.empty() && !sampleOffsets.empty() && patternOffsets[0] > sampleOffsets[0]; const int32 schismDateVersion = SchismTrackerEpoch + ((fileHeader.cwtv == 0x4FFF) ? fileHeader.reserved2 : (fileHeader.cwtv - 0x4050)); + uint32 editTimer = 0; switch(fileHeader.cwtv & S3MFileHeader::trackerMask) { case S3MFileHeader::trkAkord & S3MFileHeader::trackerMask: @@ -329,11 +331,7 @@ if(fileHeader.cwtv >= S3MFileHeader::trkIT2_07 && fileHeader.reserved3 != 0) { // Starting from version 2.07, IT stores the total edit time of a module in the "reserved" field - uint32 editTime = DecodeITEditTimer(fileHeader.cwtv, fileHeader.reserved3); - - FileHistory hist; - hist.openTime = static_cast<uint32>(editTime * (HISTORY_TIMER_PRECISION / 18.2)); - m_FileHistory.push_back(hist); + editTimer = DecodeITEditTimer(fileHeader.cwtv, fileHeader.reserved3); } nonCompatTracker = true; m_playBehaviour.set(kPeriodsAreHertz); @@ -359,6 +357,12 @@ if(schismDateVersion >= SchismVersionFromDate<2016, 05, 13>::date) m_playBehaviour.set(kITShortSampleRetrig); m_playBehaviour.reset(kST3TonePortaWithAdlibNote); + + if(fileHeader.cwtv == (S3MFileHeader::trkSchismTracker | 0xFFF) && fileHeader.reserved3 != 0) + { + // Added in commit 6c4b71f10d4e0bf202dddfa8bd781de510b8bc0b + editTimer = fileHeader.reserved3; + } } nonCompatTracker = true; break; @@ -379,7 +383,12 @@ { uint32 mptVersion = (fileHeader.cwtv & S3MFileHeader::versionMask) << 16; if(mptVersion >= 0x01'29'00'00) + { mptVersion |= fileHeader.reserved2; + // Added in OpenMPT 1.32.00.31 + if(fileHeader.reserved3 != 0) + editTimer = fileHeader.reserved3; + } m_dwLastSavedWithVersion = Version(mptVersion); madeWithTracker = UL_("OpenMPT ") + mpt::ufmt::val(m_dwLastSavedWithVersion); } else @@ -404,6 +413,14 @@ madeWithTracker = MPT_UFORMAT("{} {}.{}")(madeWithTracker, (fileHeader.cwtv & 0xF00) >> 8, mpt::ufmt::hex0<2>(fileHeader.cwtv & 0xFF)); } + // IT edit timer + if(editTimer != 0) + { + FileHistory hist; + hist.openTime = static_cast<uint32>(editTimer * (HISTORY_TIMER_PRECISION / 18.2)); + m_FileHistory.push_back(hist); + } + m_modFormat.formatName = UL_("Scream Tracker 3"); m_modFormat.type = UL_("s3m"); m_modFormat.madeWithTracker = std::move(madeWithTracker); @@ -831,6 +848,21 @@ fileHeader.ultraClicks = 16; fileHeader.usePanningTable = S3MFileHeader::idPanning; + // IT edit timer + uint64 editTimer = 0; + for(const auto &mptHistory : GetFileHistory()) + { + editTimer += static_cast<uint32>(mptHistory.openTime * HISTORY_TIMER_PRECISION / 18.2); + } +#ifdef MODPLUG_TRACKER + if(const auto modDoc = GetpModDoc(); modDoc != nullptr) + { + auto creationTime = modDoc->GetCreationTime(); + editTimer += mpt::saturate_round<uint64>((mpt::Date::UnixAsSeconds(mpt::Date::UnixNow()) - mpt::Date::UnixAsSeconds(creationTime)) * HISTORY_TIMER_PRECISION); + } +#endif // MODPLUG_TRACKER + fileHeader.reserved3 = mpt::saturate_cast<uint32>(editTimer); + mpt::IO::Write(f, fileHeader); Order().WriteAsByte(f, writeOrders); |
|
From: <sv...@op...> - 2024-10-28 17:18:08
|
Author: sagamusix Date: Mon Oct 28 18:17:56 2024 New Revision: 22029 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22029 Log: [Imp] Tuning Dialog: Make the dialog resizable, and reduce the tuning list width (which can now be increased if it's too narrow by resizing the dialog). [Imp] Tuning Dialog: Add mnenomics to controls. Modified: trunk/OpenMPT/mptrack/TuningDialog.cpp trunk/OpenMPT/mptrack/TuningDialog.h trunk/OpenMPT/mptrack/mptrack.rc Modified: trunk/OpenMPT/mptrack/TuningDialog.cpp ============================================================================== --- trunk/OpenMPT/mptrack/TuningDialog.cpp Mon Oct 28 17:30:46 2024 (r22028) +++ trunk/OpenMPT/mptrack/TuningDialog.cpp Mon Oct 28 18:17:56 2024 (r22029) @@ -45,7 +45,7 @@ // CTuningDialog dialog CTuningDialog::CTuningDialog(CWnd* pParent, INSTRUMENTINDEX inst, CSoundFile &csf) - : DialogBase(IDD_TUNING, pParent) + : ResizableDialog(IDD_TUNING, pParent) , m_sndFile(csf) , m_TreeCtrlTuning(this) , m_TreeItemTuningItemMap(s_notFoundItemTree, s_notFoundItemTuning) @@ -152,7 +152,7 @@ BOOL CTuningDialog::OnInitDialog() { - DialogBase::OnInitDialog(); + ResizableDialog::OnInitDialog(); m_EditRatioPeriod.SubclassDlgItem(IDC_EDIT_RATIOPERIOD, this); m_EditRatio.SubclassDlgItem(IDC_EDIT_RATIOVALUE, this); @@ -348,7 +348,7 @@ void CTuningDialog::DoDataExchange(CDataExchange* pDX) { - DialogBase::DoDataExchange(pDX); + ResizableDialog::DoDataExchange(pDX); DDX_Control(pDX, IDC_STATICRATIOMAP, m_RatioMapWnd); DDX_Control(pDX, IDC_COMBO_TTYPE, m_CombobTuningType); DDX_Control(pDX, IDC_EDIT_STEPS, m_EditSteps); @@ -366,7 +366,7 @@ -BEGIN_MESSAGE_MAP(CTuningDialog, DialogBase) +BEGIN_MESSAGE_MAP(CTuningDialog, ResizableDialog) ON_EN_CHANGE(IDC_EDIT_STEPS, &CTuningDialog::OnEnChangeEditSteps) ON_EN_CHANGE(IDC_EDIT_RATIOPERIOD, &CTuningDialog::OnEnChangeEditRatioperiod) ON_EN_CHANGE(IDC_EDIT_NOTENAME, &CTuningDialog::OnEnChangeEditNotename) @@ -1452,7 +1452,7 @@ if(GetKeyState(VK_RETURN) <= -127 && GetFocus() != GetDlgItem(IDOK)) return; else - DialogBase::OnOK(); + ResizableDialog::OnOK(); } Modified: trunk/OpenMPT/mptrack/TuningDialog.h ============================================================================== --- trunk/OpenMPT/mptrack/TuningDialog.h Mon Oct 28 17:30:46 2024 (r22028) +++ trunk/OpenMPT/mptrack/TuningDialog.h Mon Oct 28 18:17:56 2024 (r22029) @@ -13,7 +13,7 @@ #include "openmpt/all/BuildSettings.hpp" #include "CDecimalSupport.h" -#include "DialogBase.h" +#include "ResizableDialog.h" #include "tuningcollection.h" #include "tuningRatioMapWnd.h" @@ -187,7 +187,7 @@ // CTuningDialog dialog -class CTuningDialog : public DialogBase +class CTuningDialog : public ResizableDialog { friend class CTuningTreeCtrl; Modified: trunk/OpenMPT/mptrack/mptrack.rc ============================================================================== --- trunk/OpenMPT/mptrack/mptrack.rc Mon Oct 28 17:30:46 2024 (r22028) +++ trunk/OpenMPT/mptrack/mptrack.rc Mon Oct 28 18:17:56 2024 (r22029) @@ -3378,39 +3378,39 @@ GROUPBOX "Current Mapping",IDC_STATIC,5,5,391,91 END -IDD_TUNING DIALOGEX 0, 0, 537, 231 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +IDD_TUNING DIALOGEX 0, 0, 495, 231 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME EXSTYLE WS_EX_CONTROLPARENT CAPTION "Tuning Properties" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - CONTROL "",IDC_TREE_TUNING,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_SHOWSELALWAYS | WS_BORDER | WS_HSCROLL | WS_TABSTOP,6,5,252,199 - PUSHBUTTON "New...",IDC_BUTTON_TUNING_NEW,6,210,48,14 - PUSHBUTTON "Load...",IDC_BUTTON_IMPORT,60,210,48,14 - PUSHBUTTON "Save As...",IDC_BUTTON_EXPORT,114,210,48,14 - PUSHBUTTON "Remove",IDC_BUTTON_TUNING_REMOVE,168,210,48,14 - GROUPBOX "Tuning",IDC_STATIC,264,6,264,198 - LTEXT "Name:",IDC_STATIC,270,20,24,10 - EDITTEXT IDC_EDIT_NAME,300,18,222,12,ES_AUTOHSCROLL | ES_READONLY - LTEXT "Tuning Type:",IDC_STATIC,270,36,46,14,SS_CENTERIMAGE - COMBOBOX IDC_COMBO_TTYPE,270,54,90,45,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Group Size:",IDC_STATIC,270,80,60,8,SS_CENTERIMAGE - EDITTEXT IDC_EDIT_STEPS,330,78,30,12,ES_AUTOHSCROLL | ES_READONLY - LTEXT "Group Ratio:",IDC_STATIC,270,97,60,9,SS_CENTERIMAGE - EDITTEXT IDC_EDIT_RATIOPERIOD,330,96,30,12,ES_AUTOHSCROLL | ES_READONLY - LTEXT "Finetune Steps:",IDC_STATIC,270,116,60,8,SS_CENTERIMAGE - EDITTEXT IDC_EDIT_FINETUNESTEPS,330,115,30,12,ES_AUTOHSCROLL - LTEXT "Multiply all ratios by",IDC_STATIC,276,150,66,12,SS_CENTERIMAGE - EDITTEXT IDC_EDIT_MISC_ACTIONS,276,168,42,13,ES_AUTOHSCROLL - PUSHBUTTON "Apply",IDC_BUTTON_SETVALUES,324,168,36,12 - CONTROL "",IDC_STATICRATIOMAP,"Static",SS_GRAYRECT | SS_NOTIFY | WS_TABSTOP,366,48,156,132,WS_EX_CLIENTEDGE - CTEXT "Note",IDC_STATIC,372,36,30,8,SS_CENTERIMAGE - CTEXT "Name",IDC_STATIC,408,36,36,8,SS_CENTERIMAGE - EDITTEXT IDC_EDIT_NOTENAME,408,186,30,12,ES_AUTOHSCROLL | ES_WANTRETURN - CTEXT "Ratio",IDC_STATIC,444,36,36,8,SS_CENTERIMAGE - EDITTEXT IDC_EDIT_RATIOVALUE,444,186,42,12,ES_AUTOHSCROLL | ES_WANTRETURN - CTEXT "Cents",IDC_STATIC,486,36,30,8,SS_CENTERIMAGE - DEFPUSHBUTTON "OK",IDOK,480,210,48,14 + CONTROL "",IDC_TREE_TUNING,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_SHOWSELALWAYS | WS_BORDER | WS_HSCROLL | WS_TABSTOP,6,5,210,199 + PUSHBUTTON "&New...",IDC_BUTTON_TUNING_NEW,6,210,48,14 + PUSHBUTTON "&Load...",IDC_BUTTON_IMPORT,60,210,48,14 + PUSHBUTTON "Save &As...",IDC_BUTTON_EXPORT,114,210,48,14 + PUSHBUTTON "&Remove",IDC_BUTTON_TUNING_REMOVE,168,210,48,14 + GROUPBOX "Tuning",IDC_STATIC,222,6,264,198 + LTEXT "Name:",IDC_STATIC,228,20,24,10 + EDITTEXT IDC_EDIT_NAME,258,18,222,12,ES_AUTOHSCROLL | ES_READONLY + LTEXT "&Tuning Type:",IDC_STATIC,228,36,46,14,SS_CENTERIMAGE + COMBOBOX IDC_COMBO_TTYPE,228,54,90,45,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Group Si&ze:",IDC_STATIC,228,80,60,8,SS_CENTERIMAGE + EDITTEXT IDC_EDIT_STEPS,288,78,30,12,ES_AUTOHSCROLL | ES_READONLY + LTEXT "&Group Ratio:",IDC_STATIC,228,97,60,9,SS_CENTERIMAGE + EDITTEXT IDC_EDIT_RATIOPERIOD,288,96,30,12,ES_AUTOHSCROLL | ES_READONLY + LTEXT "&Finetune Steps:",IDC_STATIC,228,116,60,8,SS_CENTERIMAGE + EDITTEXT IDC_EDIT_FINETUNESTEPS,288,115,30,12,ES_AUTOHSCROLL + LTEXT "&Multiply all ratios by",IDC_STATIC,234,150,66,12,SS_CENTERIMAGE + EDITTEXT IDC_EDIT_MISC_ACTIONS,234,168,42,13,ES_AUTOHSCROLL + PUSHBUTTON "A&pply",IDC_BUTTON_SETVALUES,282,168,36,12 + CONTROL "",IDC_STATICRATIOMAP,"Static",SS_GRAYRECT | SS_NOTIFY | WS_TABSTOP,324,48,156,132,WS_EX_CLIENTEDGE + CTEXT "Note",IDC_STATIC,330,36,30,8,SS_CENTERIMAGE + CTEXT "Name",IDC_STATIC,366,36,36,8,SS_CENTERIMAGE + EDITTEXT IDC_EDIT_NOTENAME,366,186,30,12,ES_AUTOHSCROLL | ES_WANTRETURN + CTEXT "Ratio",IDC_STATIC,402,36,36,8,SS_CENTERIMAGE + EDITTEXT IDC_EDIT_RATIOVALUE,402,186,42,12,ES_AUTOHSCROLL | ES_WANTRETURN + CTEXT "Cents",IDC_STATIC,444,36,30,8,SS_CENTERIMAGE + DEFPUSHBUTTON "&OK",IDOK,438,210,48,14 END IDD_CHANNELMANAGER DIALOGEX 0, 0, 524, 116 @@ -3510,7 +3510,7 @@ IDD_TUNING, DIALOG BEGIN - RIGHTMARGIN, 524 + RIGHTMARGIN, 482 VERTGUIDE, 101 VERTGUIDE, 104 VERTGUIDE, 109 @@ -3569,7 +3569,34 @@ IDD_TUNING AFX_DIALOG_LAYOUT BEGIN - 0 + 0, + 0, 0, 100, 100, + 0, 100, 0, 0, + 0, 100, 0, 0, + 0, 100, 0, 0, + 0, 100, 0, 0, + 100, 0, 0, 0, + 100, 0, 0, 0, + 100, 0, 0, 0, + 100, 0, 0, 0, + 100, 0, 0, 0, + 100, 0, 0, 0, + 100, 0, 0, 0, + 100, 0, 0, 0, + 100, 0, 0, 0, + 100, 0, 0, 0, + 100, 0, 0, 0, + 100, 0, 0, 0, + 100, 0, 0, 0, + 100, 0, 0, 0, + 100, 0, 0, 0, + 100, 0, 0, 0, + 100, 0, 0, 0, + 100, 0, 0, 0, + 100, 0, 0, 0, + 100, 0, 0, 0, + 100, 0, 0, 0, + 100, 100, 0, 0 END IDD_CHANNELMANAGER AFX_DIALOG_LAYOUT |
|
From: <sv...@op...> - 2024-10-28 16:30:58
|
Author: manx Date: Mon Oct 28 17:30:46 2024 New Revision: 22028 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22028 Log: [Imp] build: Makefile: Be more verbose (i.e. at all) about which dependencies are detected/used. Modified: trunk/OpenMPT/Makefile Modified: trunk/OpenMPT/Makefile ============================================================================== --- trunk/OpenMPT/Makefile Mon Oct 28 17:29:49 2024 (r22027) +++ trunk/OpenMPT/Makefile Mon Oct 28 17:30:46 2024 (r22028) @@ -144,18 +144,41 @@ INFO = @echo SILENT = @ VERYSILENT = @ - +define PRINT_TRACE +endef +define PRINT_DEBUG +endef +define PRINT_INFO +$(info $1) +endef ifeq ($(VERBOSE),2) INFO = @true SILENT = VERYSILENT = +define PRINT_TRACE +$(info $1) +endef +define PRINT_DEBUG +$(info $1) +endef +define PRINT_INFO +$(info $1) +endef endif ifeq ($(VERBOSE),1) INFO = @true SILENT = VERYSILENT = @ +define PRINT_TRACE +endef +define PRINT_DEBUG +$(info $1) +endef +define PRINT_INFO +$(info $1) +endef endif @@ -163,9 +186,14 @@ INFO = @true SILENT = @ VERYSILENT = @ +define PRINT_TRACE +endef +define PRINT_DEBUG +endef +define PRINT_INFO +endef endif - # general settings DYNLINK=1 @@ -642,7 +670,9 @@ NO_ZLIB:=1 endif +$(call PRINT_TRACE,[DEP] zlib) ifeq ($(LOCAL_ZLIB),1) +$(call PRINT_INFO,[DEP] zlib: local) CPPFLAGS_ZLIB := -DMPT_WITH_ZLIB LDFLAGS_ZLIB := LDLIBS_ZLIB := @@ -671,14 +701,18 @@ OBJECTS_ZLIB = $(ZLIB_OBJECTS) else ifeq ($(NO_ZLIB),1) +$(call PRINT_INFO,[DEP] zlib: disabled) else #LDLIBS += -lz +$(call PRINT_DEBUG,[DEP] zlib: checking pkg-config ...) ifeq ($(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --exists zlib && echo yes),yes) +$(call PRINT_INFO,[DEP] zlib: pkg-config/zlib) CPPFLAGS_ZLIB := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --cflags-only-I zlib ) -DMPT_WITH_ZLIB LDFLAGS_ZLIB := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-L zlib ) $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-other zlib ) LDLIBS_ZLIB := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-l zlib ) PC_REQUIRES_ZLIB := zlib else +$(call PRINT_INFO,[DEP] zlib: no) ifeq ($(FORCE_DEPS),1) $(error zlib not found) else @@ -689,7 +723,9 @@ endif endif +$(call PRINT_TRACE,[DEP] mpg123) ifeq ($(LOCAL_MPG123),1) +$(call PRINT_INFO,[DEP] mpg123: local) ifeq ($(ENABLE_DXE),1) @@ -793,14 +829,18 @@ else ifeq ($(NO_MPG123),1) +$(call PRINT_INFO,[DEP] mpg123: disabled) else #LDLIBS += -lmpg123 +$(call PRINT_DEBUG,[DEP] mpg123: checking pkg-config ...) ifeq ($(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --exists 'libmpg123 >= 1.14.0' && echo yes),yes) +$(call PRINT_INFO,[DEP] mpg123: pkg-config/mpg123) CPPFLAGS_MPG123 := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --cflags-only-I 'libmpg123 >= 1.14.0' ) -DMPT_WITH_MPG123 LDFLAGS_MPG123 := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-L 'libmpg123 >= 1.14.0' ) $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-other 'libmpg123 >= 1.14.0' ) LDLIBS_MPG123 := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-l 'libmpg123 >= 1.14.0' ) PC_REQUIRES_MPG123 := libmpg123 else +$(call PRINT_INFO,[DEP] mpg123: no) ifeq ($(FORCE_DEPS),1) $(error mpg123 not found) else @@ -811,7 +851,9 @@ endif endif +$(call PRINT_TRACE,[DEP] ogg) ifeq ($(LOCAL_OGG),1) +$(call PRINT_INFO,[DEP] ogg: local) CPPFLAGS_OGG := -DMPT_WITH_OGG LDFLAGS_OGG := LDLIBS_OGG := @@ -827,14 +869,18 @@ OBJECTS_OGG = $(OGG_OBJECTS) else ifeq ($(NO_OGG),1) +$(call PRINT_INFO,[DEP] ogg: disabled) else #LDLIBS += -logg +$(call PRINT_DEBUG,[DEP] ogg: checking pkg-config ...) ifeq ($(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --exists ogg && echo yes),yes) +$(call PRINT_INFO,[DEP] ogg: pkg-config/ogg) CPPFLAGS_OGG := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --cflags-only-I ogg ) -DMPT_WITH_OGG LDFLAGS_OGG := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-L ogg ) $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-other ogg ) LDLIBS_OGG := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-l ogg ) PC_REQUIRES_OGG := ogg else +$(call PRINT_INFO,[DEP] ogg: no) ifeq ($(FORCE_DEPS),1) $(error ogg not found) else @@ -845,7 +891,9 @@ endif endif +$(call PRINT_TRACE,[DEP] vorbis) ifeq ($(LOCAL_VORBIS),1) +$(call PRINT_INFO,[DEP] vorbis: local) CPPFLAGS_VORBIS := -DMPT_WITH_VORBIS LDFLAGS_VORBIS := LDLIBS_VORBIS := @@ -884,14 +932,18 @@ OBJECTS_VORBIS = $(VORBIS_OBJECTS) else ifeq ($(NO_VORBIS),1) +$(call PRINT_INFO,[DEP] vorbis: disabled) else #LDLIBS += -lvorbis +$(call PRINT_DEBUG,[DEP] vorbis: checking pkg-config ...) ifeq ($(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --exists vorbis && echo yes),yes) +$(call PRINT_INFO,[DEP] vorbis: pkg-config/vorbis) CPPFLAGS_VORBIS := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --cflags-only-I vorbis ) -DMPT_WITH_VORBIS LDFLAGS_VORBIS := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-L vorbis ) $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-other vorbis ) LDLIBS_VORBIS := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-l vorbis ) PC_REQUIRES_VORBIS := vorbis else +$(call PRINT_INFO,[DEP] vorbis: no) ifeq ($(FORCE_DEPS),1) $(error vorbis not found) else @@ -902,20 +954,26 @@ endif endif +$(call PRINT_TRACE,[DEP] vorbisfile) ifeq ($(LOCAL_VORBIS),1) +$(call PRINT_INFO,[DEP] vorbisfile: local) CPPFLAGS_VORBISFILE := -DMPT_WITH_VORBISFILE LDFLAGS_VORBISFILE := LDLIBS_VORBISFILE := else ifeq ($(NO_VORBISFILE),1) +$(call PRINT_INFO,[DEP] vorbisfile: disabled) else #LDLIBS += -lvorbisfile +$(call PRINT_DEBUG,[DEP] vorbisfile: checking pkg-config ...) ifeq ($(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --exists vorbisfile && echo yes),yes) +$(call PRINT_INFO,[DEP] vorbisfile: pkg-config/vorbisfile) CPPFLAGS_VORBISFILE := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --cflags-only-I vorbisfile ) -DMPT_WITH_VORBISFILE LDFLAGS_VORBISFILE := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-L vorbisfile ) $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-other vorbisfile ) LDLIBS_VORBISFILE := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-l vorbisfile ) PC_REQUIRES_VORBISFILE := vorbisfile else +$(call PRINT_INFO,[DEP] vorbisfile: no) ifeq ($(FORCE_DEPS),1) $(error vorbisfile not found) else @@ -926,14 +984,19 @@ endif endif +$(call PRINT_TRACE,[DEP] SDL2) ifeq ($(NO_SDL2),1) +$(call PRINT_INFO,[DEP] SDL2: disabled) else #LDLIBS += -lsdl2 +$(call PRINT_DEBUG,[DEP] SDL2: checking pkg-config ...) ifeq ($(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --exists 'sdl2 >= 2.0.4' && echo yes),yes) +$(call PRINT_INFO,[DEP] SDL2: pkg-config/sdl2) CPPFLAGS_SDL2 := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --cflags-only-I 'sdl2 >= 2.0.4' ) -DMPT_WITH_SDL2 LDFLAGS_SDL2 := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-L 'sdl2 >= 2.0.4' ) $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-other 'sdl2 >= 2.0.4' ) LDLIBS_SDL2 := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-l 'sdl2 >= 2.0.4' ) else +$(call PRINT_INFO,[DEP] SDL2: no) ifeq ($(FORCE_DEPS),1) $(error sdl2 not found) else @@ -943,14 +1006,19 @@ endif endif +$(call PRINT_TRACE,[DEP] PortAudio) ifeq ($(NO_PORTAUDIO),1) +$(call PRINT_INFO,[DEP] PortAudio: disabled) else #LDLIBS += -lportaudio +$(call PRINT_DEBUG,[DEP] PortAudio: checking pkg-config ...) ifeq ($(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --exists portaudio-2.0 && echo yes),yes) +$(call PRINT_INFO,[DEP] PortAudio: pkg-config/portaudio-2.0) CPPFLAGS_PORTAUDIO := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --cflags-only-I portaudio-2.0 ) -DMPT_WITH_PORTAUDIO LDFLAGS_PORTAUDIO := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-L portaudio-2.0 ) $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-other portaudio-2.0 ) LDLIBS_PORTAUDIO := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-l portaudio-2.0 ) else +$(call PRINT_INFO,[DEP] PortAudio: no) ifeq ($(FORCE_DEPS),1) $(error portaudio not found) else @@ -960,14 +1028,19 @@ endif endif +$(call PRINT_TRACE,[DEP] PortAudio-C++) ifeq ($(NO_PORTAUDIOCPP),1) +$(call PRINT_INFO,[DEP] PortAudio-C++: disabled) else #LDLIBS += -lportaudiocpp +$(call PRINT_DEBUG,[DEP] PortAudio-C++: checking pkg-config ...) ifeq ($(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --exists portaudiocpp && echo yes),yes) +$(call PRINT_INFO,[DEP] PortAudio-C++: pkg-config/portaudiocpp) CPPFLAGS_PORTAUDIOCPP := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --cflags-only-I portaudiocpp ) -DMPT_WITH_PORTAUDIOCPP LDFLAGS_PORTAUDIOCPP := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-L portaudiocpp ) $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-other portaudiocpp ) LDLIBS_PORTAUDIOCPP := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-l portaudiocpp ) else +$(call PRINT_INFO,[DEP] PortAudio-C++: no) ifeq ($(FORCE_DEPS),1) $(error portaudiocpp not found) else @@ -977,14 +1050,20 @@ endif endif +$(call PRINT_TRACE,[DEP] PulseAudio) ifeq ($(NO_PULSEAUDIO),1) +$(call PRINT_INFO,[DEP] PulseAudio: disabled) else #LDLIBS += -lpulse-simple +$(call PRINT_DEBUG,[DEP] PulseAudio: checking pkg-config ...) ifeq ($(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --exists libpulse libpulse-simple && echo yes),yes) +$(call PRINT_INFO,[DEP] PulseAudio: pkg-config/libpulse) +$(call PRINT_INFO,[DEP] PulseAudio: pkg-config/libpulse-simple) CPPFLAGS_PULSEAUDIO := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --cflags-only-I libpulse libpulse-simple ) -DMPT_WITH_PULSEAUDIO LDFLAGS_PULSEAUDIO := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-L libpulse libpulse-simple ) $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-other libpulse libpulse-simple ) LDLIBS_PULSEAUDIO := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-l libpulse libpulse-simple ) else +$(call PRINT_INFO,[DEP] PulseAudio: no) ifeq ($(FORCE_DEPS),1) $(error pulseaudio not found) else @@ -994,14 +1073,19 @@ endif endif +$(call PRINT_TRACE,[DEP] FLAC) ifeq ($(NO_FLAC),1) +$(call PRINT_INFO,[DEP] FLAC: disabled) else #LDLIBS += -lFLAC +$(call PRINT_DEBUG,[DEP] FLAC: checking pkg-config ...) ifeq ($(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --exists 'flac >= 1.3.0' && echo yes),yes) +$(call PRINT_INFO,[DEP] FLAC: pkg-config/flac) CPPFLAGS_FLAC := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --cflags-only-I 'flac >= 1.3.0' ) -DMPT_WITH_FLAC LDFLAGS_FLAC := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-L 'flac >= 1.3.0' ) $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-other 'flac >= 1.3.0' ) LDLIBS_FLAC := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-l 'flac >= 1.3.0' ) else +$(call PRINT_INFO,[DEP] FLAC: no) ifeq ($(FORCE_DEPS),1) $(error flac not found) else @@ -1011,14 +1095,19 @@ endif endif +$(call PRINT_TRACE,[DEP] sndfile) ifeq ($(NO_SNDFILE),1) +$(call PRINT_INFO,[DEP] sndfile: disabled) else #LDLIBS += -lsndfile +$(call PRINT_DEBUG,[DEP] sndfile: checking pkg-config ...) ifeq ($(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --exists sndfile && echo yes),yes) +$(call PRINT_INFO,[DEP] sndfile: pkg-config/sndfile) CPPFLAGS_SNDFILE := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --cflags-only-I sndfile ) -DMPT_WITH_SNDFILE LDFLAGS_SNDFILE := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-L sndfile ) $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-other sndfile ) LDLIBS_SNDFILE := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-l sndfile ) else +$(call PRINT_INFO,[DEP] sndfile: no) ifeq ($(FORCE_DEPS),1) $(error sndfile not found) else @@ -1028,7 +1117,9 @@ endif endif +$(call PRINT_TRACE,[DEP] Allegro-4.2) ifeq ($(USE_ALLEGRO42),1) +$(call PRINT_INFO,[DEP] Allegro-4.2: local) CPPFLAGS_ALLEGRO42 := -Iinclude/allegro42/include -DALLEGRO_HAVE_STDINT_H -DLONG_LONG="long long" -DMPT_WITH_ALLEGRO42 LDFLAGS_ALLEGRO42 := @@ -1041,6 +1132,8 @@ MISC_OUTPUTS += include/allegro42/lib/djgpp/liballeg.a +else +$(call PRINT_INFO,[DEP] Allegro-4.2: disabled) endif |
|
From: <sv...@op...> - 2024-10-28 16:29:56
|
Author: manx Date: Mon Oct 28 17:29:49 2024 New Revision: 22027 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22027 Log: [Ref] build: Makefile: Do not rely on parsing stdout of make runs for distversion. Use an output file instead. Modified: trunk/OpenMPT/Makefile trunk/OpenMPT/build/autotools/autoconfiscate.sh trunk/OpenMPT/build/svn/do_libopenmpt_release.sh trunk/OpenMPT/build/svn/do_libopenmpt_release_rc.sh Modified: trunk/OpenMPT/Makefile ============================================================================== --- trunk/OpenMPT/Makefile Mon Oct 28 16:55:33 2024 (r22026) +++ trunk/OpenMPT/Makefile Mon Oct 28 17:29:49 2024 (r22027) @@ -1488,6 +1488,9 @@ LIBOPENMPT_LDFLAGS += -Wl,-soname,$(LIBOPENMPT_SONAME) endif +MISC_OUTPUTS += bin/distversion +MISC_OUTPUTS += bin/distversion-pure +MISC_OUTPUTS += bin/distversion-tarball MISC_OUTPUTS += bin/$(FLAVOUR_DIR)empty.cpp MISC_OUTPUTS += bin/$(FLAVOUR_DIR)empty.out MISC_OUTPUTS += bin/$(FLAVOUR_DIR)openmpt123$(EXESUFFIX).norpath @@ -2316,12 +2319,12 @@ .PHONY: distversion distversion: - $(SILENT)echo "$(DIST_LIBOPENMPT_VERSION)" + $(SILENT)echo "$(DIST_LIBOPENMPT_VERSION)" > bin/distversion .PHONY: distversion-pure distversion-pure: - $(SILENT)echo "$(DIST_LIBOPENMPT_VERSION_PURE)" + $(SILENT)echo "$(DIST_LIBOPENMPT_VERSION_PURE)" > bin/distversion-pure .PHONY: distversion-tarball distversion-tarball: - $(SILENT)echo "$(DIST_LIBOPENMPT_TARBALL_VERSION)" + $(SILENT)echo "$(DIST_LIBOPENMPT_TARBALL_VERSION)" > bin/distversion-tarball Modified: trunk/OpenMPT/build/autotools/autoconfiscate.sh ============================================================================== --- trunk/OpenMPT/build/autotools/autoconfiscate.sh Mon Oct 28 16:55:33 2024 (r22026) +++ trunk/OpenMPT/build/autotools/autoconfiscate.sh Mon Oct 28 17:29:49 2024 (r22027) @@ -285,7 +285,8 @@ echo "Building dist-autotools.tar ..." cd "$OLDDIR" -MPT_LIBOPENMPT_VERSION=$($MAKE distversion-tarball) +$MAKE QUIET=1 distversion-tarball +MPT_LIBOPENMPT_VERSION=$(cat bin/distversion-tarball) cd bin/dist-autotools rm -rf libopenmpt mkdir -p libopenmpt/src.autotools/$MPT_LIBOPENMPT_VERSION/ Modified: trunk/OpenMPT/build/svn/do_libopenmpt_release.sh ============================================================================== --- trunk/OpenMPT/build/svn/do_libopenmpt_release.sh Mon Oct 28 16:55:33 2024 (r22026) +++ trunk/OpenMPT/build/svn/do_libopenmpt_release.sh Mon Oct 28 17:29:49 2024 (r22027) @@ -14,7 +14,8 @@ build/update_libopenmpt_version.sh release svn ci -m "[Mod] libopenmpt: Prepare for release." svn up -NEWVER=$(make distversion-pure) +make QUIET=1 distversion-pure +NEWVER=$(cat distversion-pure) NEWREV=$(svn info --xml . | xpath -e 'string(/info/entry/commit/@revision)' -q) svn cp -m "tag libopenmpt-${NEWVER}" -r ${NEWREV} https://source.openmpt.org/svn/openmpt/branches/OpenMPT-1.32 https://source.openmpt.org/svn/openmpt/tags/libopenmpt-${NEWVER} build/update_libopenmpt_version.sh bumppatch Modified: trunk/OpenMPT/build/svn/do_libopenmpt_release_rc.sh ============================================================================== --- trunk/OpenMPT/build/svn/do_libopenmpt_release_rc.sh Mon Oct 28 16:55:33 2024 (r22026) +++ trunk/OpenMPT/build/svn/do_libopenmpt_release_rc.sh Mon Oct 28 17:29:49 2024 (r22027) @@ -4,7 +4,8 @@ svn up -NEWVER=$(make distversion-pure) +make QUIET=1 distversion-pure +NEWVER=$(cat distversion-pure) NEWREV=$(svn info --xml . | xpath -e 'string(/info/entry/commit/@revision)' -q) svn cp -m "tag libopenmpt-${NEWVER}" -r ${NEWREV} https://source.openmpt.org/svn/openmpt/branches/OpenMPT-1.32 https://source.openmpt.org/svn/openmpt/tags/libopenmpt-${NEWVER} TAGREV=$(svn info --xml https://source.openmpt.org/svn/openmpt/tags/libopenmpt-${NEWVER} | xpath -e 'string(/info/entry/commit/@revision)' -q) |
|
From: <sv...@op...> - 2024-10-28 15:55:45
|
Author: manx Date: Mon Oct 28 16:55:33 2024 New Revision: 22026 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22026 Log: Revert r22020. Breaks 'make distversion' and related targets. Merged revision(s) 22020 from trunk/OpenMPT: [Imp] build: Makefile: Be more verbose (i.e. at all) about which dependencies are detected/used. ........ Modified: trunk/OpenMPT/Makefile Modified: trunk/OpenMPT/Makefile ============================================================================== --- trunk/OpenMPT/Makefile Mon Oct 28 15:44:45 2024 (r22025) +++ trunk/OpenMPT/Makefile Mon Oct 28 16:55:33 2024 (r22026) @@ -144,41 +144,18 @@ INFO = @echo SILENT = @ VERYSILENT = @ -define PRINT_TRACE -endef -define PRINT_DEBUG -endef -define PRINT_INFO -$(info $1) -endef + ifeq ($(VERBOSE),2) INFO = @true SILENT = VERYSILENT = -define PRINT_TRACE -$(info $1) -endef -define PRINT_DEBUG -$(info $1) -endef -define PRINT_INFO -$(info $1) -endef endif ifeq ($(VERBOSE),1) INFO = @true SILENT = VERYSILENT = @ -define PRINT_TRACE -endef -define PRINT_DEBUG -$(info $1) -endef -define PRINT_INFO -$(info $1) -endef endif @@ -186,14 +163,9 @@ INFO = @true SILENT = @ VERYSILENT = @ -define PRINT_TRACE -endef -define PRINT_DEBUG -endef -define PRINT_INFO -endef endif + # general settings DYNLINK=1 @@ -670,9 +642,7 @@ NO_ZLIB:=1 endif -$(call PRINT_TRACE,[DEP] zlib) ifeq ($(LOCAL_ZLIB),1) -$(call PRINT_INFO,[DEP] zlib: local) CPPFLAGS_ZLIB := -DMPT_WITH_ZLIB LDFLAGS_ZLIB := LDLIBS_ZLIB := @@ -701,18 +671,14 @@ OBJECTS_ZLIB = $(ZLIB_OBJECTS) else ifeq ($(NO_ZLIB),1) -$(call PRINT_INFO,[DEP] zlib: disabled) else #LDLIBS += -lz -$(call PRINT_DEBUG,[DEP] zlib: checking pkg-config ...) ifeq ($(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --exists zlib && echo yes),yes) -$(call PRINT_INFO,[DEP] zlib: pkg-config/zlib) CPPFLAGS_ZLIB := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --cflags-only-I zlib ) -DMPT_WITH_ZLIB LDFLAGS_ZLIB := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-L zlib ) $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-other zlib ) LDLIBS_ZLIB := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-l zlib ) PC_REQUIRES_ZLIB := zlib else -$(call PRINT_INFO,[DEP] zlib: no) ifeq ($(FORCE_DEPS),1) $(error zlib not found) else @@ -723,9 +689,7 @@ endif endif -$(call PRINT_TRACE,[DEP] mpg123) ifeq ($(LOCAL_MPG123),1) -$(call PRINT_INFO,[DEP] mpg123: local) ifeq ($(ENABLE_DXE),1) @@ -829,18 +793,14 @@ else ifeq ($(NO_MPG123),1) -$(call PRINT_INFO,[DEP] mpg123: disabled) else #LDLIBS += -lmpg123 -$(call PRINT_DEBUG,[DEP] mpg123: checking pkg-config ...) ifeq ($(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --exists 'libmpg123 >= 1.14.0' && echo yes),yes) -$(call PRINT_INFO,[DEP] mpg123: pkg-config/mpg123) CPPFLAGS_MPG123 := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --cflags-only-I 'libmpg123 >= 1.14.0' ) -DMPT_WITH_MPG123 LDFLAGS_MPG123 := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-L 'libmpg123 >= 1.14.0' ) $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-other 'libmpg123 >= 1.14.0' ) LDLIBS_MPG123 := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-l 'libmpg123 >= 1.14.0' ) PC_REQUIRES_MPG123 := libmpg123 else -$(call PRINT_INFO,[DEP] mpg123: no) ifeq ($(FORCE_DEPS),1) $(error mpg123 not found) else @@ -851,9 +811,7 @@ endif endif -$(call PRINT_TRACE,[DEP] ogg) ifeq ($(LOCAL_OGG),1) -$(call PRINT_INFO,[DEP] ogg: local) CPPFLAGS_OGG := -DMPT_WITH_OGG LDFLAGS_OGG := LDLIBS_OGG := @@ -869,18 +827,14 @@ OBJECTS_OGG = $(OGG_OBJECTS) else ifeq ($(NO_OGG),1) -$(call PRINT_INFO,[DEP] ogg: disabled) else #LDLIBS += -logg -$(call PRINT_DEBUG,[DEP] ogg: checking pkg-config ...) ifeq ($(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --exists ogg && echo yes),yes) -$(call PRINT_INFO,[DEP] ogg: pkg-config/ogg) CPPFLAGS_OGG := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --cflags-only-I ogg ) -DMPT_WITH_OGG LDFLAGS_OGG := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-L ogg ) $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-other ogg ) LDLIBS_OGG := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-l ogg ) PC_REQUIRES_OGG := ogg else -$(call PRINT_INFO,[DEP] ogg: no) ifeq ($(FORCE_DEPS),1) $(error ogg not found) else @@ -891,9 +845,7 @@ endif endif -$(call PRINT_TRACE,[DEP] vorbis) ifeq ($(LOCAL_VORBIS),1) -$(call PRINT_INFO,[DEP] vorbis: local) CPPFLAGS_VORBIS := -DMPT_WITH_VORBIS LDFLAGS_VORBIS := LDLIBS_VORBIS := @@ -932,18 +884,14 @@ OBJECTS_VORBIS = $(VORBIS_OBJECTS) else ifeq ($(NO_VORBIS),1) -$(call PRINT_INFO,[DEP] vorbis: disabled) else #LDLIBS += -lvorbis -$(call PRINT_DEBUG,[DEP] vorbis: checking pkg-config ...) ifeq ($(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --exists vorbis && echo yes),yes) -$(call PRINT_INFO,[DEP] vorbis: pkg-config/vorbis) CPPFLAGS_VORBIS := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --cflags-only-I vorbis ) -DMPT_WITH_VORBIS LDFLAGS_VORBIS := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-L vorbis ) $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-other vorbis ) LDLIBS_VORBIS := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-l vorbis ) PC_REQUIRES_VORBIS := vorbis else -$(call PRINT_INFO,[DEP] vorbis: no) ifeq ($(FORCE_DEPS),1) $(error vorbis not found) else @@ -954,26 +902,20 @@ endif endif -$(call PRINT_TRACE,[DEP] vorbisfile) ifeq ($(LOCAL_VORBIS),1) -$(call PRINT_INFO,[DEP] vorbisfile: local) CPPFLAGS_VORBISFILE := -DMPT_WITH_VORBISFILE LDFLAGS_VORBISFILE := LDLIBS_VORBISFILE := else ifeq ($(NO_VORBISFILE),1) -$(call PRINT_INFO,[DEP] vorbisfile: disabled) else #LDLIBS += -lvorbisfile -$(call PRINT_DEBUG,[DEP] vorbisfile: checking pkg-config ...) ifeq ($(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --exists vorbisfile && echo yes),yes) -$(call PRINT_INFO,[DEP] vorbisfile: pkg-config/vorbisfile) CPPFLAGS_VORBISFILE := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --cflags-only-I vorbisfile ) -DMPT_WITH_VORBISFILE LDFLAGS_VORBISFILE := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-L vorbisfile ) $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-other vorbisfile ) LDLIBS_VORBISFILE := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-l vorbisfile ) PC_REQUIRES_VORBISFILE := vorbisfile else -$(call PRINT_INFO,[DEP] vorbisfile: no) ifeq ($(FORCE_DEPS),1) $(error vorbisfile not found) else @@ -984,19 +926,14 @@ endif endif -$(call PRINT_TRACE,[DEP] SDL2) ifeq ($(NO_SDL2),1) -$(call PRINT_INFO,[DEP] SDL2: disabled) else #LDLIBS += -lsdl2 -$(call PRINT_DEBUG,[DEP] SDL2: checking pkg-config ...) ifeq ($(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --exists 'sdl2 >= 2.0.4' && echo yes),yes) -$(call PRINT_INFO,[DEP] SDL2: pkg-config/sdl2) CPPFLAGS_SDL2 := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --cflags-only-I 'sdl2 >= 2.0.4' ) -DMPT_WITH_SDL2 LDFLAGS_SDL2 := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-L 'sdl2 >= 2.0.4' ) $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-other 'sdl2 >= 2.0.4' ) LDLIBS_SDL2 := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-l 'sdl2 >= 2.0.4' ) else -$(call PRINT_INFO,[DEP] SDL2: no) ifeq ($(FORCE_DEPS),1) $(error sdl2 not found) else @@ -1006,19 +943,14 @@ endif endif -$(call PRINT_TRACE,[DEP] PortAudio) ifeq ($(NO_PORTAUDIO),1) -$(call PRINT_INFO,[DEP] PortAudio: disabled) else #LDLIBS += -lportaudio -$(call PRINT_DEBUG,[DEP] PortAudio: checking pkg-config ...) ifeq ($(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --exists portaudio-2.0 && echo yes),yes) -$(call PRINT_INFO,[DEP] PortAudio: pkg-config/portaudio-2.0) CPPFLAGS_PORTAUDIO := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --cflags-only-I portaudio-2.0 ) -DMPT_WITH_PORTAUDIO LDFLAGS_PORTAUDIO := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-L portaudio-2.0 ) $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-other portaudio-2.0 ) LDLIBS_PORTAUDIO := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-l portaudio-2.0 ) else -$(call PRINT_INFO,[DEP] PortAudio: no) ifeq ($(FORCE_DEPS),1) $(error portaudio not found) else @@ -1028,19 +960,14 @@ endif endif -$(call PRINT_TRACE,[DEP] PortAudio-C++) ifeq ($(NO_PORTAUDIOCPP),1) -$(call PRINT_INFO,[DEP] PortAudio-C++: disabled) else #LDLIBS += -lportaudiocpp -$(call PRINT_DEBUG,[DEP] PortAudio-C++: checking pkg-config ...) ifeq ($(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --exists portaudiocpp && echo yes),yes) -$(call PRINT_INFO,[DEP] PortAudio-C++: pkg-config/portaudiocpp) CPPFLAGS_PORTAUDIOCPP := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --cflags-only-I portaudiocpp ) -DMPT_WITH_PORTAUDIOCPP LDFLAGS_PORTAUDIOCPP := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-L portaudiocpp ) $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-other portaudiocpp ) LDLIBS_PORTAUDIOCPP := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-l portaudiocpp ) else -$(call PRINT_INFO,[DEP] PortAudio-C++: no) ifeq ($(FORCE_DEPS),1) $(error portaudiocpp not found) else @@ -1050,20 +977,14 @@ endif endif -$(call PRINT_TRACE,[DEP] PulseAudio) ifeq ($(NO_PULSEAUDIO),1) -$(call PRINT_INFO,[DEP] PulseAudio: disabled) else #LDLIBS += -lpulse-simple -$(call PRINT_DEBUG,[DEP] PulseAudio: checking pkg-config ...) ifeq ($(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --exists libpulse libpulse-simple && echo yes),yes) -$(call PRINT_INFO,[DEP] PulseAudio: pkg-config/libpulse) -$(call PRINT_INFO,[DEP] PulseAudio: pkg-config/libpulse-simple) CPPFLAGS_PULSEAUDIO := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --cflags-only-I libpulse libpulse-simple ) -DMPT_WITH_PULSEAUDIO LDFLAGS_PULSEAUDIO := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-L libpulse libpulse-simple ) $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-other libpulse libpulse-simple ) LDLIBS_PULSEAUDIO := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-l libpulse libpulse-simple ) else -$(call PRINT_INFO,[DEP] PulseAudio: no) ifeq ($(FORCE_DEPS),1) $(error pulseaudio not found) else @@ -1073,19 +994,14 @@ endif endif -$(call PRINT_TRACE,[DEP] FLAC) ifeq ($(NO_FLAC),1) -$(call PRINT_INFO,[DEP] FLAC: disabled) else #LDLIBS += -lFLAC -$(call PRINT_DEBUG,[DEP] FLAC: checking pkg-config ...) ifeq ($(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --exists 'flac >= 1.3.0' && echo yes),yes) -$(call PRINT_INFO,[DEP] FLAC: pkg-config/flac) CPPFLAGS_FLAC := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --cflags-only-I 'flac >= 1.3.0' ) -DMPT_WITH_FLAC LDFLAGS_FLAC := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-L 'flac >= 1.3.0' ) $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-other 'flac >= 1.3.0' ) LDLIBS_FLAC := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-l 'flac >= 1.3.0' ) else -$(call PRINT_INFO,[DEP] FLAC: no) ifeq ($(FORCE_DEPS),1) $(error flac not found) else @@ -1095,19 +1011,14 @@ endif endif -$(call PRINT_TRACE,[DEP] sndfile) ifeq ($(NO_SNDFILE),1) -$(call PRINT_INFO,[DEP] sndfile: disabled) else #LDLIBS += -lsndfile -$(call PRINT_DEBUG,[DEP] sndfile: checking pkg-config ...) ifeq ($(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --exists sndfile && echo yes),yes) -$(call PRINT_INFO,[DEP] sndfile: pkg-config/sndfile) CPPFLAGS_SNDFILE := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --cflags-only-I sndfile ) -DMPT_WITH_SNDFILE LDFLAGS_SNDFILE := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-L sndfile ) $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-other sndfile ) LDLIBS_SNDFILE := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-l sndfile ) else -$(call PRINT_INFO,[DEP] sndfile: no) ifeq ($(FORCE_DEPS),1) $(error sndfile not found) else @@ -1117,9 +1028,7 @@ endif endif -$(call PRINT_TRACE,[DEP] Allegro-4.2) ifeq ($(USE_ALLEGRO42),1) -$(call PRINT_INFO,[DEP] Allegro-4.2: local) CPPFLAGS_ALLEGRO42 := -Iinclude/allegro42/include -DALLEGRO_HAVE_STDINT_H -DLONG_LONG="long long" -DMPT_WITH_ALLEGRO42 LDFLAGS_ALLEGRO42 := @@ -1132,8 +1041,6 @@ MISC_OUTPUTS += include/allegro42/lib/djgpp/liballeg.a -else -$(call PRINT_INFO,[DEP] Allegro-4.2: disabled) endif |
|
From: <sv...@op...> - 2024-10-28 14:44:57
|
Author: manx Date: Mon Oct 28 15:44:45 2024 New Revision: 22025 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22025 Log: Merged revision(s) 22021 from trunk/OpenMPT: [Fix] mpg123: Fix DJGPP compatibility. ........ Modified: branches/OpenMPT-1.28/ (props changed) branches/OpenMPT-1.28/include/mpg123/OpenMPT.txt branches/OpenMPT-1.28/include/mpg123/src/compat/compat.c Modified: branches/OpenMPT-1.28/include/mpg123/OpenMPT.txt ============================================================================== --- branches/OpenMPT-1.28/include/mpg123/OpenMPT.txt Mon Oct 28 15:44:24 2024 (r22024) +++ branches/OpenMPT-1.28/include/mpg123/OpenMPT.txt Mon Oct 28 15:44:45 2024 (r22025) @@ -5,6 +5,7 @@ * `ports/Xcode/config.h` has been modified to let the build system set `OPT_*`. * `ports/Xcode/config.h` has been modified to `#define HAVE_DIRENT_H`. + * `src/compat/compat.c` has been modified for DJGPP compatibility. * Modifications are marked by `// OpenMPT` or `/* OpenMPT */`. * Obviously, unnecessary folders and files have been removed. * For building, premake is used to generate Visual Studio project files. Modified: branches/OpenMPT-1.28/include/mpg123/src/compat/compat.c ============================================================================== --- branches/OpenMPT-1.28/include/mpg123/src/compat/compat.c Mon Oct 28 15:44:24 2024 (r22024) +++ branches/OpenMPT-1.28/include/mpg123/src/compat/compat.c Mon Oct 28 15:44:45 2024 (r22025) @@ -10,8 +10,10 @@ */ #include "config.h" +#if !defined(__DJGPP__) /* OpenMPT */ /* This source file does need _POSIX_SOURCE to get some sigaction. */ #define _POSIX_SOURCE +#endif /* OpenMPT */ #include "compat.h" #ifdef _MSC_VER |
|
From: <sv...@op...> - 2024-10-28 14:44:36
|
Author: manx Date: Mon Oct 28 15:44:24 2024 New Revision: 22024 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22024 Log: Merged revision(s) 22021 from trunk/OpenMPT: [Fix] mpg123: Fix DJGPP compatibility. ........ Modified: branches/OpenMPT-1.29/ (props changed) branches/OpenMPT-1.29/include/mpg123/OpenMPT.txt branches/OpenMPT-1.29/include/mpg123/src/compat/compat.c Modified: branches/OpenMPT-1.29/include/mpg123/OpenMPT.txt ============================================================================== --- branches/OpenMPT-1.29/include/mpg123/OpenMPT.txt Mon Oct 28 15:44:01 2024 (r22023) +++ branches/OpenMPT-1.29/include/mpg123/OpenMPT.txt Mon Oct 28 15:44:24 2024 (r22024) @@ -6,6 +6,7 @@ * `ports/Xcode/config.h` has been modified to let the build system set `OPT_*`. * `ports/Xcode/config.h` has been modified to `#define HAVE_DIRENT_H`. + * `src/compat/compat.c` has been modified for DJGPP compatibility. * Modifications are marked by `// OpenMPT` or `/* OpenMPT */`. * Obviously, unnecessary folders and files have been removed. * For building, premake is used to generate Visual Studio project files. Modified: branches/OpenMPT-1.29/include/mpg123/src/compat/compat.c ============================================================================== --- branches/OpenMPT-1.29/include/mpg123/src/compat/compat.c Mon Oct 28 15:44:01 2024 (r22023) +++ branches/OpenMPT-1.29/include/mpg123/src/compat/compat.c Mon Oct 28 15:44:24 2024 (r22024) @@ -10,8 +10,10 @@ */ #include "config.h" +#if !defined(__DJGPP__) /* OpenMPT */ /* This source file does need _POSIX_SOURCE to get some sigaction. */ #define _POSIX_SOURCE +#endif /* OpenMPT */ #include "compat.h" #ifdef _MSC_VER |
|
From: <sv...@op...> - 2024-10-28 14:44:13
|
Author: manx Date: Mon Oct 28 15:44:01 2024 New Revision: 22023 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22023 Log: Merged revision(s) 22021 from trunk/OpenMPT: [Fix] mpg123: Fix DJGPP compatibility. ........ Modified: branches/OpenMPT-1.30/ (props changed) branches/OpenMPT-1.30/include/mpg123/OpenMPT.txt branches/OpenMPT-1.30/include/mpg123/src/compat/compat.c Modified: branches/OpenMPT-1.30/include/mpg123/OpenMPT.txt ============================================================================== --- branches/OpenMPT-1.30/include/mpg123/OpenMPT.txt Mon Oct 28 15:43:38 2024 (r22022) +++ branches/OpenMPT-1.30/include/mpg123/OpenMPT.txt Mon Oct 28 15:44:01 2024 (r22023) @@ -6,6 +6,7 @@ * `ports/Xcode/config.h` has been modified to let the build system set `OPT_*`. * `ports/Xcode/config.h` has been modified to `#define HAVE_DIRENT_H`. + * `src/compat/compat.c` has been modified for DJGPP compatibility. * Modifications are marked by `// OpenMPT` or `/* OpenMPT */`. * Obviously, unnecessary folders and files have been removed. * For building, premake is used to generate Visual Studio project files. Modified: branches/OpenMPT-1.30/include/mpg123/src/compat/compat.c ============================================================================== --- branches/OpenMPT-1.30/include/mpg123/src/compat/compat.c Mon Oct 28 15:43:38 2024 (r22022) +++ branches/OpenMPT-1.30/include/mpg123/src/compat/compat.c Mon Oct 28 15:44:01 2024 (r22023) @@ -10,8 +10,10 @@ */ #include "config.h" +#if !defined(__DJGPP__) /* OpenMPT */ /* This source file does need _POSIX_SOURCE to get some sigaction. */ #define _POSIX_SOURCE +#endif /* OpenMPT */ #include "compat.h" #ifdef _MSC_VER |
|
From: <sv...@op...> - 2024-10-28 14:43:52
|
Author: manx Date: Mon Oct 28 15:43:38 2024 New Revision: 22022 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22022 Log: Merged revision(s) 22021 from trunk/OpenMPT: [Fix] mpg123: Fix DJGPP compatibility. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/include/mpg123/OpenMPT.txt branches/OpenMPT-1.31/include/mpg123/src/compat/compat.c Modified: branches/OpenMPT-1.31/include/mpg123/OpenMPT.txt ============================================================================== --- branches/OpenMPT-1.31/include/mpg123/OpenMPT.txt Mon Oct 28 15:43:02 2024 (r22021) +++ branches/OpenMPT-1.31/include/mpg123/OpenMPT.txt Mon Oct 28 15:43:38 2024 (r22022) @@ -6,6 +6,7 @@ * `ports/Xcode/config.h` has been modified to let the build system set `OPT_*`. * `ports/Xcode/config.h` has been modified to `#define HAVE_DIRENT_H`. + * `src/compat/compat.c` has been modified for DJGPP compatibility. * Modifications are marked by `// OpenMPT` or `/* OpenMPT */`. * Obviously, unnecessary folders and files have been removed. * For building, premake is used to generate Visual Studio project files. Modified: branches/OpenMPT-1.31/include/mpg123/src/compat/compat.c ============================================================================== --- branches/OpenMPT-1.31/include/mpg123/src/compat/compat.c Mon Oct 28 15:43:02 2024 (r22021) +++ branches/OpenMPT-1.31/include/mpg123/src/compat/compat.c Mon Oct 28 15:43:38 2024 (r22022) @@ -10,8 +10,10 @@ */ #include "config.h" +#if !defined(__DJGPP__) /* OpenMPT */ /* This source file does need _POSIX_SOURCE to get some sigaction. */ #define _POSIX_SOURCE +#endif /* OpenMPT */ #include "compat.h" #ifdef _MSC_VER |
|
From: <sv...@op...> - 2024-10-28 14:43:09
|
Author: manx Date: Mon Oct 28 15:43:02 2024 New Revision: 22021 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22021 Log: [Fix] mpg123: Fix DJGPP compatibility. Modified: trunk/OpenMPT/include/mpg123/OpenMPT.txt trunk/OpenMPT/include/mpg123/src/compat/compat.c Modified: trunk/OpenMPT/include/mpg123/OpenMPT.txt ============================================================================== --- trunk/OpenMPT/include/mpg123/OpenMPT.txt Mon Oct 28 15:07:31 2024 (r22020) +++ trunk/OpenMPT/include/mpg123/OpenMPT.txt Mon Oct 28 15:43:02 2024 (r22021) @@ -6,6 +6,7 @@ * `ports/Xcode/config.h` has been modified to let the build system set `OPT_*`. * `ports/Xcode/config.h` has been modified to `#define HAVE_DIRENT_H`. + * `src/compat/compat.c` has been modified for DJGPP compatibility. * Modifications are marked by `// OpenMPT` or `/* OpenMPT */`. * Obviously, unnecessary folders and files have been removed. * For building, premake is used to generate Visual Studio project files. Modified: trunk/OpenMPT/include/mpg123/src/compat/compat.c ============================================================================== --- trunk/OpenMPT/include/mpg123/src/compat/compat.c Mon Oct 28 15:07:31 2024 (r22020) +++ trunk/OpenMPT/include/mpg123/src/compat/compat.c Mon Oct 28 15:43:02 2024 (r22021) @@ -10,8 +10,10 @@ */ #include "config.h" +#if !defined(__DJGPP__) /* OpenMPT */ /* This source file does need _POSIX_SOURCE to get some sigaction. */ #define _POSIX_SOURCE +#endif /* OpenMPT */ #include "compat.h" #ifdef _MSC_VER |
|
From: <sv...@op...> - 2024-10-28 14:07:43
|
Author: manx Date: Mon Oct 28 15:07:31 2024 New Revision: 22020 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22020 Log: [Imp] build: Makefile: Be more verbose (i.e. at all) about which dependencies are detected/used. Modified: trunk/OpenMPT/Makefile Modified: trunk/OpenMPT/Makefile ============================================================================== --- trunk/OpenMPT/Makefile Mon Oct 28 15:06:18 2024 (r22019) +++ trunk/OpenMPT/Makefile Mon Oct 28 15:07:31 2024 (r22020) @@ -144,18 +144,41 @@ INFO = @echo SILENT = @ VERYSILENT = @ - +define PRINT_TRACE +endef +define PRINT_DEBUG +endef +define PRINT_INFO +$(info $1) +endef ifeq ($(VERBOSE),2) INFO = @true SILENT = VERYSILENT = +define PRINT_TRACE +$(info $1) +endef +define PRINT_DEBUG +$(info $1) +endef +define PRINT_INFO +$(info $1) +endef endif ifeq ($(VERBOSE),1) INFO = @true SILENT = VERYSILENT = @ +define PRINT_TRACE +endef +define PRINT_DEBUG +$(info $1) +endef +define PRINT_INFO +$(info $1) +endef endif @@ -163,9 +186,14 @@ INFO = @true SILENT = @ VERYSILENT = @ +define PRINT_TRACE +endef +define PRINT_DEBUG +endef +define PRINT_INFO +endef endif - # general settings DYNLINK=1 @@ -642,7 +670,9 @@ NO_ZLIB:=1 endif +$(call PRINT_TRACE,[DEP] zlib) ifeq ($(LOCAL_ZLIB),1) +$(call PRINT_INFO,[DEP] zlib: local) CPPFLAGS_ZLIB := -DMPT_WITH_ZLIB LDFLAGS_ZLIB := LDLIBS_ZLIB := @@ -671,14 +701,18 @@ OBJECTS_ZLIB = $(ZLIB_OBJECTS) else ifeq ($(NO_ZLIB),1) +$(call PRINT_INFO,[DEP] zlib: disabled) else #LDLIBS += -lz +$(call PRINT_DEBUG,[DEP] zlib: checking pkg-config ...) ifeq ($(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --exists zlib && echo yes),yes) +$(call PRINT_INFO,[DEP] zlib: pkg-config/zlib) CPPFLAGS_ZLIB := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --cflags-only-I zlib ) -DMPT_WITH_ZLIB LDFLAGS_ZLIB := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-L zlib ) $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-other zlib ) LDLIBS_ZLIB := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-l zlib ) PC_REQUIRES_ZLIB := zlib else +$(call PRINT_INFO,[DEP] zlib: no) ifeq ($(FORCE_DEPS),1) $(error zlib not found) else @@ -689,7 +723,9 @@ endif endif +$(call PRINT_TRACE,[DEP] mpg123) ifeq ($(LOCAL_MPG123),1) +$(call PRINT_INFO,[DEP] mpg123: local) ifeq ($(ENABLE_DXE),1) @@ -793,14 +829,18 @@ else ifeq ($(NO_MPG123),1) +$(call PRINT_INFO,[DEP] mpg123: disabled) else #LDLIBS += -lmpg123 +$(call PRINT_DEBUG,[DEP] mpg123: checking pkg-config ...) ifeq ($(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --exists 'libmpg123 >= 1.14.0' && echo yes),yes) +$(call PRINT_INFO,[DEP] mpg123: pkg-config/mpg123) CPPFLAGS_MPG123 := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --cflags-only-I 'libmpg123 >= 1.14.0' ) -DMPT_WITH_MPG123 LDFLAGS_MPG123 := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-L 'libmpg123 >= 1.14.0' ) $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-other 'libmpg123 >= 1.14.0' ) LDLIBS_MPG123 := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-l 'libmpg123 >= 1.14.0' ) PC_REQUIRES_MPG123 := libmpg123 else +$(call PRINT_INFO,[DEP] mpg123: no) ifeq ($(FORCE_DEPS),1) $(error mpg123 not found) else @@ -811,7 +851,9 @@ endif endif +$(call PRINT_TRACE,[DEP] ogg) ifeq ($(LOCAL_OGG),1) +$(call PRINT_INFO,[DEP] ogg: local) CPPFLAGS_OGG := -DMPT_WITH_OGG LDFLAGS_OGG := LDLIBS_OGG := @@ -827,14 +869,18 @@ OBJECTS_OGG = $(OGG_OBJECTS) else ifeq ($(NO_OGG),1) +$(call PRINT_INFO,[DEP] ogg: disabled) else #LDLIBS += -logg +$(call PRINT_DEBUG,[DEP] ogg: checking pkg-config ...) ifeq ($(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --exists ogg && echo yes),yes) +$(call PRINT_INFO,[DEP] ogg: pkg-config/ogg) CPPFLAGS_OGG := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --cflags-only-I ogg ) -DMPT_WITH_OGG LDFLAGS_OGG := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-L ogg ) $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-other ogg ) LDLIBS_OGG := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-l ogg ) PC_REQUIRES_OGG := ogg else +$(call PRINT_INFO,[DEP] ogg: no) ifeq ($(FORCE_DEPS),1) $(error ogg not found) else @@ -845,7 +891,9 @@ endif endif +$(call PRINT_TRACE,[DEP] vorbis) ifeq ($(LOCAL_VORBIS),1) +$(call PRINT_INFO,[DEP] vorbis: local) CPPFLAGS_VORBIS := -DMPT_WITH_VORBIS LDFLAGS_VORBIS := LDLIBS_VORBIS := @@ -884,14 +932,18 @@ OBJECTS_VORBIS = $(VORBIS_OBJECTS) else ifeq ($(NO_VORBIS),1) +$(call PRINT_INFO,[DEP] vorbis: disabled) else #LDLIBS += -lvorbis +$(call PRINT_DEBUG,[DEP] vorbis: checking pkg-config ...) ifeq ($(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --exists vorbis && echo yes),yes) +$(call PRINT_INFO,[DEP] vorbis: pkg-config/vorbis) CPPFLAGS_VORBIS := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --cflags-only-I vorbis ) -DMPT_WITH_VORBIS LDFLAGS_VORBIS := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-L vorbis ) $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-other vorbis ) LDLIBS_VORBIS := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-l vorbis ) PC_REQUIRES_VORBIS := vorbis else +$(call PRINT_INFO,[DEP] vorbis: no) ifeq ($(FORCE_DEPS),1) $(error vorbis not found) else @@ -902,20 +954,26 @@ endif endif +$(call PRINT_TRACE,[DEP] vorbisfile) ifeq ($(LOCAL_VORBIS),1) +$(call PRINT_INFO,[DEP] vorbisfile: local) CPPFLAGS_VORBISFILE := -DMPT_WITH_VORBISFILE LDFLAGS_VORBISFILE := LDLIBS_VORBISFILE := else ifeq ($(NO_VORBISFILE),1) +$(call PRINT_INFO,[DEP] vorbisfile: disabled) else #LDLIBS += -lvorbisfile +$(call PRINT_DEBUG,[DEP] vorbisfile: checking pkg-config ...) ifeq ($(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --exists vorbisfile && echo yes),yes) +$(call PRINT_INFO,[DEP] vorbisfile: pkg-config/vorbisfile) CPPFLAGS_VORBISFILE := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --cflags-only-I vorbisfile ) -DMPT_WITH_VORBISFILE LDFLAGS_VORBISFILE := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-L vorbisfile ) $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-other vorbisfile ) LDLIBS_VORBISFILE := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-l vorbisfile ) PC_REQUIRES_VORBISFILE := vorbisfile else +$(call PRINT_INFO,[DEP] vorbisfile: no) ifeq ($(FORCE_DEPS),1) $(error vorbisfile not found) else @@ -926,14 +984,19 @@ endif endif +$(call PRINT_TRACE,[DEP] SDL2) ifeq ($(NO_SDL2),1) +$(call PRINT_INFO,[DEP] SDL2: disabled) else #LDLIBS += -lsdl2 +$(call PRINT_DEBUG,[DEP] SDL2: checking pkg-config ...) ifeq ($(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --exists 'sdl2 >= 2.0.4' && echo yes),yes) +$(call PRINT_INFO,[DEP] SDL2: pkg-config/sdl2) CPPFLAGS_SDL2 := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --cflags-only-I 'sdl2 >= 2.0.4' ) -DMPT_WITH_SDL2 LDFLAGS_SDL2 := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-L 'sdl2 >= 2.0.4' ) $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-other 'sdl2 >= 2.0.4' ) LDLIBS_SDL2 := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-l 'sdl2 >= 2.0.4' ) else +$(call PRINT_INFO,[DEP] SDL2: no) ifeq ($(FORCE_DEPS),1) $(error sdl2 not found) else @@ -943,14 +1006,19 @@ endif endif +$(call PRINT_TRACE,[DEP] PortAudio) ifeq ($(NO_PORTAUDIO),1) +$(call PRINT_INFO,[DEP] PortAudio: disabled) else #LDLIBS += -lportaudio +$(call PRINT_DEBUG,[DEP] PortAudio: checking pkg-config ...) ifeq ($(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --exists portaudio-2.0 && echo yes),yes) +$(call PRINT_INFO,[DEP] PortAudio: pkg-config/portaudio-2.0) CPPFLAGS_PORTAUDIO := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --cflags-only-I portaudio-2.0 ) -DMPT_WITH_PORTAUDIO LDFLAGS_PORTAUDIO := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-L portaudio-2.0 ) $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-other portaudio-2.0 ) LDLIBS_PORTAUDIO := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-l portaudio-2.0 ) else +$(call PRINT_INFO,[DEP] PortAudio: no) ifeq ($(FORCE_DEPS),1) $(error portaudio not found) else @@ -960,14 +1028,19 @@ endif endif +$(call PRINT_TRACE,[DEP] PortAudio-C++) ifeq ($(NO_PORTAUDIOCPP),1) +$(call PRINT_INFO,[DEP] PortAudio-C++: disabled) else #LDLIBS += -lportaudiocpp +$(call PRINT_DEBUG,[DEP] PortAudio-C++: checking pkg-config ...) ifeq ($(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --exists portaudiocpp && echo yes),yes) +$(call PRINT_INFO,[DEP] PortAudio-C++: pkg-config/portaudiocpp) CPPFLAGS_PORTAUDIOCPP := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --cflags-only-I portaudiocpp ) -DMPT_WITH_PORTAUDIOCPP LDFLAGS_PORTAUDIOCPP := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-L portaudiocpp ) $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-other portaudiocpp ) LDLIBS_PORTAUDIOCPP := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-l portaudiocpp ) else +$(call PRINT_INFO,[DEP] PortAudio-C++: no) ifeq ($(FORCE_DEPS),1) $(error portaudiocpp not found) else @@ -977,14 +1050,20 @@ endif endif +$(call PRINT_TRACE,[DEP] PulseAudio) ifeq ($(NO_PULSEAUDIO),1) +$(call PRINT_INFO,[DEP] PulseAudio: disabled) else #LDLIBS += -lpulse-simple +$(call PRINT_DEBUG,[DEP] PulseAudio: checking pkg-config ...) ifeq ($(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --exists libpulse libpulse-simple && echo yes),yes) +$(call PRINT_INFO,[DEP] PulseAudio: pkg-config/libpulse) +$(call PRINT_INFO,[DEP] PulseAudio: pkg-config/libpulse-simple) CPPFLAGS_PULSEAUDIO := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --cflags-only-I libpulse libpulse-simple ) -DMPT_WITH_PULSEAUDIO LDFLAGS_PULSEAUDIO := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-L libpulse libpulse-simple ) $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-other libpulse libpulse-simple ) LDLIBS_PULSEAUDIO := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-l libpulse libpulse-simple ) else +$(call PRINT_INFO,[DEP] PulseAudio: no) ifeq ($(FORCE_DEPS),1) $(error pulseaudio not found) else @@ -994,14 +1073,19 @@ endif endif +$(call PRINT_TRACE,[DEP] FLAC) ifeq ($(NO_FLAC),1) +$(call PRINT_INFO,[DEP] FLAC: disabled) else #LDLIBS += -lFLAC +$(call PRINT_DEBUG,[DEP] FLAC: checking pkg-config ...) ifeq ($(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --exists 'flac >= 1.3.0' && echo yes),yes) +$(call PRINT_INFO,[DEP] FLAC: pkg-config/flac) CPPFLAGS_FLAC := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --cflags-only-I 'flac >= 1.3.0' ) -DMPT_WITH_FLAC LDFLAGS_FLAC := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-L 'flac >= 1.3.0' ) $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-other 'flac >= 1.3.0' ) LDLIBS_FLAC := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-l 'flac >= 1.3.0' ) else +$(call PRINT_INFO,[DEP] FLAC: no) ifeq ($(FORCE_DEPS),1) $(error flac not found) else @@ -1011,14 +1095,19 @@ endif endif +$(call PRINT_TRACE,[DEP] sndfile) ifeq ($(NO_SNDFILE),1) +$(call PRINT_INFO,[DEP] sndfile: disabled) else #LDLIBS += -lsndfile +$(call PRINT_DEBUG,[DEP] sndfile: checking pkg-config ...) ifeq ($(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --exists sndfile && echo yes),yes) +$(call PRINT_INFO,[DEP] sndfile: pkg-config/sndfile) CPPFLAGS_SNDFILE := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --cflags-only-I sndfile ) -DMPT_WITH_SNDFILE LDFLAGS_SNDFILE := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-L sndfile ) $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-other sndfile ) LDLIBS_SNDFILE := $(shell $(PKG_CONFIG)$(TOOLCHAIN_SUFFIX) --libs-only-l sndfile ) else +$(call PRINT_INFO,[DEP] sndfile: no) ifeq ($(FORCE_DEPS),1) $(error sndfile not found) else @@ -1028,7 +1117,9 @@ endif endif +$(call PRINT_TRACE,[DEP] Allegro-4.2) ifeq ($(USE_ALLEGRO42),1) +$(call PRINT_INFO,[DEP] Allegro-4.2: local) CPPFLAGS_ALLEGRO42 := -Iinclude/allegro42/include -DALLEGRO_HAVE_STDINT_H -DLONG_LONG="long long" -DMPT_WITH_ALLEGRO42 LDFLAGS_ALLEGRO42 := @@ -1041,6 +1132,8 @@ MISC_OUTPUTS += include/allegro42/lib/djgpp/liballeg.a +else +$(call PRINT_INFO,[DEP] Allegro-4.2: disabled) endif |
|
From: <sv...@op...> - 2024-10-28 14:06:31
|
Author: manx Date: Mon Oct 28 15:06:18 2024 New Revision: 22019 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22019 Log: [Doc] libopenmpt: Update changelog. Modified: branches/OpenMPT-1.28/libopenmpt/dox/changelog.md Modified: branches/OpenMPT-1.28/libopenmpt/dox/changelog.md ============================================================================== --- branches/OpenMPT-1.28/libopenmpt/dox/changelog.md Mon Oct 28 15:06:12 2024 (r22018) +++ branches/OpenMPT-1.28/libopenmpt/dox/changelog.md Mon Oct 28 15:06:18 2024 (r22019) @@ -7,7 +7,7 @@ ### libopenmpt 0.4.47-pre - * mpg123: Update to v1.32.8 (2024-10-26). + * mpg123: Update to v1.32.9-dev+r5448 (2024-10-28). ### libopenmpt 0.4.46 (2024-10-26) |
3 messages has been excluded from this view by a project administrator.
