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
(120) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <sv...@op...> - 2024-09-01 08:33:20
|
Author: manx Date: Sun Sep 1 10:33:07 2024 New Revision: 21564 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21564 Log: Merged revision(s) 21562 from trunk/OpenMPT: [Fix] openmpt123: Work-around cppcheck 2.15.0 getting very confused about Linux glibc headers: "/usr/include/x86_64-linux-gnu/sys/types.h:230: warning: error: There is an unknown macro here somewhere. Configuration is required. If __END_DECLS is a macro then please configure it. [unknownMacro]". ........ Modified: branches/OpenMPT-1.30/ (props changed) branches/OpenMPT-1.30/openmpt123/openmpt123.cpp Modified: branches/OpenMPT-1.30/openmpt123/openmpt123.cpp ============================================================================== --- branches/OpenMPT-1.30/openmpt123/openmpt123.cpp Sun Sep 1 10:32:29 2024 (r21563) +++ branches/OpenMPT-1.30/openmpt123/openmpt123.cpp Sun Sep 1 10:33:07 2024 (r21564) @@ -62,7 +62,9 @@ #include <cstring> #include <ctime> -#if defined(__DJGPP__) +#if defined(CPPCHECK) +// cppcheck 2.15.0 gets confused by linux/glibc headers +#elif defined(__DJGPP__) #include <conio.h> #include <dpmi.h> #include <fcntl.h> |
|
From: <sv...@op...> - 2024-09-01 08:32:36
|
Author: manx Date: Sun Sep 1 10:32:29 2024 New Revision: 21563 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21563 Log: Merged revision(s) 21562 from trunk/OpenMPT: [Fix] openmpt123: Work-around cppcheck 2.15.0 getting very confused about Linux glibc headers: "/usr/include/x86_64-linux-gnu/sys/types.h:230: warning: error: There is an unknown macro here somewhere. Configuration is required. If __END_DECLS is a macro then please configure it. [unknownMacro]". ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/openmpt123/openmpt123.cpp Modified: branches/OpenMPT-1.31/openmpt123/openmpt123.cpp ============================================================================== --- branches/OpenMPT-1.31/openmpt123/openmpt123.cpp Sun Sep 1 10:31:56 2024 (r21562) +++ branches/OpenMPT-1.31/openmpt123/openmpt123.cpp Sun Sep 1 10:32:29 2024 (r21563) @@ -69,7 +69,9 @@ #include <cstring> #include <ctime> -#if MPT_OS_DJGPP +#if defined(CPPCHECK) +// cppcheck 2.15.0 gets confused by linux/glibc headers +#elif MPT_OS_DJGPP #include <conio.h> #include <crt0.h> #include <dpmi.h> |
|
From: <sv...@op...> - 2024-09-01 08:32:03
|
Author: manx Date: Sun Sep 1 10:31:56 2024 New Revision: 21562 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21562 Log: [Fix] openmpt123: Work-around cppcheck 2.15.0 getting very confused about Linux glibc headers: "/usr/include/x86_64-linux-gnu/sys/types.h:230: warning: error: There is an unknown macro here somewhere. Configuration is required. If __END_DECLS is a macro then please configure it. [unknownMacro]". Modified: trunk/OpenMPT/openmpt123/openmpt123.cpp Modified: trunk/OpenMPT/openmpt123/openmpt123.cpp ============================================================================== --- trunk/OpenMPT/openmpt123/openmpt123.cpp Sun Sep 1 09:40:48 2024 (r21561) +++ trunk/OpenMPT/openmpt123/openmpt123.cpp Sun Sep 1 10:31:56 2024 (r21562) @@ -73,7 +73,9 @@ #include <cstdlib> #include <cstring> -#if MPT_OS_DJGPP +#if defined(CPPCHECK) +// cppcheck 2.15.0 gets confused by linux/glibc headers +#elif MPT_OS_DJGPP #include <conio.h> #include <crt0.h> #include <dpmi.h> |
|
From: <sv...@op...> - 2024-09-01 07:40:56
|
Author: manx Date: Sun Sep 1 09:40:48 2024 New Revision: 21561 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21561 Log: [Ref] mpt/random/engine_lcg.hpp: Silence bogus MSVC static analyzer warning. Modified: trunk/OpenMPT/src/mpt/random/engine_lcg.hpp Modified: trunk/OpenMPT/src/mpt/random/engine_lcg.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/random/engine_lcg.hpp Sat Aug 31 20:26:39 2024 (r21560) +++ trunk/OpenMPT/src/mpt/random/engine_lcg.hpp Sun Sep 1 09:40:48 2024 (r21561) @@ -42,10 +42,10 @@ state_type result = 0; std::array<unsigned int, mpt::align_up<std::size_t>(seed_bits, sizeof(unsigned int) * 8) / (sizeof(unsigned int) * 8)> seeds = {}; seed.generate(seeds.begin(), seeds.end()); - for (std::size_t i = 0; i < mpt::align_up<std::size_t>(seed_bits, sizeof(unsigned int) * 8) / (sizeof(unsigned int) * 8); ++i) { + for (const auto & seed_value : seeds) { result <<= 16; result <<= 16; - result |= static_cast<state_type>(seeds[i]); + result |= static_cast<state_type>(seed_value); } return result; } |
|
From: <sv...@op...> - 2024-08-31 18:26:51
|
Author: manx Date: Sat Aug 31 20:26:39 2024 New Revision: 21560 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21560 Log: Merged revision(s) 21558 from trunk/OpenMPT: [Ref] New cppcheck version, new cppcheck braindamage. Same procedure as with every new version. Silence false-positive. ........ Modified: branches/OpenMPT-1.30/ (props changed) branches/OpenMPT-1.30/soundlib/Load_dsym.cpp Modified: branches/OpenMPT-1.30/soundlib/Load_dsym.cpp ============================================================================== --- branches/OpenMPT-1.30/soundlib/Load_dsym.cpp Sat Aug 31 20:26:16 2024 (r21559) +++ branches/OpenMPT-1.30/soundlib/Load_dsym.cpp Sat Aug 31 20:26:39 2024 (r21560) @@ -124,6 +124,8 @@ // Align length to 4 bytes file.Seek(startPos + ((bitFile.GetPosition() - startPos + 3u) & ~FileReader::off_t(3))); + // cppcheck false-positive + // cppcheck-suppress returnDanglingLifetime return output; } |
|
From: <sv...@op...> - 2024-08-31 18:26:28
|
Author: manx Date: Sat Aug 31 20:26:16 2024 New Revision: 21559 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21559 Log: Merged revision(s) 21558 from trunk/OpenMPT: [Ref] New cppcheck version, new cppcheck braindamage. Same procedure as with every new version. Silence false-positive. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/soundlib/Load_dsym.cpp Modified: branches/OpenMPT-1.31/soundlib/Load_dsym.cpp ============================================================================== --- branches/OpenMPT-1.31/soundlib/Load_dsym.cpp Sat Aug 31 19:47:14 2024 (r21558) +++ branches/OpenMPT-1.31/soundlib/Load_dsym.cpp Sat Aug 31 20:26:16 2024 (r21559) @@ -126,6 +126,8 @@ // Align length to 4 bytes file.Seek(startPos + ((bitFile.GetPosition() - startPos + 3u) & ~FileReader::off_t(3))); + // cppcheck false-positive + // cppcheck-suppress returnDanglingLifetime return output; } |
|
From: <sv...@op...> - 2024-08-31 17:47:26
|
Author: manx Date: Sat Aug 31 19:47:14 2024 New Revision: 21558 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21558 Log: [Ref] New cppcheck version, new cppcheck braindamage. Same procedure as with every new version. Silence false-positive. Modified: trunk/OpenMPT/soundlib/Load_dsym.cpp Modified: trunk/OpenMPT/soundlib/Load_dsym.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_dsym.cpp Sat Aug 31 15:55:00 2024 (r21557) +++ trunk/OpenMPT/soundlib/Load_dsym.cpp Sat Aug 31 19:47:14 2024 (r21558) @@ -126,6 +126,8 @@ // Align length to 4 bytes file.Seek(startPos + ((bitFile.GetPosition() - startPos + 3u) & ~FileReader::pos_type(3))); + // cppcheck false-positive + // cppcheck-suppress returnDanglingLifetime return output; } |
|
From: <sv...@op...> - 2024-08-31 13:55:12
|
Author: sagamusix Date: Sat Aug 31 15:55:00 2024 New Revision: 21557 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21557 Log: Merged revision(s) 21556 from trunk/OpenMPT: [Fix] Avoid crash in plugin bridge if plugin changes channel configuration without telling us (observed with Surge XT via vst3ishell, https://bugs.openmpt.org/view.php?id=1807). ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/pluginBridge/Bridge.cpp Modified: branches/OpenMPT-1.31/pluginBridge/Bridge.cpp ============================================================================== --- branches/OpenMPT-1.31/pluginBridge/Bridge.cpp Sat Aug 31 15:53:58 2024 (r21556) +++ branches/OpenMPT-1.31/pluginBridge/Bridge.cpp Sat Aug 31 15:55:00 2024 (r21557) @@ -478,6 +478,9 @@ // [value]: 0 means "turn off", 1 means "turn on" ::SetThreadPriority(m_audioThread, msg.value ? THREAD_PRIORITY_ABOVE_NORMAL : THREAD_PRIORITY_NORMAL); m_sharedMem->tailSize = static_cast<int32>(Dispatch(effGetTailSize, 0, 0, nullptr, 0.0f)); + // Plugin should tell us if number of channels changes through audioMasterIOChanged, but Surge XT via vst3ishell has been observed not to do that. + if(msg.value) + DispatchToHost(audioMasterVendorSpecific, kVendorOpenMPT, kUpdateProcessingBuffer, nullptr, 0.0f); break; case effEditGetRect: |
|
From: <sv...@op...> - 2024-08-31 13:54:05
|
Author: sagamusix Date: Sat Aug 31 15:53:58 2024 New Revision: 21556 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21556 Log: [Fix] Avoid crash in plugin bridge if plugin changes channel configuration without telling us (observed with Surge XT via vst3ishell, https://bugs.openmpt.org/view.php?id=1807). Modified: trunk/OpenMPT/pluginBridge/Bridge.cpp Modified: trunk/OpenMPT/pluginBridge/Bridge.cpp ============================================================================== --- trunk/OpenMPT/pluginBridge/Bridge.cpp Sat Aug 31 14:20:12 2024 (r21555) +++ trunk/OpenMPT/pluginBridge/Bridge.cpp Sat Aug 31 15:53:58 2024 (r21556) @@ -476,6 +476,9 @@ // [value]: 0 means "turn off", 1 means "turn on" ::SetThreadPriority(m_audioThread, msg.value ? THREAD_PRIORITY_ABOVE_NORMAL : THREAD_PRIORITY_NORMAL); m_sharedMem->tailSize = static_cast<int32>(Dispatch(effGetTailSize, 0, 0, nullptr, 0.0f)); + // Plugin should tell us if number of channels changes through audioMasterIOChanged, but Surge XT via vst3ishell has been observed not to do that. + if(msg.value) + DispatchToHost(audioMasterVendorSpecific, kVendorOpenMPT, kUpdateProcessingBuffer, nullptr, 0.0f); break; case effEditGetRect: |
|
From: <sv...@op...> - 2024-08-31 12:20:19
|
Author: manx Date: Sat Aug 31 14:20:12 2024 New Revision: 21555 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21555 Log: [Var] Run clang-format. Modified: trunk/OpenMPT/src/mpt/random/engine.hpp Modified: trunk/OpenMPT/src/mpt/random/engine.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/random/engine.hpp Sat Aug 31 14:12:26 2024 (r21554) +++ trunk/OpenMPT/src/mpt/random/engine.hpp Sat Aug 31 14:20:12 2024 (r21555) @@ -64,7 +64,7 @@ template <> struct engine_seed_traits<std::ranlux24_base> { - static inline constexpr std::size_t seed_bits = std::ranlux24_base::word_size; + static inline constexpr std::size_t seed_bits = std::ranlux24_base::word_size; }; template <> |
Author: manx Date: Sat Aug 31 14:12:26 2024 New Revision: 21554 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21554 Log: [Ref] mpt/random: Remove dependency from engine.hpp on seed.hpp. [Ref] mpt/random: Move mpt::make_prng into seed.hpp. [Ref] mpt/random: Small cleanups. Modified: trunk/OpenMPT/mptrack/Mptrack.cpp trunk/OpenMPT/openmpt123/openmpt123.cpp trunk/OpenMPT/soundlib/Sndfile.cpp trunk/OpenMPT/soundlib/plugins/LFOPlugin.cpp trunk/OpenMPT/src/mpt/io_file_unique/unique_basename.hpp trunk/OpenMPT/src/mpt/random/engine.hpp trunk/OpenMPT/src/mpt/random/engine_lcg.hpp trunk/OpenMPT/src/mpt/random/seed.hpp trunk/OpenMPT/src/mpt/random/tests/tests_random.hpp trunk/OpenMPT/src/mpt/uuid/tests/tests_uuid.hpp trunk/OpenMPT/src/openmpt/soundbase/Dither.hpp trunk/OpenMPT/src/openmpt/soundbase/DitherSimple.hpp trunk/OpenMPT/test/PlaybackTest.cpp trunk/OpenMPT/test/test.cpp Modified: trunk/OpenMPT/mptrack/Mptrack.cpp ============================================================================== --- trunk/OpenMPT/mptrack/Mptrack.cpp Sat Aug 31 13:20:01 2024 (r21553) +++ trunk/OpenMPT/mptrack/Mptrack.cpp Sat Aug 31 14:12:26 2024 (r21554) @@ -42,6 +42,7 @@ #include "mpt/fs/common_directories.hpp" #include "mpt/fs/fs.hpp" #include "mpt/io_file/outputfile.hpp" +#include "mpt/random/seed.hpp" #include "mpt/string/utility.hpp" #include "openmpt/sounddevice/SoundDeviceManager.hpp" Modified: trunk/OpenMPT/openmpt123/openmpt123.cpp ============================================================================== --- trunk/OpenMPT/openmpt123/openmpt123.cpp Sat Aug 31 13:20:01 2024 (r21553) +++ trunk/OpenMPT/openmpt123/openmpt123.cpp Sat Aug 31 14:12:26 2024 (r21554) @@ -48,6 +48,7 @@ #include "mpt/random/default_engines.hpp" #include "mpt/random/device.hpp" #include "mpt/random/engine.hpp" +#include "mpt/random/seed.hpp" #include <algorithm> #include <deque> Modified: trunk/OpenMPT/soundlib/Sndfile.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Sndfile.cpp Sat Aug 31 13:20:01 2024 (r21553) +++ trunk/OpenMPT/soundlib/Sndfile.cpp Sat Aug 31 14:12:26 2024 (r21554) @@ -25,6 +25,7 @@ #include "../soundlib/AudioCriticalSection.h" #include "mpt/io/io.hpp" #include "mpt/io/io_stdstream.hpp" +#include "mpt/random/seed.hpp" #ifdef MODPLUG_TRACKER #include "../mptrack/Mainfrm.h" Modified: trunk/OpenMPT/soundlib/plugins/LFOPlugin.cpp ============================================================================== --- trunk/OpenMPT/soundlib/plugins/LFOPlugin.cpp Sat Aug 31 13:20:01 2024 (r21553) +++ trunk/OpenMPT/soundlib/plugins/LFOPlugin.cpp Sat Aug 31 14:12:26 2024 (r21554) @@ -18,6 +18,7 @@ #include "../../mptrack/plugins/LFOPluginEditor.h" #endif // MODPLUG_TRACKER #include "mpt/base/numbers.hpp" +#include "mpt/random/seed.hpp" OPENMPT_NAMESPACE_BEGIN Modified: trunk/OpenMPT/src/mpt/io_file_unique/unique_basename.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/io_file_unique/unique_basename.hpp Sat Aug 31 13:20:01 2024 (r21553) +++ trunk/OpenMPT/src/mpt/io_file_unique/unique_basename.hpp Sat Aug 31 14:12:26 2024 (r21554) @@ -10,6 +10,7 @@ #include "mpt/path/os_path.hpp" #include "mpt/random/default_engines.hpp" #include "mpt/random/device.hpp" +#include "mpt/random/seed.hpp" #include "mpt/string_transcode/transcode.hpp" #include "mpt/uuid/uuid.hpp" Modified: trunk/OpenMPT/src/mpt/random/engine.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/random/engine.hpp Sat Aug 31 13:20:01 2024 (r21553) +++ trunk/OpenMPT/src/mpt/random/engine.hpp Sat Aug 31 14:12:26 2024 (r21554) @@ -7,10 +7,7 @@ #include "mpt/base/macros.hpp" #include "mpt/base/namespace.hpp" -#include "mpt/base/numeric.hpp" -#include "mpt/random/seed.hpp" -#include <memory> #include <random> #include <cstddef> @@ -21,15 +18,16 @@ template <typename Trng> +struct engine_seed_traits { + static inline constexpr std::size_t seed_bits = Trng::seed_bits; +}; + +template <typename Trng> struct engine_traits { - typedef typename Trng::result_type result_type; + using result_type = typename Trng::result_type; static MPT_CONSTEXPRINLINE int result_bits() { return Trng::result_bits(); } - template <typename Trd> - static inline Trng make(Trd & rd) { - return Trng(rd); - } }; // C++11 random does not provide any sane way to determine the amount of entropy @@ -37,122 +35,91 @@ // List the ones we are likely to use. template <> +struct engine_seed_traits<std::mt19937> { + static inline constexpr std::size_t seed_bits = sizeof(std::mt19937::result_type) * 8 * std::mt19937::state_size; +}; + +template <> struct engine_traits<std::mt19937> { - enum : std::size_t { - seed_bits = sizeof(std::mt19937::result_type) * 8 * std::mt19937::state_size - }; - typedef std::mt19937 rng_type; - typedef rng_type::result_type result_type; + using rng_type = std::mt19937; + using result_type = rng_type::result_type; static MPT_CONSTEXPRINLINE int result_bits() { return rng_type::word_size; } - template <typename Trd> - static inline rng_type make(Trd & rd) { - std::unique_ptr<mpt::seed_seq_values<mpt::align_up<std::size_t>(seed_bits, sizeof(unsigned int) * 8) / (sizeof(unsigned int) * 8)>> values = std::make_unique<mpt::seed_seq_values<mpt::align_up<std::size_t>(seed_bits, sizeof(unsigned int) * 8) / (sizeof(unsigned int) * 8)>>(rd); - std::seed_seq seed(values->begin(), values->end()); - return rng_type(seed); - } +}; + +template <> +struct engine_seed_traits<std::mt19937_64> { + static inline constexpr std::size_t seed_bits = sizeof(std::mt19937_64::result_type) * 8 * std::mt19937_64::state_size; }; template <> struct engine_traits<std::mt19937_64> { - enum : std::size_t { - seed_bits = sizeof(std::mt19937_64::result_type) * 8 * std::mt19937_64::state_size - }; - typedef std::mt19937_64 rng_type; - typedef rng_type::result_type result_type; + using rng_type = std::mt19937_64; + using result_type = rng_type::result_type; static MPT_CONSTEXPRINLINE int result_bits() { return rng_type::word_size; } - template <typename Trd> - static inline rng_type make(Trd & rd) { - std::unique_ptr<mpt::seed_seq_values<mpt::align_up<std::size_t>(seed_bits, sizeof(unsigned int) * 8) / (sizeof(unsigned int) * 8)>> values = std::make_unique<mpt::seed_seq_values<mpt::align_up<std::size_t>(seed_bits, sizeof(unsigned int) * 8) / (sizeof(unsigned int) * 8)>>(rd); - std::seed_seq seed(values->begin(), values->end()); - return rng_type(seed); - } +}; + +template <> +struct engine_seed_traits<std::ranlux24_base> { + static inline constexpr std::size_t seed_bits = std::ranlux24_base::word_size; }; template <> struct engine_traits<std::ranlux24_base> { - enum : std::size_t { - seed_bits = std::ranlux24_base::word_size - }; - typedef std::ranlux24_base rng_type; - typedef rng_type::result_type result_type; + using rng_type = std::ranlux24_base; + using result_type = rng_type::result_type; static MPT_CONSTEXPRINLINE int result_bits() { return rng_type::word_size; } - template <typename Trd> - static inline rng_type make(Trd & rd) { - mpt::seed_seq_values<mpt::align_up<std::size_t>(seed_bits, sizeof(unsigned int) * 8) / (sizeof(unsigned int) * 8)> values(rd); - std::seed_seq seed(values.begin(), values.end()); - return rng_type(seed); - } +}; + +template <> +struct engine_seed_traits<std::ranlux48_base> { + static inline constexpr std::size_t seed_bits = std::ranlux48_base::word_size; }; template <> struct engine_traits<std::ranlux48_base> { - enum : std::size_t { - seed_bits = std::ranlux48_base::word_size - }; - typedef std::ranlux48_base rng_type; - typedef rng_type::result_type result_type; + using rng_type = std::ranlux48_base; + using result_type = rng_type::result_type; static MPT_CONSTEXPRINLINE int result_bits() { return rng_type::word_size; } - template <typename Trd> - static inline rng_type make(Trd & rd) { - mpt::seed_seq_values<mpt::align_up<std::size_t>(seed_bits, sizeof(unsigned int) * 8) / (sizeof(unsigned int) * 8)> values(rd); - std::seed_seq seed(values.begin(), values.end()); - return rng_type(seed); - } +}; + +template <> +struct engine_seed_traits<std::ranlux24> { + static inline constexpr std::size_t seed_bits = std::ranlux24_base::word_size; }; template <> struct engine_traits<std::ranlux24> { - enum : std::size_t { - seed_bits = std::ranlux24_base::word_size - }; - typedef std::ranlux24 rng_type; - typedef rng_type::result_type result_type; + using rng_type = std::ranlux24; + using result_type = rng_type::result_type; static MPT_CONSTEXPRINLINE int result_bits() { return std::ranlux24_base::word_size; } - template <typename Trd> - static inline rng_type make(Trd & rd) { - mpt::seed_seq_values<mpt::align_up<std::size_t>(seed_bits, sizeof(unsigned int) * 8) / (sizeof(unsigned int) * 8)> values(rd); - std::seed_seq seed(values.begin(), values.end()); - return rng_type(seed); - } +}; + +template <> +struct engine_seed_traits<std::ranlux48> { + static inline constexpr std::size_t seed_bits = std::ranlux48_base::word_size; }; template <> struct engine_traits<std::ranlux48> { - enum : std::size_t { - seed_bits = std::ranlux48_base::word_size - }; - typedef std::ranlux48 rng_type; - typedef rng_type::result_type result_type; + using rng_type = std::ranlux48; + using result_type = rng_type::result_type; static MPT_CONSTEXPRINLINE int result_bits() { return std::ranlux48_base::word_size; } - template <typename Trd> - static inline rng_type make(Trd & rd) { - mpt::seed_seq_values<mpt::align_up<std::size_t>(seed_bits, sizeof(unsigned int) * 8) / (sizeof(unsigned int) * 8)> values(rd); - std::seed_seq seed(values.begin(), values.end()); - return rng_type(seed); - } }; -template <typename Trng, typename Trd> -inline Trng make_prng(Trd & rd) { - return mpt::engine_traits<Trng>::make(rd); -} - - - } // namespace MPT_INLINE_NS } // namespace mpt Modified: trunk/OpenMPT/src/mpt/random/engine_lcg.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/random/engine_lcg.hpp Sat Aug 31 13:20:01 2024 (r21553) +++ trunk/OpenMPT/src/mpt/random/engine_lcg.hpp Sat Aug 31 14:12:26 2024 (r21554) @@ -10,10 +10,12 @@ #include "mpt/base/integer.hpp" #include "mpt/base/namespace.hpp" #include "mpt/base/numeric.hpp" -#include "mpt/random/random.hpp" +#include <array> #include <random> +#include <cstddef> + namespace mpt { @@ -30,14 +32,27 @@ public: typedef Tstate state_type; typedef Tvalue result_type; + static inline constexpr std::size_t seed_bits = sizeof(state_type) * 8; private: state_type state; +private: + static inline state_type seed_state(std::seed_seq & seed) { + state_type result = 0; + std::array<unsigned int, mpt::align_up<std::size_t>(seed_bits, sizeof(unsigned int) * 8) / (sizeof(unsigned int) * 8)> seeds = {}; + seed.generate(seeds.begin(), seeds.end()); + for (std::size_t i = 0; i < mpt::align_up<std::size_t>(seed_bits, sizeof(unsigned int) * 8) / (sizeof(unsigned int) * 8); ++i) { + result <<= 16; + result <<= 16; + result |= static_cast<state_type>(seeds[i]); + } + return result; + } + public: - template <typename Trng> - explicit inline lcg_engine(Trng & rd) - : state(mpt::random<state_type>(rd)) { + explicit inline lcg_engine(std::seed_seq & seed) + : state(seed_state(seed)) { operator()(); // we return results from the current state and update state after returning. results in better pipelining. } explicit inline lcg_engine(state_type seed) Modified: trunk/OpenMPT/src/mpt/random/seed.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/random/seed.hpp Sat Aug 31 13:20:01 2024 (r21553) +++ trunk/OpenMPT/src/mpt/random/seed.hpp Sat Aug 31 14:12:26 2024 (r21554) @@ -6,8 +6,12 @@ #include "mpt/base/namespace.hpp" +#include "mpt/base/numeric.hpp" +#include "mpt/random/engine.hpp" +#include "mpt/random/random.hpp" #include <array> +#include <memory> #include <random> #include <cstddef> @@ -26,9 +30,8 @@ public: template <typename Trd> explicit seed_seq_values(Trd & rd) { - std::uniform_int_distribution<unsigned int> random_int{}; for (std::size_t i = 0; i < N; ++i) { - seeds[i] = random_int(rd); + seeds[i] = mpt::random<unsigned int>(rd); } } const unsigned int * begin() const { @@ -41,6 +44,22 @@ +template <typename Trng, typename Trd> +inline Trng make_prng(Trd & rd) { + constexpr std::size_t num_seed_values = mpt::align_up<std::size_t>(mpt::engine_seed_traits<Trng>::seed_bits, sizeof(unsigned int) * 8) / (sizeof(unsigned int) * 8); + if constexpr (num_seed_values > 128) { + std::unique_ptr<mpt::seed_seq_values<num_seed_values>> values = std::make_unique<mpt::seed_seq_values<num_seed_values>>(rd); + std::seed_seq seed(values.begin(), values.end()); + return Trng(seed); + } else { + mpt::seed_seq_values<num_seed_values> values(rd); + std::seed_seq seed(values.begin(), values.end()); + return Trng(seed); + } +} + + + } // namespace MPT_INLINE_NS } // namespace mpt Modified: trunk/OpenMPT/src/mpt/random/tests/tests_random.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/random/tests/tests_random.hpp Sat Aug 31 13:20:01 2024 (r21553) +++ trunk/OpenMPT/src/mpt/random/tests/tests_random.hpp Sat Aug 31 14:12:26 2024 (r21554) @@ -13,6 +13,7 @@ #include "mpt/random/default_engines.hpp" #include "mpt/random/device.hpp" #include "mpt/random/random.hpp" +#include "mpt/random/seed.hpp" #include "mpt/test/test.hpp" #include "mpt/test/test_macros.hpp" Modified: trunk/OpenMPT/src/mpt/uuid/tests/tests_uuid.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/uuid/tests/tests_uuid.hpp Sat Aug 31 13:20:01 2024 (r21553) +++ trunk/OpenMPT/src/mpt/uuid/tests/tests_uuid.hpp Sat Aug 31 14:12:26 2024 (r21554) @@ -9,6 +9,7 @@ #include "mpt/base/namespace.hpp" #include "mpt/random/default_engines.hpp" #include "mpt/random/device.hpp" +#include "mpt/random/seed.hpp" #include "mpt/string/types.hpp" #include "mpt/test/test.hpp" #include "mpt/test/test_macros.hpp" Modified: trunk/OpenMPT/src/openmpt/soundbase/Dither.hpp ============================================================================== --- trunk/OpenMPT/src/openmpt/soundbase/Dither.hpp Sat Aug 31 13:20:01 2024 (r21553) +++ trunk/OpenMPT/src/openmpt/soundbase/Dither.hpp Sat Aug 31 14:12:26 2024 (r21554) @@ -9,6 +9,7 @@ #include "mpt/base/macros.hpp" #include "mpt/random/default_engines.hpp" #include "mpt/random/engine.hpp" +#include "mpt/random/seed.hpp" #include "openmpt/soundbase/MixSample.hpp" #include <vector> Modified: trunk/OpenMPT/src/openmpt/soundbase/DitherSimple.hpp ============================================================================== --- trunk/OpenMPT/src/openmpt/soundbase/DitherSimple.hpp Sat Aug 31 13:20:01 2024 (r21553) +++ trunk/OpenMPT/src/openmpt/soundbase/DitherSimple.hpp Sat Aug 31 14:12:26 2024 (r21554) @@ -10,6 +10,7 @@ #include "mpt/random/engine.hpp" #include "mpt/random/default_engines.hpp" #include "mpt/random/random.hpp" +#include "mpt/random/seed.hpp" #include "openmpt/base/Types.hpp" #include "openmpt/soundbase/MixSample.hpp" #include "openmpt/soundbase/MixSampleConvert.hpp" Modified: trunk/OpenMPT/test/PlaybackTest.cpp ============================================================================== --- trunk/OpenMPT/test/PlaybackTest.cpp Sat Aug 31 13:20:01 2024 (r21553) +++ trunk/OpenMPT/test/PlaybackTest.cpp Sat Aug 31 14:12:26 2024 (r21554) @@ -20,6 +20,8 @@ #include "mpt/crc/crc.hpp" #include "mpt/io/io.hpp" #include "mpt/io/io_stdstream.hpp" +#include "mpt/random/seed.hpp" + #include "openmpt/base/Endian.hpp" #include <sstream> Modified: trunk/OpenMPT/test/test.cpp ============================================================================== --- trunk/OpenMPT/test/test.cpp Sat Aug 31 13:20:01 2024 (r21553) +++ trunk/OpenMPT/test/test.cpp Sat Aug 31 14:12:26 2024 (r21554) @@ -36,6 +36,7 @@ #include "mpt/osinfo/dos_memory.hpp" #include "mpt/parse/parse.hpp" #include "mpt/parse/split.hpp" +#include "mpt/random/seed.hpp" #include "mpt/test/test.hpp" #include "mpt/test/test_macros.hpp" #include "mpt/uuid/uuid.hpp" |
|
From: <sv...@op...> - 2024-08-31 11:20:13
|
Author: manx Date: Sat Aug 31 13:20:01 2024 New Revision: 21553 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21553 Log: Merged revision(s) 21552 from branches/OpenMPT-1.29: [Fix] mpt/random/engine.hpp: The size calculation for the required seed_seq was wrong, resulting in way too much entropy to get requested. Backported from r21549. ........ Modified: branches/OpenMPT-1.28/ (props changed) branches/OpenMPT-1.28/common/mptRandom.h Modified: branches/OpenMPT-1.28/common/mptRandom.h ============================================================================== --- branches/OpenMPT-1.28/common/mptRandom.h Sat Aug 31 13:18:41 2024 (r21552) +++ branches/OpenMPT-1.28/common/mptRandom.h Sat Aug 31 13:20:01 2024 (r21553) @@ -411,7 +411,7 @@ static MPT_CONSTEXPR11_FUN int result_bits() { return rng_type::word_size; } template<typename Trd> static inline rng_type make(Trd & rd) { - std::unique_ptr<mpt::seed_seq_values<seed_bits / sizeof(unsigned int)>> values = mpt::make_unique<mpt::seed_seq_values<seed_bits / sizeof(unsigned int)>>(rd); + std::unique_ptr<mpt::seed_seq_values<(seed_bits + ((sizeof(unsigned int) * 8) - 1)) / (sizeof(unsigned int) * 8)>> values = mpt::make_unique<mpt::seed_seq_values<(seed_bits + ((sizeof(unsigned int) * 8) - 1)) / (sizeof(unsigned int) * 8)>>(rd); std::seed_seq seed(values->begin(), values->end()); return rng_type(seed); } @@ -424,7 +424,7 @@ static MPT_CONSTEXPR11_FUN int result_bits() { return rng_type::word_size; } template<typename Trd> static inline rng_type make(Trd & rd) { - std::unique_ptr<mpt::seed_seq_values<seed_bits / sizeof(unsigned int)>> values = mpt::make_unique<mpt::seed_seq_values<seed_bits / sizeof(unsigned int)>>(rd); + std::unique_ptr<mpt::seed_seq_values<(seed_bits + ((sizeof(unsigned int) * 8) - 1)) / (sizeof(unsigned int) * 8)>> values = mpt::make_unique<mpt::seed_seq_values<(seed_bits + ((sizeof(unsigned int) * 8) - 1)) / (sizeof(unsigned int) * 8)>>(rd); std::seed_seq seed(values->begin(), values->end()); return rng_type(seed); } @@ -437,7 +437,7 @@ static MPT_CONSTEXPR11_FUN int result_bits() { return rng_type::word_size; } template<typename Trd> static inline rng_type make(Trd & rd) { - mpt::seed_seq_values<seed_bits / sizeof(unsigned int)> values(rd); + mpt::seed_seq_values<(seed_bits + ((sizeof(unsigned int) * 8) - 1)) / (sizeof(unsigned int) * 8)> values(rd); std::seed_seq seed(values.begin(), values.end()); return rng_type(seed); } @@ -450,7 +450,7 @@ static MPT_CONSTEXPR11_FUN int result_bits() { return rng_type::word_size; } template<typename Trd> static inline rng_type make(Trd & rd) { - mpt::seed_seq_values<seed_bits / sizeof(unsigned int)> values(rd); + mpt::seed_seq_values<(seed_bits + ((sizeof(unsigned int) * 8) - 1)) / (sizeof(unsigned int) * 8)> values(rd); std::seed_seq seed(values.begin(), values.end()); return rng_type(seed); } @@ -463,7 +463,7 @@ static MPT_CONSTEXPR11_FUN int result_bits() { return std::ranlux24_base::word_size; } template<typename Trd> static inline rng_type make(Trd & rd) { - mpt::seed_seq_values<seed_bits / sizeof(unsigned int)> values(rd); + mpt::seed_seq_values<(seed_bits + ((sizeof(unsigned int) * 8) - 1)) / (sizeof(unsigned int) * 8)> values(rd); std::seed_seq seed(values.begin(), values.end()); return rng_type(seed); } @@ -476,7 +476,7 @@ static MPT_CONSTEXPR11_FUN int result_bits() { return std::ranlux48_base::word_size; } template<typename Trd> static inline rng_type make(Trd & rd) { - mpt::seed_seq_values<seed_bits / sizeof(unsigned int)> values(rd); + mpt::seed_seq_values<(seed_bits + ((sizeof(unsigned int) * 8) - 1)) / (sizeof(unsigned int) * 8)> values(rd); std::seed_seq seed(values.begin(), values.end()); return rng_type(seed); } |
|
From: <sv...@op...> - 2024-08-31 11:18:48
|
Author: manx Date: Sat Aug 31 13:18:41 2024 New Revision: 21552 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21552 Log: [Fix] mpt/random/engine.hpp: The size calculation for the required seed_seq was wrong, resulting in way too much entropy to get requested. Backported from r21549. Modified: branches/OpenMPT-1.29/common/mptRandom.h Modified: branches/OpenMPT-1.29/common/mptRandom.h ============================================================================== --- branches/OpenMPT-1.29/common/mptRandom.h Sat Aug 31 13:12:35 2024 (r21551) +++ branches/OpenMPT-1.29/common/mptRandom.h Sat Aug 31 13:18:41 2024 (r21552) @@ -514,7 +514,7 @@ static MPT_CONSTEXPR11_FUN int result_bits() { return rng_type::word_size; } template<typename Trd> static inline rng_type make(Trd & rd) { - std::unique_ptr<mpt::seed_seq_values<seed_bits / sizeof(unsigned int)>> values = std::make_unique<mpt::seed_seq_values<seed_bits / sizeof(unsigned int)>>(rd); + std::unique_ptr<mpt::seed_seq_values<(seed_bits + ((sizeof(unsigned int) * 8) - 1)) / (sizeof(unsigned int) * 8)>> values = std::make_unique<mpt::seed_seq_values<(seed_bits + ((sizeof(unsigned int) * 8) - 1)) / (sizeof(unsigned int) * 8)>>(rd); std::seed_seq seed(values->begin(), values->end()); return rng_type(seed); } @@ -527,7 +527,7 @@ static MPT_CONSTEXPR11_FUN int result_bits() { return rng_type::word_size; } template<typename Trd> static inline rng_type make(Trd & rd) { - std::unique_ptr<mpt::seed_seq_values<seed_bits / sizeof(unsigned int)>> values = std::make_unique<mpt::seed_seq_values<seed_bits / sizeof(unsigned int)>>(rd); + std::unique_ptr<mpt::seed_seq_values<(seed_bits + ((sizeof(unsigned int) * 8) - 1)) / (sizeof(unsigned int) * 8)>> values = std::make_unique<mpt::seed_seq_values<(seed_bits + ((sizeof(unsigned int) * 8) - 1)) / (sizeof(unsigned int) * 8)>>(rd); std::seed_seq seed(values->begin(), values->end()); return rng_type(seed); } @@ -540,7 +540,7 @@ static MPT_CONSTEXPR11_FUN int result_bits() { return rng_type::word_size; } template<typename Trd> static inline rng_type make(Trd & rd) { - mpt::seed_seq_values<seed_bits / sizeof(unsigned int)> values(rd); + mpt::seed_seq_values<(seed_bits + ((sizeof(unsigned int) * 8) - 1)) / (sizeof(unsigned int) * 8)> values(rd); std::seed_seq seed(values.begin(), values.end()); return rng_type(seed); } @@ -553,7 +553,7 @@ static MPT_CONSTEXPR11_FUN int result_bits() { return rng_type::word_size; } template<typename Trd> static inline rng_type make(Trd & rd) { - mpt::seed_seq_values<seed_bits / sizeof(unsigned int)> values(rd); + mpt::seed_seq_values<(seed_bits + ((sizeof(unsigned int) * 8) - 1)) / (sizeof(unsigned int) * 8)> values(rd); std::seed_seq seed(values.begin(), values.end()); return rng_type(seed); } @@ -566,7 +566,7 @@ static MPT_CONSTEXPR11_FUN int result_bits() { return std::ranlux24_base::word_size; } template<typename Trd> static inline rng_type make(Trd & rd) { - mpt::seed_seq_values<seed_bits / sizeof(unsigned int)> values(rd); + mpt::seed_seq_values<(seed_bits + ((sizeof(unsigned int) * 8) - 1)) / (sizeof(unsigned int) * 8)> values(rd); std::seed_seq seed(values.begin(), values.end()); return rng_type(seed); } @@ -579,7 +579,7 @@ static MPT_CONSTEXPR11_FUN int result_bits() { return std::ranlux48_base::word_size; } template<typename Trd> static inline rng_type make(Trd & rd) { - mpt::seed_seq_values<seed_bits / sizeof(unsigned int)> values(rd); + mpt::seed_seq_values<(seed_bits + ((sizeof(unsigned int) * 8) - 1)) / (sizeof(unsigned int) * 8)> values(rd); std::seed_seq seed(values.begin(), values.end()); return rng_type(seed); } |
|
From: <sv...@op...> - 2024-08-31 11:12:47
|
Author: manx Date: Sat Aug 31 13:12:35 2024 New Revision: 21551 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21551 Log: Merged revision(s) 21549 from trunk/OpenMPT: [Fix] mpt/random/engine.hpp: The size calculation for the required seed_seq was wrong, resulting in way too much entropy to get requested. ........ Modified: branches/OpenMPT-1.30/ (props changed) branches/OpenMPT-1.30/src/mpt/random/engine.hpp Modified: branches/OpenMPT-1.30/src/mpt/random/engine.hpp ============================================================================== --- branches/OpenMPT-1.30/src/mpt/random/engine.hpp Sat Aug 31 13:11:45 2024 (r21550) +++ branches/OpenMPT-1.30/src/mpt/random/engine.hpp Sat Aug 31 13:12:35 2024 (r21551) @@ -7,6 +7,7 @@ #include "mpt/base/macros.hpp" #include "mpt/base/namespace.hpp" +#include "mpt/base/numeric.hpp" #include "mpt/random/seed.hpp" #include <memory> @@ -47,7 +48,7 @@ } template <typename Trd> static inline rng_type make(Trd & rd) { - std::unique_ptr<mpt::seed_seq_values<seed_bits / sizeof(unsigned int)>> values = std::make_unique<mpt::seed_seq_values<seed_bits / sizeof(unsigned int)>>(rd); + std::unique_ptr<mpt::seed_seq_values<mpt::align_up<std::size_t>(seed_bits, sizeof(unsigned int) * 8) / (sizeof(unsigned int) * 8)>> values = std::make_unique<mpt::seed_seq_values<mpt::align_up<std::size_t>(seed_bits, sizeof(unsigned int) * 8) / (sizeof(unsigned int) * 8)>>(rd); std::seed_seq seed(values->begin(), values->end()); return rng_type(seed); } @@ -65,7 +66,7 @@ } template <typename Trd> static inline rng_type make(Trd & rd) { - std::unique_ptr<mpt::seed_seq_values<seed_bits / sizeof(unsigned int)>> values = std::make_unique<mpt::seed_seq_values<seed_bits / sizeof(unsigned int)>>(rd); + std::unique_ptr<mpt::seed_seq_values<mpt::align_up<std::size_t>(seed_bits, sizeof(unsigned int) * 8) / (sizeof(unsigned int) * 8)>> values = std::make_unique<mpt::seed_seq_values<mpt::align_up<std::size_t>(seed_bits, sizeof(unsigned int) * 8) / (sizeof(unsigned int) * 8)>>(rd); std::seed_seq seed(values->begin(), values->end()); return rng_type(seed); } @@ -83,7 +84,7 @@ } template <typename Trd> static inline rng_type make(Trd & rd) { - mpt::seed_seq_values<seed_bits / sizeof(unsigned int)> values(rd); + mpt::seed_seq_values<mpt::align_up<std::size_t>(seed_bits, sizeof(unsigned int) * 8) / (sizeof(unsigned int) * 8)> values(rd); std::seed_seq seed(values.begin(), values.end()); return rng_type(seed); } @@ -101,7 +102,7 @@ } template <typename Trd> static inline rng_type make(Trd & rd) { - mpt::seed_seq_values<seed_bits / sizeof(unsigned int)> values(rd); + mpt::seed_seq_values<mpt::align_up<std::size_t>(seed_bits, sizeof(unsigned int) * 8) / (sizeof(unsigned int) * 8)> values(rd); std::seed_seq seed(values.begin(), values.end()); return rng_type(seed); } @@ -119,7 +120,7 @@ } template <typename Trd> static inline rng_type make(Trd & rd) { - mpt::seed_seq_values<seed_bits / sizeof(unsigned int)> values(rd); + mpt::seed_seq_values<mpt::align_up<std::size_t>(seed_bits, sizeof(unsigned int) * 8) / (sizeof(unsigned int) * 8)> values(rd); std::seed_seq seed(values.begin(), values.end()); return rng_type(seed); } @@ -137,7 +138,7 @@ } template <typename Trd> static inline rng_type make(Trd & rd) { - mpt::seed_seq_values<seed_bits / sizeof(unsigned int)> values(rd); + mpt::seed_seq_values<mpt::align_up<std::size_t>(seed_bits, sizeof(unsigned int) * 8) / (sizeof(unsigned int) * 8)> values(rd); std::seed_seq seed(values.begin(), values.end()); return rng_type(seed); } |
|
From: <sv...@op...> - 2024-08-31 11:11:52
|
Author: manx Date: Sat Aug 31 13:11:45 2024 New Revision: 21550 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21550 Log: Merged revision(s) 21549 from trunk/OpenMPT: [Fix] mpt/random/engine.hpp: The size calculation for the required seed_seq was wrong, resulting in way too much entropy to get requested. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/src/mpt/random/engine.hpp Modified: branches/OpenMPT-1.31/src/mpt/random/engine.hpp ============================================================================== --- branches/OpenMPT-1.31/src/mpt/random/engine.hpp Sat Aug 31 13:11:19 2024 (r21549) +++ branches/OpenMPT-1.31/src/mpt/random/engine.hpp Sat Aug 31 13:11:45 2024 (r21550) @@ -7,6 +7,7 @@ #include "mpt/base/macros.hpp" #include "mpt/base/namespace.hpp" +#include "mpt/base/numeric.hpp" #include "mpt/random/seed.hpp" #include <memory> @@ -47,7 +48,7 @@ } template <typename Trd> static inline rng_type make(Trd & rd) { - std::unique_ptr<mpt::seed_seq_values<seed_bits / sizeof(unsigned int)>> values = std::make_unique<mpt::seed_seq_values<seed_bits / sizeof(unsigned int)>>(rd); + std::unique_ptr<mpt::seed_seq_values<mpt::align_up<std::size_t>(seed_bits, sizeof(unsigned int) * 8) / (sizeof(unsigned int) * 8)>> values = std::make_unique<mpt::seed_seq_values<mpt::align_up<std::size_t>(seed_bits, sizeof(unsigned int) * 8) / (sizeof(unsigned int) * 8)>>(rd); std::seed_seq seed(values->begin(), values->end()); return rng_type(seed); } @@ -65,7 +66,7 @@ } template <typename Trd> static inline rng_type make(Trd & rd) { - std::unique_ptr<mpt::seed_seq_values<seed_bits / sizeof(unsigned int)>> values = std::make_unique<mpt::seed_seq_values<seed_bits / sizeof(unsigned int)>>(rd); + std::unique_ptr<mpt::seed_seq_values<mpt::align_up<std::size_t>(seed_bits, sizeof(unsigned int) * 8) / (sizeof(unsigned int) * 8)>> values = std::make_unique<mpt::seed_seq_values<mpt::align_up<std::size_t>(seed_bits, sizeof(unsigned int) * 8) / (sizeof(unsigned int) * 8)>>(rd); std::seed_seq seed(values->begin(), values->end()); return rng_type(seed); } @@ -83,7 +84,7 @@ } template <typename Trd> static inline rng_type make(Trd & rd) { - mpt::seed_seq_values<seed_bits / sizeof(unsigned int)> values(rd); + mpt::seed_seq_values<mpt::align_up<std::size_t>(seed_bits, sizeof(unsigned int) * 8) / (sizeof(unsigned int) * 8)> values(rd); std::seed_seq seed(values.begin(), values.end()); return rng_type(seed); } @@ -101,7 +102,7 @@ } template <typename Trd> static inline rng_type make(Trd & rd) { - mpt::seed_seq_values<seed_bits / sizeof(unsigned int)> values(rd); + mpt::seed_seq_values<mpt::align_up<std::size_t>(seed_bits, sizeof(unsigned int) * 8) / (sizeof(unsigned int) * 8)> values(rd); std::seed_seq seed(values.begin(), values.end()); return rng_type(seed); } @@ -119,7 +120,7 @@ } template <typename Trd> static inline rng_type make(Trd & rd) { - mpt::seed_seq_values<seed_bits / sizeof(unsigned int)> values(rd); + mpt::seed_seq_values<mpt::align_up<std::size_t>(seed_bits, sizeof(unsigned int) * 8) / (sizeof(unsigned int) * 8)> values(rd); std::seed_seq seed(values.begin(), values.end()); return rng_type(seed); } @@ -137,7 +138,7 @@ } template <typename Trd> static inline rng_type make(Trd & rd) { - mpt::seed_seq_values<seed_bits / sizeof(unsigned int)> values(rd); + mpt::seed_seq_values<mpt::align_up<std::size_t>(seed_bits, sizeof(unsigned int) * 8) / (sizeof(unsigned int) * 8)> values(rd); std::seed_seq seed(values.begin(), values.end()); return rng_type(seed); } |
|
From: <sv...@op...> - 2024-08-31 11:11:32
|
Author: manx Date: Sat Aug 31 13:11:19 2024 New Revision: 21549 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21549 Log: [Fix] mpt/random/engine.hpp: The size calculation for the required seed_seq was wrong, resulting in way too much entropy to get requested. Modified: trunk/OpenMPT/src/mpt/random/engine.hpp Modified: trunk/OpenMPT/src/mpt/random/engine.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/random/engine.hpp Sat Aug 31 08:51:53 2024 (r21548) +++ trunk/OpenMPT/src/mpt/random/engine.hpp Sat Aug 31 13:11:19 2024 (r21549) @@ -7,6 +7,7 @@ #include "mpt/base/macros.hpp" #include "mpt/base/namespace.hpp" +#include "mpt/base/numeric.hpp" #include "mpt/random/seed.hpp" #include <memory> @@ -47,7 +48,7 @@ } template <typename Trd> static inline rng_type make(Trd & rd) { - std::unique_ptr<mpt::seed_seq_values<seed_bits / sizeof(unsigned int)>> values = std::make_unique<mpt::seed_seq_values<seed_bits / sizeof(unsigned int)>>(rd); + std::unique_ptr<mpt::seed_seq_values<mpt::align_up<std::size_t>(seed_bits, sizeof(unsigned int) * 8) / (sizeof(unsigned int) * 8)>> values = std::make_unique<mpt::seed_seq_values<mpt::align_up<std::size_t>(seed_bits, sizeof(unsigned int) * 8) / (sizeof(unsigned int) * 8)>>(rd); std::seed_seq seed(values->begin(), values->end()); return rng_type(seed); } @@ -65,7 +66,7 @@ } template <typename Trd> static inline rng_type make(Trd & rd) { - std::unique_ptr<mpt::seed_seq_values<seed_bits / sizeof(unsigned int)>> values = std::make_unique<mpt::seed_seq_values<seed_bits / sizeof(unsigned int)>>(rd); + std::unique_ptr<mpt::seed_seq_values<mpt::align_up<std::size_t>(seed_bits, sizeof(unsigned int) * 8) / (sizeof(unsigned int) * 8)>> values = std::make_unique<mpt::seed_seq_values<mpt::align_up<std::size_t>(seed_bits, sizeof(unsigned int) * 8) / (sizeof(unsigned int) * 8)>>(rd); std::seed_seq seed(values->begin(), values->end()); return rng_type(seed); } @@ -83,7 +84,7 @@ } template <typename Trd> static inline rng_type make(Trd & rd) { - mpt::seed_seq_values<seed_bits / sizeof(unsigned int)> values(rd); + mpt::seed_seq_values<mpt::align_up<std::size_t>(seed_bits, sizeof(unsigned int) * 8) / (sizeof(unsigned int) * 8)> values(rd); std::seed_seq seed(values.begin(), values.end()); return rng_type(seed); } @@ -101,7 +102,7 @@ } template <typename Trd> static inline rng_type make(Trd & rd) { - mpt::seed_seq_values<seed_bits / sizeof(unsigned int)> values(rd); + mpt::seed_seq_values<mpt::align_up<std::size_t>(seed_bits, sizeof(unsigned int) * 8) / (sizeof(unsigned int) * 8)> values(rd); std::seed_seq seed(values.begin(), values.end()); return rng_type(seed); } @@ -119,7 +120,7 @@ } template <typename Trd> static inline rng_type make(Trd & rd) { - mpt::seed_seq_values<seed_bits / sizeof(unsigned int)> values(rd); + mpt::seed_seq_values<mpt::align_up<std::size_t>(seed_bits, sizeof(unsigned int) * 8) / (sizeof(unsigned int) * 8)> values(rd); std::seed_seq seed(values.begin(), values.end()); return rng_type(seed); } @@ -137,7 +138,7 @@ } template <typename Trd> static inline rng_type make(Trd & rd) { - mpt::seed_seq_values<seed_bits / sizeof(unsigned int)> values(rd); + mpt::seed_seq_values<mpt::align_up<std::size_t>(seed_bits, sizeof(unsigned int) * 8) / (sizeof(unsigned int) * 8)> values(rd); std::seed_seq seed(values.begin(), values.end()); return rng_type(seed); } |
|
From: <sv...@op...> - 2024-08-31 06:52:02
|
Author: manx Date: Sat Aug 31 08:51:53 2024 New Revision: 21548 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21548 Log: [Ref] build: Makefile: Start separate building external libraries. [Ref] build: Makefile: Show which subproject a particular file is compiled for. Modified: trunk/OpenMPT/Makefile Modified: trunk/OpenMPT/Makefile ============================================================================== --- trunk/OpenMPT/Makefile Fri Aug 30 16:05:01 2024 (r21547) +++ trunk/OpenMPT/Makefile Sat Aug 31 08:51:53 2024 (r21548) @@ -647,24 +647,28 @@ LDFLAGS_ZLIB := LDLIBS_ZLIB := CPPFLAGS_ZLIB += -Iinclude/zlib/ -LOCAL_ZLIB_SOURCES := -LOCAL_ZLIB_SOURCES += include/zlib/adler32.c -LOCAL_ZLIB_SOURCES += include/zlib/compress.c -LOCAL_ZLIB_SOURCES += include/zlib/crc32.c -LOCAL_ZLIB_SOURCES += include/zlib/deflate.c -LOCAL_ZLIB_SOURCES += include/zlib/gzclose.c -LOCAL_ZLIB_SOURCES += include/zlib/gzlib.c -LOCAL_ZLIB_SOURCES += include/zlib/gzread.c -LOCAL_ZLIB_SOURCES += include/zlib/gzwrite.c -LOCAL_ZLIB_SOURCES += include/zlib/infback.c -LOCAL_ZLIB_SOURCES += include/zlib/inffast.c -LOCAL_ZLIB_SOURCES += include/zlib/inflate.c -LOCAL_ZLIB_SOURCES += include/zlib/inftrees.c -LOCAL_ZLIB_SOURCES += include/zlib/trees.c -LOCAL_ZLIB_SOURCES += include/zlib/uncompr.c -LOCAL_ZLIB_SOURCES += include/zlib/zutil.c -include/zlib/%$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DSTDC -DZ_HAVE_UNISTD_H -include/zlib/%.test$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DSTDC -DZ_HAVE_UNISTD_H +ZLIB_SOURCES := +ZLIB_SOURCES += include/zlib/adler32.c +ZLIB_SOURCES += include/zlib/compress.c +ZLIB_SOURCES += include/zlib/crc32.c +ZLIB_SOURCES += include/zlib/deflate.c +ZLIB_SOURCES += include/zlib/gzclose.c +ZLIB_SOURCES += include/zlib/gzlib.c +ZLIB_SOURCES += include/zlib/gzread.c +ZLIB_SOURCES += include/zlib/gzwrite.c +ZLIB_SOURCES += include/zlib/infback.c +ZLIB_SOURCES += include/zlib/inffast.c +ZLIB_SOURCES += include/zlib/inflate.c +ZLIB_SOURCES += include/zlib/inftrees.c +ZLIB_SOURCES += include/zlib/trees.c +ZLIB_SOURCES += include/zlib/uncompr.c +ZLIB_SOURCES += include/zlib/zutil.c +include/zlib/%.zlib$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DSTDC -DZ_HAVE_UNISTD_H +ZLIB_OBJECTS = $(ZLIB_SOURCES:.c=.zlib$(FLAVOUR_O).o) +ZLIB_DEPENDS = $(ZLIB_OBJECTS:$(FLAVOUR_O).o=$(FLAVOUR_O).d) +ALL_OBJECTS += $(ZLIB_OBJECTS) +ALL_DEPENDS += $(ZLIB_DEPENDS) +OBJECTS_ZLIB = $(ZLIB_OBJECTS) else ifeq ($(NO_ZLIB),1) else @@ -720,24 +724,15 @@ MPG123_SOURCES += include/mpg123/src/libmpg123/synth_real.c MPG123_SOURCES += include/mpg123/src/libmpg123/synth_s32.c MPG123_SOURCES += include/mpg123/src/libmpg123/tabinit.c -MPG123_OBJECTS += $(MPG123_SOURCES:.c=$(FLAVOUR_O).o) +MPG123_OBJECTS += $(MPG123_SOURCES:.c=.mpg123$(FLAVOUR_O).o) MPG123_DEPENDS = $(MPG123_OBJECTS:$(FLAVOUR_O).o=$(FLAVOUR_O).d) ALL_OBJECTS += $(MPG123_OBJECTS) ALL_DEPENDS += $(MPG123_DEPENDS) -include/mpg123/src/compat/%$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC -include/mpg123/src/compat/%.test$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC -include/mpg123/src/libmpg123/%$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC -include/mpg123/src/libmpg123/%.test$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC -include/mpg123/src/compat/%$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS) -include/mpg123/src/compat/%.test$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS) -include/mpg123/src/libmpg123/%$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS) -include/mpg123/src/libmpg123/%.test$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS) -LOCAL_MPG123_SOURCES := -LOCAL_MPG123_SOURCES += -LOCAL_MPG123_OBJECTS := -LOCAL_MPG123_OBJECTS += -LOCAL_MPG123_LIBS := -LOCAL_MPG123_LIBS += bin/$(FLAVOUR_DIR)mpg123.a +include/mpg123/src/compat/%.mpg123$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC +include/mpg123/src/libmpg123/%.mpg123$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC +include/mpg123/src/compat/%.mpg123$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS) +include/mpg123/src/libmpg123/%.mpg123$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS) +LIBS_MPG123 = bin/$(FLAVOUR_DIR)mpg123.a bin/$(FLAVOUR_DIR)mpg123.a: $(MPG123_OBJECTS) $(INFO) [DXE] $@ @@ -757,41 +752,42 @@ LDFLAGS_MPG123 := LDLIBS_MPG123 := CPPFLAGS_MPG123 += -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ -LOCAL_MPG123_SOURCES := -LOCAL_MPG123_SOURCES += include/mpg123/src/compat/compat.c -LOCAL_MPG123_SOURCES += include/mpg123/src/compat/compat_str.c -LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/dct64.c -LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/equalizer.c -LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/feature.c -LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/format.c -LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/frame.c -LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/icy.c -LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/icy2utf8.c -LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/id3.c -LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/index.c -LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/layer1.c -LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/layer2.c -LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/layer3.c -LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/lfs_wrap.c -LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/libmpg123.c -LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/ntom.c -LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/optimize.c -LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/parse.c -LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/readers.c -LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/stringbuf.c -LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/synth.c -LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/synth_8bit.c -LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/synth_real.c -LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/synth_s32.c -LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/tabinit.c -include/mpg123/src/compat/%$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC -include/mpg123/src/compat/%.test$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC -include/mpg123/src/libmpg123/%$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC -include/mpg123/src/libmpg123/%.test$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC -include/mpg123/src/compat/%$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS) -include/mpg123/src/compat/%.test$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS) -include/mpg123/src/libmpg123/%$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS) -include/mpg123/src/libmpg123/%.test$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS) +MPG123_SOURCES := +MPG123_SOURCES += include/mpg123/src/compat/compat.c +MPG123_SOURCES += include/mpg123/src/compat/compat_str.c +MPG123_SOURCES += include/mpg123/src/libmpg123/dct64.c +MPG123_SOURCES += include/mpg123/src/libmpg123/equalizer.c +MPG123_SOURCES += include/mpg123/src/libmpg123/feature.c +MPG123_SOURCES += include/mpg123/src/libmpg123/format.c +MPG123_SOURCES += include/mpg123/src/libmpg123/frame.c +MPG123_SOURCES += include/mpg123/src/libmpg123/icy.c +MPG123_SOURCES += include/mpg123/src/libmpg123/icy2utf8.c +MPG123_SOURCES += include/mpg123/src/libmpg123/id3.c +MPG123_SOURCES += include/mpg123/src/libmpg123/index.c +MPG123_SOURCES += include/mpg123/src/libmpg123/layer1.c +MPG123_SOURCES += include/mpg123/src/libmpg123/layer2.c +MPG123_SOURCES += include/mpg123/src/libmpg123/layer3.c +MPG123_SOURCES += include/mpg123/src/libmpg123/lfs_wrap.c +MPG123_SOURCES += include/mpg123/src/libmpg123/libmpg123.c +MPG123_SOURCES += include/mpg123/src/libmpg123/ntom.c +MPG123_SOURCES += include/mpg123/src/libmpg123/optimize.c +MPG123_SOURCES += include/mpg123/src/libmpg123/parse.c +MPG123_SOURCES += include/mpg123/src/libmpg123/readers.c +MPG123_SOURCES += include/mpg123/src/libmpg123/stringbuf.c +MPG123_SOURCES += include/mpg123/src/libmpg123/synth.c +MPG123_SOURCES += include/mpg123/src/libmpg123/synth_8bit.c +MPG123_SOURCES += include/mpg123/src/libmpg123/synth_real.c +MPG123_SOURCES += include/mpg123/src/libmpg123/synth_s32.c +MPG123_SOURCES += include/mpg123/src/libmpg123/tabinit.c +include/mpg123/src/compat/%.mpg123$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC +include/mpg123/src/libmpg123/%.mpg123$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC +include/mpg123/src/compat/%.mpg123$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS) +include/mpg123/src/libmpg123/%.mpg123$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS) +MPG123_OBJECTS = $(MPG123_SOURCES:.c=.mpg123$(FLAVOUR_O).o) +MPG123_DEPENDS = $(MPG123_OBJECTS:$(FLAVOUR_O).o=$(FLAVOUR_O).d) +ALL_OBJECTS += $(MPG123_OBJECTS) +ALL_DEPENDS += $(MPG123_DEPENDS) +OBJECTS_MPG123 = $(MPG123_OBJECTS) endif @@ -820,11 +816,15 @@ LDFLAGS_OGG := LDLIBS_OGG := CPPFLAGS_OGG += -Iinclude/ogg/include/ -Iinclude/ogg/ports/makefile/ -LOCAL_OGG_SOURCES := -LOCAL_OGG_SOURCES += include/ogg/src/bitwise.c -LOCAL_OGG_SOURCES += include/ogg/src/framing.c -include/ogg/src/%$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -include/ogg/src/%.test$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) +OGG_SOURCES := +OGG_SOURCES += include/ogg/src/bitwise.c +OGG_SOURCES += include/ogg/src/framing.c +include/ogg/src/%.ogg$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) +OGG_OBJECTS += $(OGG_SOURCES:.c=.ogg$(FLAVOUR_O).o) +OGG_DEPENDS = $(OGG_OBJECTS:$(FLAVOUR_O).o=$(FLAVOUR_O).d) +ALL_OBJECTS += $(OGG_OBJECTS) +ALL_DEPENDS += $(OGG_DEPENDS) +OBJECTS_OGG = $(OGG_OBJECTS) else ifeq ($(NO_OGG),1) else @@ -853,31 +853,35 @@ ifneq ($(MPT_COMPILER_NOALLOCAH),1) CPPFLAGS_VORBIS += -DHAVE_ALLOCA_H endif -LOCAL_VORBIS_SOURCES := -LOCAL_VORBIS_SOURCES += include/vorbis/lib/analysis.c -LOCAL_VORBIS_SOURCES += include/vorbis/lib/bitrate.c -LOCAL_VORBIS_SOURCES += include/vorbis/lib/block.c -LOCAL_VORBIS_SOURCES += include/vorbis/lib/codebook.c -LOCAL_VORBIS_SOURCES += include/vorbis/lib/envelope.c -LOCAL_VORBIS_SOURCES += include/vorbis/lib/floor0.c -LOCAL_VORBIS_SOURCES += include/vorbis/lib/floor1.c -LOCAL_VORBIS_SOURCES += include/vorbis/lib/info.c -LOCAL_VORBIS_SOURCES += include/vorbis/lib/lookup.c -LOCAL_VORBIS_SOURCES += include/vorbis/lib/lpc.c -LOCAL_VORBIS_SOURCES += include/vorbis/lib/lsp.c -LOCAL_VORBIS_SOURCES += include/vorbis/lib/mapping0.c -LOCAL_VORBIS_SOURCES += include/vorbis/lib/mdct.c -LOCAL_VORBIS_SOURCES += include/vorbis/lib/psy.c -LOCAL_VORBIS_SOURCES += include/vorbis/lib/registry.c -LOCAL_VORBIS_SOURCES += include/vorbis/lib/res0.c -LOCAL_VORBIS_SOURCES += include/vorbis/lib/sharedbook.c -LOCAL_VORBIS_SOURCES += include/vorbis/lib/smallft.c -LOCAL_VORBIS_SOURCES += include/vorbis/lib/synthesis.c -LOCAL_VORBIS_SOURCES += include/vorbis/lib/vorbisenc.c -LOCAL_VORBIS_SOURCES += include/vorbis/lib/vorbisfile.c -LOCAL_VORBIS_SOURCES += include/vorbis/lib/window.c -include/vorbis/lib/%$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -include/vorbis/lib/%.test$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) +VORBIS_SOURCES := +VORBIS_SOURCES += include/vorbis/lib/analysis.c +VORBIS_SOURCES += include/vorbis/lib/bitrate.c +VORBIS_SOURCES += include/vorbis/lib/block.c +VORBIS_SOURCES += include/vorbis/lib/codebook.c +VORBIS_SOURCES += include/vorbis/lib/envelope.c +VORBIS_SOURCES += include/vorbis/lib/floor0.c +VORBIS_SOURCES += include/vorbis/lib/floor1.c +VORBIS_SOURCES += include/vorbis/lib/info.c +VORBIS_SOURCES += include/vorbis/lib/lookup.c +VORBIS_SOURCES += include/vorbis/lib/lpc.c +VORBIS_SOURCES += include/vorbis/lib/lsp.c +VORBIS_SOURCES += include/vorbis/lib/mapping0.c +VORBIS_SOURCES += include/vorbis/lib/mdct.c +VORBIS_SOURCES += include/vorbis/lib/psy.c +VORBIS_SOURCES += include/vorbis/lib/registry.c +VORBIS_SOURCES += include/vorbis/lib/res0.c +VORBIS_SOURCES += include/vorbis/lib/sharedbook.c +VORBIS_SOURCES += include/vorbis/lib/smallft.c +VORBIS_SOURCES += include/vorbis/lib/synthesis.c +VORBIS_SOURCES += include/vorbis/lib/vorbisenc.c +VORBIS_SOURCES += include/vorbis/lib/vorbisfile.c +VORBIS_SOURCES += include/vorbis/lib/window.c +include/vorbis/lib/%.vorbis$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) +VORBIS_OBJECTS += $(VORBIS_SOURCES:.c=.vorbis$(FLAVOUR_O).o) +VORBIS_DEPENDS = $(VORBIS_OBJECTS:$(FLAVOUR_O).o=$(FLAVOUR_O).d) +ALL_OBJECTS += $(VORBIS_OBJECTS) +ALL_DEPENDS += $(VORBIS_DEPENDS) +OBJECTS_VORBIS = $(VORBIS_OBJECTS) else ifeq ($(NO_VORBIS),1) else @@ -1091,15 +1095,67 @@ $(SILENT)$(COMPILE.c) $(OUTPUT_OPTION) $< %.test$(FLAVOUR_O).o: %.cpp - $(INFO) [CXX-TEST] $< + $(INFO) [CXX] libopenmpt-test: $< $(VERYSILENT)$(CXX) -DLIBOPENMPT_BUILD_TEST $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -M -MT$@ $< > $*.test$(FLAVOUR_O).d $(SILENT)$(COMPILE.cc) -DLIBOPENMPT_BUILD_TEST $(OUTPUT_OPTION) $< %.test$(FLAVOUR_O).o: %.c - $(INFO) [CC-TEST] $< + $(INFO) [CC] libopenmpt-test: $< $(VERYSILENT)$(CC) -DLIBOPENMPT_BUILD_TEST $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -M -MT$@ $< > $*.test$(FLAVOUR_O).d $(SILENT)$(COMPILE.c) -DLIBOPENMPT_BUILD_TEST $(OUTPUT_OPTION) $< +%.openmpt123$(FLAVOUR_O).o: %.cpp + $(INFO) [CXX] openmpt123: $< + $(VERYSILENT)$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(CPPFLAGS_OPENMPT123) $(TARGET_ARCH) -M -MT$@ $< > $*.openmpt123$(FLAVOUR_O).d + $(SILENT)$(COMPILE.cc) $(CPPFLAGS_OPENMPT123) $(OUTPUT_OPTION) $< + +%.openmpt123$(FLAVOUR_O).o: %.c + $(INFO) [CC] openmpt123: $< + $(VERYSILENT)$(CC) $(CFLAGS) $(CPPFLAGS) $(CPPFLAGS_OPENMPT123) $(TARGET_ARCH) -M -MT$@ $< > $*.openmpt123$(FLAVOUR_O).d + $(SILENT)$(COMPILE.c) $(CPPFLAGS_OPENMPT123) $(OUTPUT_OPTION) $< + + +%.zlib$(FLAVOUR_O).o: %.cpp + $(INFO) [CXX] zlib: $< + $(VERYSILENT)$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -M -MT$@ $< > $*.zlib$(FLAVOUR_O).d + $(SILENT)$(COMPILE.cc) $(OUTPUT_OPTION) $< + +%.zlib$(FLAVOUR_O).o: %.c + $(INFO) [CC] zlib: $< + $(VERYSILENT)$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -M -MT$@ $< > $*.zlib$(FLAVOUR_O).d + $(SILENT)$(COMPILE.c) $(OUTPUT_OPTION) $< + +%.mpg123$(FLAVOUR_O).o: %.cpp + $(INFO) [CXX] mpg123: $< + $(VERYSILENT)$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -M -MT$@ $< > $*.mpg123$(FLAVOUR_O).d + $(SILENT)$(COMPILE.cc) $(OUTPUT_OPTION) $< + +%.mpg123$(FLAVOUR_O).o: %.c + $(INFO) [CC] mpg123: $< + $(VERYSILENT)$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -M -MT$@ $< > $*.mpg123$(FLAVOUR_O).d + $(SILENT)$(COMPILE.c) $(OUTPUT_OPTION) $< + +%.ogg$(FLAVOUR_O).o: %.cpp + $(INFO) [CXX] ogg: $< + $(VERYSILENT)$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -M -MT$@ $< > $*.ogg$(FLAVOUR_O).d + $(SILENT)$(COMPILE.cc) $(OUTPUT_OPTION) $< + +%.ogg$(FLAVOUR_O).o: %.c + $(INFO) [CC] ogg: $< + $(VERYSILENT)$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -M -MT$@ $< > $*.ogg$(FLAVOUR_O).d + $(SILENT)$(COMPILE.c) $(OUTPUT_OPTION) $< + +%.vorbis$(FLAVOUR_O).o: %.cpp + $(INFO) [CXX] vorbis: $< + $(VERYSILENT)$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -M -MT$@ $< > $*.vorbis$(FLAVOUR_O).d + $(SILENT)$(COMPILE.cc) $(OUTPUT_OPTION) $< + +%.vorbis$(FLAVOUR_O).o: %.c + $(INFO) [CC] vorbis: $< + $(VERYSILENT)$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -M -MT$@ $< > $*.vorbis$(FLAVOUR_O).d + $(SILENT)$(COMPILE.c) $(OUTPUT_OPTION) $< + + %.tar.gz: %.tar $(INFO) [GZIP] $< $(SILENT)gzip --rsyncable --no-name --best > $@ < $< @@ -1196,12 +1252,12 @@ $(SOUNDLIB_CXX_SOURCES) \ $(sort $(wildcard libopenmpt/*.cpp)) \ + include/miniz/miniz$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) include/miniz/miniz.test$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) ifeq ($(LOCAL_ZLIB),1) -LIBOPENMPT_C_SOURCES += $(LOCAL_ZLIB_SOURCES) -LIBOPENMPTTEST_C_SOURCES += $(LOCAL_ZLIB_SOURCES) -LIBOPENMPT_OBJECTS += $(LOCAL_ZLIB_OBJECTS) +LIBOPENMPT_OBJECTS += $(OBJECTS_ZLIB) +LIBOPENMPTTEST_OBJECTS += $(OBJECTS_ZLIB) else ifeq ($(NO_ZLIB),1) ifeq ($(NO_MINIZ),1) @@ -1217,10 +1273,10 @@ include/minimp3/minimp3$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) include/minimp3/minimp3.test$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) ifeq ($(LOCAL_MPG123),1) -LIBOPENMPT_C_SOURCES += $(LOCAL_MPG123_SOURCES) -LIBOPENMPTTEST_C_SOURCES += $(LOCAL_MPG123_SOURCES) -LIBOPENMPT_OBJECTS += $(LOCAL_MPG123_OBJECTS) -LIBOPENMPT_LIBS += $(LOCAL_MPG123_LIBS) +LIBOPENMPT_OBJECTS += $(OBJECTS_MPG123) +LIBOPENMPTTEST_OBJECTS += $(OBJECTS_MPG123) +LIBOPENMPT_LIBS += $(LIBS_MPG123) +LIBOPENMPTTEST_LIBS += $(LIBS_MPG123) else ifeq ($(NO_MPG123),1) ifeq ($(NO_MINIMP3),1) @@ -1237,13 +1293,15 @@ include/stb_vorbis/stb_vorbis.test$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) ifeq ($(LOCAL_VORBIS),1) ifeq ($(LOCAL_OGG),1) -LIBOPENMPT_C_SOURCES += $(LOCAL_OGG_SOURCES) -LIBOPENMPTTEST_C_SOURCES += $(LOCAL_OGG_SOURCES) -LIBOPENMPT_OBJECTS += $(LOCAL_OGG_OBJECTS) -endif -LIBOPENMPT_C_SOURCES += $(LOCAL_VORBIS_SOURCES) -LIBOPENMPTTEST_C_SOURCES += $(LOCAL_VORBIS_SOURCES) -LIBOPENMPT_OBJECTS += $(LOCAL_VORBIS_OBJECTS) +LIBOPENMPT_OBJECTS += $(OBJECTS_OGG) +LIBOPENMPTTEST_OBJECTS += $(OBJECTS_OGG) +LIBOPENMPT_LIBS += $(LIBS_OGG) +LIBOPENMPTTEST_LIBS += $(LIBS_OGG) +endif +LIBOPENMPT_OBJECTS += $(OBJECTS_VORBIS) +LIBOPENMPTTEST_OBJECTS += $(OBJECTS_VORBIS) +LIBOPENMPT_LIBS += $(LIBS_VORBIS) +LIBOPENMPTTEST_LIBS += $(LIBS_VORBIS) else ifeq ($(NO_OGG),1) ifeq ($(NO_STBVORBIS),1) @@ -1318,7 +1376,7 @@ OPENMPT123_C_SOURCES += \ $(sort $(wildcard openmpt123/*.c)) \ -OPENMPT123_OBJECTS += $(OPENMPT123_CXX_SOURCES:.cpp=$(FLAVOUR_O).o) $(OPENMPT123_C_SOURCES:.c=$(FLAVOUR_O).o) +OPENMPT123_OBJECTS += $(OPENMPT123_CXX_SOURCES:.cpp=.openmpt123$(FLAVOUR_O).o) $(OPENMPT123_C_SOURCES:.c=.openmpt123$(FLAVOUR_O).o) OPENMPT123_DEPENDS = $(OPENMPT123_OBJECTS:$(FLAVOUR_O).o=$(FLAVOUR_O).d) ALL_OBJECTS += $(OPENMPT123_OBJECTS) ALL_DEPENDS += $(OPENMPT123_DEPENDS) |
|
From: <sv...@op...> - 2024-08-30 14:05:08
|
Author: manx Date: Fri Aug 30 16:05:01 2024 New Revision: 21547 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21547 Log: Revert r21545, r21540. These were not redundant currently. Merged revision(s) 21545, 21540 from trunk/OpenMPT: [Ref] Makefile: Remove redundant options for 3rd party libraries. ........ [Ref] Makefile: Remove redundant options for 3rd party libraries. ........ Modified: trunk/OpenMPT/Makefile Modified: trunk/OpenMPT/Makefile ============================================================================== --- trunk/OpenMPT/Makefile Fri Aug 30 15:42:45 2024 (r21546) +++ trunk/OpenMPT/Makefile Fri Aug 30 16:05:01 2024 (r21547) @@ -664,6 +664,7 @@ LOCAL_ZLIB_SOURCES += include/zlib/uncompr.c LOCAL_ZLIB_SOURCES += include/zlib/zutil.c include/zlib/%$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DSTDC -DZ_HAVE_UNISTD_H +include/zlib/%.test$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DSTDC -DZ_HAVE_UNISTD_H else ifeq ($(NO_ZLIB),1) else @@ -724,9 +725,13 @@ ALL_OBJECTS += $(MPG123_OBJECTS) ALL_DEPENDS += $(MPG123_DEPENDS) include/mpg123/src/compat/%$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC +include/mpg123/src/compat/%.test$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC include/mpg123/src/libmpg123/%$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC +include/mpg123/src/libmpg123/%.test$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC include/mpg123/src/compat/%$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS) +include/mpg123/src/compat/%.test$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS) include/mpg123/src/libmpg123/%$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS) +include/mpg123/src/libmpg123/%.test$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS) LOCAL_MPG123_SOURCES := LOCAL_MPG123_SOURCES += LOCAL_MPG123_OBJECTS := @@ -780,9 +785,13 @@ LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/synth_s32.c LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/tabinit.c include/mpg123/src/compat/%$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC +include/mpg123/src/compat/%.test$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC include/mpg123/src/libmpg123/%$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC +include/mpg123/src/libmpg123/%.test$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC include/mpg123/src/compat/%$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS) +include/mpg123/src/compat/%.test$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS) include/mpg123/src/libmpg123/%$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS) +include/mpg123/src/libmpg123/%.test$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS) endif @@ -815,6 +824,7 @@ LOCAL_OGG_SOURCES += include/ogg/src/bitwise.c LOCAL_OGG_SOURCES += include/ogg/src/framing.c include/ogg/src/%$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) +include/ogg/src/%.test$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) else ifeq ($(NO_OGG),1) else @@ -867,6 +877,7 @@ LOCAL_VORBIS_SOURCES += include/vorbis/lib/vorbisfile.c LOCAL_VORBIS_SOURCES += include/vorbis/lib/window.c include/vorbis/lib/%$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) +include/vorbis/lib/%.test$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) else ifeq ($(NO_VORBIS),1) else @@ -1186,6 +1197,7 @@ $(sort $(wildcard libopenmpt/*.cpp)) \ include/miniz/miniz$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) +include/miniz/miniz.test$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) ifeq ($(LOCAL_ZLIB),1) LIBOPENMPT_C_SOURCES += $(LOCAL_ZLIB_SOURCES) LIBOPENMPTTEST_C_SOURCES += $(LOCAL_ZLIB_SOURCES) @@ -1203,6 +1215,7 @@ endif include/minimp3/minimp3$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) +include/minimp3/minimp3.test$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) ifeq ($(LOCAL_MPG123),1) LIBOPENMPT_C_SOURCES += $(LOCAL_MPG123_SOURCES) LIBOPENMPTTEST_C_SOURCES += $(LOCAL_MPG123_SOURCES) @@ -1221,6 +1234,7 @@ endif include/stb_vorbis/stb_vorbis$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) +include/stb_vorbis/stb_vorbis.test$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) ifeq ($(LOCAL_VORBIS),1) ifeq ($(LOCAL_OGG),1) LIBOPENMPT_C_SOURCES += $(LOCAL_OGG_SOURCES) |
|
From: <sv...@op...> - 2024-08-30 13:42:57
|
Author: manx Date: Fri Aug 30 15:42:45 2024 New Revision: 21546 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21546 Log: [Ref] build: Makefile: Tiny cleanups. Modified: trunk/OpenMPT/Makefile Modified: trunk/OpenMPT/Makefile ============================================================================== --- trunk/OpenMPT/Makefile Fri Aug 30 15:02:59 2024 (r21545) +++ trunk/OpenMPT/Makefile Fri Aug 30 15:42:45 2024 (r21546) @@ -1304,7 +1304,7 @@ OPENMPT123_C_SOURCES += \ $(sort $(wildcard openmpt123/*.c)) \ -OPENMPT123_OBJECTS = $(OPENMPT123_CXX_SOURCES:.cpp=$(FLAVOUR_O).o) $(OPENMPT123_C_SOURCES:.c=$(FLAVOUR_O).o) +OPENMPT123_OBJECTS += $(OPENMPT123_CXX_SOURCES:.cpp=$(FLAVOUR_O).o) $(OPENMPT123_C_SOURCES:.c=$(FLAVOUR_O).o) OPENMPT123_DEPENDS = $(OPENMPT123_OBJECTS:$(FLAVOUR_O).o=$(FLAVOUR_O).d) ALL_OBJECTS += $(OPENMPT123_OBJECTS) ALL_DEPENDS += $(OPENMPT123_DEPENDS) @@ -1333,7 +1333,7 @@ LIBOPENMPTTEST_C_SOURCES += \ -LIBOPENMPTTEST_OBJECTS = $(LIBOPENMPTTEST_CXX_SOURCES:.cpp=.test$(FLAVOUR_O).o) $(LIBOPENMPTTEST_C_SOURCES:.c=.test$(FLAVOUR_O).o) +LIBOPENMPTTEST_OBJECTS += $(LIBOPENMPTTEST_CXX_SOURCES:.cpp=.test$(FLAVOUR_O).o) $(LIBOPENMPTTEST_C_SOURCES:.c=.test$(FLAVOUR_O).o) LIBOPENMPTTEST_DEPENDS = $(LIBOPENMPTTEST_OBJCECTS:$(FLAVOUR_O).o=$(FLAVOUR_O).d) ALL_OBJECTS += $(LIBOPENMPTTEST_OBJECTS) ALL_DEPENDS += $(LIBOPENMPTTEST_DEPENDS) |
|
From: <sv...@op...> - 2024-08-30 13:03:13
|
Author: manx Date: Fri Aug 30 15:02:59 2024 New Revision: 21545 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21545 Log: [Ref] Makefile: Remove redundant options for 3rd party libraries. Modified: trunk/OpenMPT/Makefile Modified: trunk/OpenMPT/Makefile ============================================================================== --- trunk/OpenMPT/Makefile Fri Aug 30 14:59:31 2024 (r21544) +++ trunk/OpenMPT/Makefile Fri Aug 30 15:02:59 2024 (r21545) @@ -1186,7 +1186,6 @@ $(sort $(wildcard libopenmpt/*.cpp)) \ include/miniz/miniz$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -include/miniz/miniz.test$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) ifeq ($(LOCAL_ZLIB),1) LIBOPENMPT_C_SOURCES += $(LOCAL_ZLIB_SOURCES) LIBOPENMPTTEST_C_SOURCES += $(LOCAL_ZLIB_SOURCES) @@ -1204,7 +1203,6 @@ endif include/minimp3/minimp3$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -include/minimp3/minimp3.test$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) ifeq ($(LOCAL_MPG123),1) LIBOPENMPT_C_SOURCES += $(LOCAL_MPG123_SOURCES) LIBOPENMPTTEST_C_SOURCES += $(LOCAL_MPG123_SOURCES) @@ -1223,7 +1221,6 @@ endif include/stb_vorbis/stb_vorbis$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -include/stb_vorbis/stb_vorbis.test$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) ifeq ($(LOCAL_VORBIS),1) ifeq ($(LOCAL_OGG),1) LIBOPENMPT_C_SOURCES += $(LOCAL_OGG_SOURCES) |
|
From: <sv...@op...> - 2024-08-30 12:59:43
|
Author: manx Date: Fri Aug 30 14:59:31 2024 New Revision: 21544 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21544 Log: [Ref] build: Makefile: Tiny cleanups. Modified: trunk/OpenMPT/Makefile Modified: trunk/OpenMPT/Makefile ============================================================================== --- trunk/OpenMPT/Makefile Fri Aug 30 12:51:13 2024 (r21543) +++ trunk/OpenMPT/Makefile Fri Aug 30 14:59:31 2024 (r21544) @@ -1307,7 +1307,7 @@ OPENMPT123_C_SOURCES += \ $(sort $(wildcard openmpt123/*.c)) \ -OPENMPT123_OBJECTS += $(OPENMPT123_CXX_SOURCES:.cpp=$(FLAVOUR_O).o) $(OPENMPT123_C_SOURCES:.c=$(FLAVOUR_O).o) +OPENMPT123_OBJECTS = $(OPENMPT123_CXX_SOURCES:.cpp=$(FLAVOUR_O).o) $(OPENMPT123_C_SOURCES:.c=$(FLAVOUR_O).o) OPENMPT123_DEPENDS = $(OPENMPT123_OBJECTS:$(FLAVOUR_O).o=$(FLAVOUR_O).d) ALL_OBJECTS += $(OPENMPT123_OBJECTS) ALL_DEPENDS += $(OPENMPT123_DEPENDS) @@ -1337,7 +1337,7 @@ LIBOPENMPTTEST_C_SOURCES += \ LIBOPENMPTTEST_OBJECTS = $(LIBOPENMPTTEST_CXX_SOURCES:.cpp=.test$(FLAVOUR_O).o) $(LIBOPENMPTTEST_C_SOURCES:.c=.test$(FLAVOUR_O).o) -LIBOPENMPTTEST_DEPENDS = $(LIBOPENMPTTEST_CXX_SOURCES:.cpp=.test$(FLAVOUR_O).d) $(LIBOPENMPTTEST_C_SOURCES:.c=.test$(FLAVOUR_O).d) +LIBOPENMPTTEST_DEPENDS = $(LIBOPENMPTTEST_OBJCECTS:$(FLAVOUR_O).o=$(FLAVOUR_O).d) ALL_OBJECTS += $(LIBOPENMPTTEST_OBJECTS) ALL_DEPENDS += $(LIBOPENMPTTEST_DEPENDS) |
|
From: <sv...@op...> - 2024-08-30 10:51:25
|
Author: manx Date: Fri Aug 30 12:51:13 2024 New Revision: 21543 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21543 Log: Merged revision(s) 21539, 21541-21542 from trunk/OpenMPT: [New] build: CI: GitHub: Add RHEL8 and RHEL9. ........ [Fix] build: CI: GitHub: RHEL: Fix installing dependencies. ........ [Fix] build: CI: GitHub: RHEL: Fix installing dependencies. ........ Added: branches/OpenMPT-1.31/.github/workflows/RHEL-Autotools.yml - copied, changed from r21539, trunk/OpenMPT/.github/workflows/RHEL-Autotools.yml branches/OpenMPT-1.31/.github/workflows/RHEL-Makefile.yml - copied, changed from r21539, trunk/OpenMPT/.github/workflows/RHEL-Makefile.yml Modified: branches/OpenMPT-1.31/ (props changed) Copied and modified: branches/OpenMPT-1.31/.github/workflows/RHEL-Autotools.yml (from r21539, trunk/OpenMPT/.github/workflows/RHEL-Autotools.yml) ============================================================================== --- trunk/OpenMPT/.github/workflows/RHEL-Autotools.yml Fri Aug 30 09:38:16 2024 (r21539, copy source) +++ branches/OpenMPT-1.31/.github/workflows/RHEL-Autotools.yml Fri Aug 30 12:51:13 2024 (r21543) @@ -2,9 +2,7 @@ on: push: - branches: [ master ] - pull_request: - branches: [ master ] + branches: [ OpenMPT-1.31 ] jobs: build: @@ -27,8 +25,26 @@ image: ${{matrix.version}} steps: + - name: Update system + run: dnf -y upgrade --refresh + - name: Setup repositories + if: ${{ matrix.version == 'almalinux:8' }} + run: dnf -y install 'dnf-command(config-manager)' && dnf -y config-manager --set-enabled powertools && dnf -y install almalinux-release-devel && dnf -y clean all && dnf -y upgrade --refresh + - name: Setup repositories + if: ${{ matrix.version == 'almalinux:9' }} + run: dnf -y install 'dnf-command(config-manager)' && dnf -y config-manager --set-enabled crb && dnf -y install almalinux-release-devel && dnf -y clean all && dnf -y upgrade --refresh + - name: Setup repositories + if: ${{ matrix.version == 'rockylinux:8' }} + run: dnf -y install 'dnf-command(config-manager)' && dnf -y config-manager --set-enabled powertools && dnf -y config-manager --set-enabled devel && dnf -y clean all && dnf -y upgrade --refresh + - name: Setup repositories + if: ${{ matrix.version == 'rockylinux:9' }} + run: dnf -y install 'dnf-command(config-manager)' && dnf -y config-manager --set-enabled crb && dnf -y config-manager --set-enabled devel && dnf -y clean all && dnf -y upgrade --refresh - name: Install dependencies - run: dnf -y upgrade --refresh && dnf -y install subversion perl-XML-XPath git mawk zip unzip p7zip xz make binutils gcc gcc-g++ clang pcc pkgconf help2man doxygen autoconf autoconf-archive automake libtool ccache zlib-devel mpg123-devel libogg-devel libvorbis-devel portaudio-devel pulseaudio-libs-devel SDL2-devel flac-devel libsndfile-devel libtool-ltdl-devel + run: dnf -y install subversion perl-XML-XPath git gawk zip unzip xz make binutils gcc gcc-c++ clang pkgconf help2man doxygen autoconf autoconf-archive automake libtool zlib-devel mpg123-devel libogg-devel libvorbis-devel pulseaudio-libs-devel SDL2-devel flac-devel libsndfile-devel libtool-ltdl-devel + - name: Enable EPEL + run: dnf -y install epel-release + - name: Install EPEL dependencies + run: dnf -y install ccache portaudio-devel - name: Checkout uses: actions/checkout@v4 - name: fix git Copied and modified: branches/OpenMPT-1.31/.github/workflows/RHEL-Makefile.yml (from r21539, trunk/OpenMPT/.github/workflows/RHEL-Makefile.yml) ============================================================================== --- trunk/OpenMPT/.github/workflows/RHEL-Makefile.yml Fri Aug 30 09:38:16 2024 (r21539, copy source) +++ branches/OpenMPT-1.31/.github/workflows/RHEL-Makefile.yml Fri Aug 30 12:51:13 2024 (r21543) @@ -2,9 +2,7 @@ on: push: - branches: [ master ] - pull_request: - branches: [ master ] + branches: [ OpenMPT-1.31 ] jobs: build: @@ -35,8 +33,26 @@ image: ${{matrix.version}} steps: + - name: Update system + run: dnf -y upgrade --refresh + - name: Setup repositories + if: ${{ matrix.version == 'almalinux:8' }} + run: dnf -y install 'dnf-command(config-manager)' && dnf -y config-manager --set-enabled powertools && dnf -y install almalinux-release-devel && dnf -y clean all && dnf -y upgrade --refresh + - name: Setup repositories + if: ${{ matrix.version == 'almalinux:9' }} + run: dnf -y install 'dnf-command(config-manager)' && dnf -y config-manager --set-enabled crb && dnf -y install almalinux-release-devel && dnf -y clean all && dnf -y upgrade --refresh + - name: Setup repositories + if: ${{ matrix.version == 'rockylinux:8' }} + run: dnf -y install 'dnf-command(config-manager)' && dnf -y config-manager --set-enabled powertools && dnf -y config-manager --set-enabled devel && dnf -y clean all && dnf -y upgrade --refresh + - name: Setup repositories + if: ${{ matrix.version == 'rockylinux:9' }} + run: dnf -y install 'dnf-command(config-manager)' && dnf -y config-manager --set-enabled crb && dnf -y config-manager --set-enabled devel && dnf -y clean all && dnf -y upgrade --refresh - name: Install dependencies - run: dnf -y upgrade --refresh && dnf -y install subversion perl-XML-XPath git mawk zip unzip p7zip xz make binutils gcc gcc-g++ clang pcc pkgconf help2man doxygen autoconf autoconf-archive automake libtool ccache zlib-devel mpg123-devel libogg-devel libvorbis-devel portaudio-devel pulseaudio-libs-devel SDL2-devel flac-devel libsndfile-devel libtool-ltdl-devel + run: dnf -y install subversion perl-XML-XPath git gawk zip unzip xz make binutils gcc gcc-c++ clang pkgconf help2man doxygen autoconf autoconf-archive automake libtool zlib-devel mpg123-devel libogg-devel libvorbis-devel pulseaudio-libs-devel SDL2-devel flac-devel libsndfile-devel libtool-ltdl-devel + - name: Enable EPEL + run: dnf -y install epel-release + - name: Install EPEL dependencies + run: dnf -y install ccache portaudio-devel - name: Checkout uses: actions/checkout@v4 - name: fix git |
|
From: <sv...@op...> - 2024-08-30 09:35:33
|
Author: manx Date: Fri Aug 30 11:35:20 2024 New Revision: 21542 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21542 Log: [Fix] build: CI: GitHub: RHEL: Fix installing dependencies. Modified: trunk/OpenMPT/.github/workflows/RHEL-Autotools.yml trunk/OpenMPT/.github/workflows/RHEL-Makefile.yml Modified: trunk/OpenMPT/.github/workflows/RHEL-Autotools.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/RHEL-Autotools.yml Fri Aug 30 11:08:16 2024 (r21541) +++ trunk/OpenMPT/.github/workflows/RHEL-Autotools.yml Fri Aug 30 11:35:20 2024 (r21542) @@ -43,6 +43,10 @@ run: dnf -y install 'dnf-command(config-manager)' && dnf -y config-manager --set-enabled crb && dnf -y config-manager --set-enabled devel && dnf -y clean all && dnf -y upgrade --refresh - name: Install dependencies run: dnf -y install subversion perl-XML-XPath git gawk zip unzip xz make binutils gcc gcc-c++ clang pkgconf help2man doxygen autoconf autoconf-archive automake libtool zlib-devel mpg123-devel libogg-devel libvorbis-devel pulseaudio-libs-devel SDL2-devel flac-devel libsndfile-devel libtool-ltdl-devel + - name: Enable EPEL + run: dnf -y install epel-release + - name: Install EPEL dependencies + run: dnf -y install ccache portaudio-devel - name: Checkout uses: actions/checkout@v4 - name: fix git Modified: trunk/OpenMPT/.github/workflows/RHEL-Makefile.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/RHEL-Makefile.yml Fri Aug 30 11:08:16 2024 (r21541) +++ trunk/OpenMPT/.github/workflows/RHEL-Makefile.yml Fri Aug 30 11:35:20 2024 (r21542) @@ -51,6 +51,10 @@ run: dnf -y install 'dnf-command(config-manager)' && dnf -y config-manager --set-enabled crb && dnf -y config-manager --set-enabled devel && dnf -y clean all && dnf -y upgrade --refresh - name: Install dependencies run: dnf -y install subversion perl-XML-XPath git gawk zip unzip xz make binutils gcc gcc-c++ clang pkgconf help2man doxygen autoconf autoconf-archive automake libtool zlib-devel mpg123-devel libogg-devel libvorbis-devel pulseaudio-libs-devel SDL2-devel flac-devel libsndfile-devel libtool-ltdl-devel + - name: Enable EPEL + run: dnf -y install epel-release + - name: Install EPEL dependencies + run: dnf -y install ccache portaudio-devel - name: Checkout uses: actions/checkout@v4 - name: fix git |
|
From: <sv...@op...> - 2024-08-30 09:08:28
|
Author: manx Date: Fri Aug 30 11:08:16 2024 New Revision: 21541 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21541 Log: [Fix] build: CI: GitHub: RHEL: Fix installing dependencies. Modified: trunk/OpenMPT/.github/workflows/RHEL-Autotools.yml trunk/OpenMPT/.github/workflows/RHEL-Makefile.yml Modified: trunk/OpenMPT/.github/workflows/RHEL-Autotools.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/RHEL-Autotools.yml Fri Aug 30 10:23:15 2024 (r21540) +++ trunk/OpenMPT/.github/workflows/RHEL-Autotools.yml Fri Aug 30 11:08:16 2024 (r21541) @@ -27,8 +27,22 @@ image: ${{matrix.version}} steps: + - name: Update system + run: dnf -y upgrade --refresh + - name: Setup repositories + if: ${{ matrix.version == 'almalinux:8' }} + run: dnf -y install 'dnf-command(config-manager)' && dnf -y config-manager --set-enabled powertools && dnf -y install almalinux-release-devel && dnf -y clean all && dnf -y upgrade --refresh + - name: Setup repositories + if: ${{ matrix.version == 'almalinux:9' }} + run: dnf -y install 'dnf-command(config-manager)' && dnf -y config-manager --set-enabled crb && dnf -y install almalinux-release-devel && dnf -y clean all && dnf -y upgrade --refresh + - name: Setup repositories + if: ${{ matrix.version == 'rockylinux:8' }} + run: dnf -y install 'dnf-command(config-manager)' && dnf -y config-manager --set-enabled powertools && dnf -y config-manager --set-enabled devel && dnf -y clean all && dnf -y upgrade --refresh + - name: Setup repositories + if: ${{ matrix.version == 'rockylinux:9' }} + run: dnf -y install 'dnf-command(config-manager)' && dnf -y config-manager --set-enabled crb && dnf -y config-manager --set-enabled devel && dnf -y clean all && dnf -y upgrade --refresh - name: Install dependencies - run: dnf -y upgrade --refresh && dnf -y install subversion perl-XML-XPath git mawk zip unzip p7zip xz make binutils gcc gcc-g++ clang pcc pkgconf help2man doxygen autoconf autoconf-archive automake libtool ccache zlib-devel mpg123-devel libogg-devel libvorbis-devel portaudio-devel pulseaudio-libs-devel SDL2-devel flac-devel libsndfile-devel libtool-ltdl-devel + run: dnf -y install subversion perl-XML-XPath git gawk zip unzip xz make binutils gcc gcc-c++ clang pkgconf help2man doxygen autoconf autoconf-archive automake libtool zlib-devel mpg123-devel libogg-devel libvorbis-devel pulseaudio-libs-devel SDL2-devel flac-devel libsndfile-devel libtool-ltdl-devel - name: Checkout uses: actions/checkout@v4 - name: fix git Modified: trunk/OpenMPT/.github/workflows/RHEL-Makefile.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/RHEL-Makefile.yml Fri Aug 30 10:23:15 2024 (r21540) +++ trunk/OpenMPT/.github/workflows/RHEL-Makefile.yml Fri Aug 30 11:08:16 2024 (r21541) @@ -35,8 +35,22 @@ image: ${{matrix.version}} steps: + - name: Update system + run: dnf -y upgrade --refresh + - name: Setup repositories + if: ${{ matrix.version == 'almalinux:8' }} + run: dnf -y install 'dnf-command(config-manager)' && dnf -y config-manager --set-enabled powertools && dnf -y install almalinux-release-devel && dnf -y clean all && dnf -y upgrade --refresh + - name: Setup repositories + if: ${{ matrix.version == 'almalinux:9' }} + run: dnf -y install 'dnf-command(config-manager)' && dnf -y config-manager --set-enabled crb && dnf -y install almalinux-release-devel && dnf -y clean all && dnf -y upgrade --refresh + - name: Setup repositories + if: ${{ matrix.version == 'rockylinux:8' }} + run: dnf -y install 'dnf-command(config-manager)' && dnf -y config-manager --set-enabled powertools && dnf -y config-manager --set-enabled devel && dnf -y clean all && dnf -y upgrade --refresh + - name: Setup repositories + if: ${{ matrix.version == 'rockylinux:9' }} + run: dnf -y install 'dnf-command(config-manager)' && dnf -y config-manager --set-enabled crb && dnf -y config-manager --set-enabled devel && dnf -y clean all && dnf -y upgrade --refresh - name: Install dependencies - run: dnf -y upgrade --refresh && dnf -y install subversion perl-XML-XPath git mawk zip unzip p7zip xz make binutils gcc gcc-g++ clang pcc pkgconf help2man doxygen autoconf autoconf-archive automake libtool ccache zlib-devel mpg123-devel libogg-devel libvorbis-devel portaudio-devel pulseaudio-libs-devel SDL2-devel flac-devel libsndfile-devel libtool-ltdl-devel + run: dnf -y install subversion perl-XML-XPath git gawk zip unzip xz make binutils gcc gcc-c++ clang pkgconf help2man doxygen autoconf autoconf-archive automake libtool zlib-devel mpg123-devel libogg-devel libvorbis-devel pulseaudio-libs-devel SDL2-devel flac-devel libsndfile-devel libtool-ltdl-devel - name: Checkout uses: actions/checkout@v4 - name: fix git |
|
From: <sv...@op...> - 2024-08-30 08:23:28
|
Author: manx Date: Fri Aug 30 10:23:15 2024 New Revision: 21540 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21540 Log: [Ref] Makefile: Remove redundant options for 3rd party libraries. Modified: trunk/OpenMPT/Makefile Modified: trunk/OpenMPT/Makefile ============================================================================== --- trunk/OpenMPT/Makefile Fri Aug 30 09:38:16 2024 (r21539) +++ trunk/OpenMPT/Makefile Fri Aug 30 10:23:15 2024 (r21540) @@ -664,7 +664,6 @@ LOCAL_ZLIB_SOURCES += include/zlib/uncompr.c LOCAL_ZLIB_SOURCES += include/zlib/zutil.c include/zlib/%$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DSTDC -DZ_HAVE_UNISTD_H -include/zlib/%.test$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DSTDC -DZ_HAVE_UNISTD_H else ifeq ($(NO_ZLIB),1) else @@ -725,13 +724,9 @@ ALL_OBJECTS += $(MPG123_OBJECTS) ALL_DEPENDS += $(MPG123_DEPENDS) include/mpg123/src/compat/%$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC -include/mpg123/src/compat/%.test$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC include/mpg123/src/libmpg123/%$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC -include/mpg123/src/libmpg123/%.test$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC include/mpg123/src/compat/%$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS) -include/mpg123/src/compat/%.test$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS) include/mpg123/src/libmpg123/%$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS) -include/mpg123/src/libmpg123/%.test$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS) LOCAL_MPG123_SOURCES := LOCAL_MPG123_SOURCES += LOCAL_MPG123_OBJECTS := @@ -785,13 +780,9 @@ LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/synth_s32.c LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/tabinit.c include/mpg123/src/compat/%$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC -include/mpg123/src/compat/%.test$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC include/mpg123/src/libmpg123/%$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC -include/mpg123/src/libmpg123/%.test$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC include/mpg123/src/compat/%$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS) -include/mpg123/src/compat/%.test$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS) include/mpg123/src/libmpg123/%$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS) -include/mpg123/src/libmpg123/%.test$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS) endif @@ -824,7 +815,6 @@ LOCAL_OGG_SOURCES += include/ogg/src/bitwise.c LOCAL_OGG_SOURCES += include/ogg/src/framing.c include/ogg/src/%$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -include/ogg/src/%.test$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) else ifeq ($(NO_OGG),1) else @@ -877,7 +867,6 @@ LOCAL_VORBIS_SOURCES += include/vorbis/lib/vorbisfile.c LOCAL_VORBIS_SOURCES += include/vorbis/lib/window.c include/vorbis/lib/%$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -include/vorbis/lib/%.test$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) else ifeq ($(NO_VORBIS),1) else |
3 messages has been excluded from this view by a project administrator.
