From: <sv...@op...> - 2024-08-29 15:37:09
|
Author: manx Date: Thu Aug 29 17:37:00 2024 New Revision: 21533 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21533 Log: [Ref] openmpt123: Use mpt/random. Modified: trunk/OpenMPT/build/premake/mpt-openmpt123.lua trunk/OpenMPT/build/vs2017winxp/openmpt123.vcxproj trunk/OpenMPT/build/vs2017winxp/openmpt123.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/openmpt123.vcxproj trunk/OpenMPT/build/vs2017winxpansi/openmpt123.vcxproj.filters trunk/OpenMPT/build/vs2019win10/openmpt123.vcxproj trunk/OpenMPT/build/vs2019win10/openmpt123.vcxproj.filters trunk/OpenMPT/build/vs2019win7/openmpt123.vcxproj trunk/OpenMPT/build/vs2019win7/openmpt123.vcxproj.filters trunk/OpenMPT/build/vs2019win8/openmpt123.vcxproj trunk/OpenMPT/build/vs2019win8/openmpt123.vcxproj.filters trunk/OpenMPT/build/vs2019win81/openmpt123.vcxproj trunk/OpenMPT/build/vs2019win81/openmpt123.vcxproj.filters trunk/OpenMPT/build/vs2022win10/openmpt123.vcxproj trunk/OpenMPT/build/vs2022win10/openmpt123.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/openmpt123.vcxproj trunk/OpenMPT/build/vs2022win10clang/openmpt123.vcxproj.filters trunk/OpenMPT/build/vs2022win7/openmpt123.vcxproj trunk/OpenMPT/build/vs2022win7/openmpt123.vcxproj.filters trunk/OpenMPT/build/vs2022win8/openmpt123.vcxproj trunk/OpenMPT/build/vs2022win8/openmpt123.vcxproj.filters trunk/OpenMPT/build/vs2022win81/openmpt123.vcxproj trunk/OpenMPT/build/vs2022win81/openmpt123.vcxproj.filters trunk/OpenMPT/openmpt123/openmpt123.cpp Modified: trunk/OpenMPT/build/premake/mpt-openmpt123.lua ============================================================================== --- trunk/OpenMPT/build/premake/mpt-openmpt123.lua Thu Aug 29 17:28:57 2024 (r21532) +++ trunk/OpenMPT/build/premake/mpt-openmpt123.lua Thu Aug 29 17:37:00 2024 (r21533) @@ -34,6 +34,7 @@ "../../src/mpt/io_file/*.hpp", "../../src/mpt/parse/*.hpp", "../../src/mpt/path/*.hpp", + "../../src/mpt/random/*.hpp", "../../src/mpt/string/*.hpp", "../../src/mpt/string_transcode/*.hpp", "../../openmpt123/*.cpp", Modified: trunk/OpenMPT/build/vs2017winxp/openmpt123.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/openmpt123.vcxproj Thu Aug 29 17:28:57 2024 (r21532) +++ trunk/OpenMPT/build/vs2017winxp/openmpt123.vcxproj Thu Aug 29 17:37:00 2024 (r21533) @@ -820,6 +820,14 @@ <ClInclude Include="..\..\src\mpt\path\os_path.hpp" /> <ClInclude Include="..\..\src\mpt\path\os_path_long.hpp" /> <ClInclude Include="..\..\src\mpt\path\path.hpp" /> + <ClInclude Include="..\..\src\mpt\random\any_engine.hpp" /> + <ClInclude Include="..\..\src\mpt\random\crand.hpp" /> + <ClInclude Include="..\..\src\mpt\random\default_engines.hpp" /> + <ClInclude Include="..\..\src\mpt\random\device.hpp" /> + <ClInclude Include="..\..\src\mpt\random\engine.hpp" /> + <ClInclude Include="..\..\src\mpt\random\engine_lcg.hpp" /> + <ClInclude Include="..\..\src\mpt\random\random.hpp" /> + <ClInclude Include="..\..\src\mpt\random\seed.hpp" /> <ClInclude Include="..\..\src\mpt\string\buffer.hpp" /> <ClInclude Include="..\..\src\mpt\string\types.hpp" /> <ClInclude Include="..\..\src\mpt\string\utility.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/openmpt123.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/openmpt123.vcxproj.filters Thu Aug 29 17:28:57 2024 (r21532) +++ trunk/OpenMPT/build/vs2017winxp/openmpt123.vcxproj.filters Thu Aug 29 17:37:00 2024 (r21533) @@ -37,6 +37,9 @@ <Filter Include="src\mpt\path"> <UniqueIdentifier>{4984D703-35E7-66A8-DE6C-9F5ECAAE322B}</UniqueIdentifier> </Filter> + <Filter Include="src\mpt\random"> + <UniqueIdentifier>{3DBF705C-298D-6462-1221-D588FE8D40C7}</UniqueIdentifier> + </Filter> <Filter Include="src\mpt\string"> <UniqueIdentifier>{13002060-FFCD-1366-E861-848CD4CEEFCA}</UniqueIdentifier> </Filter> @@ -306,6 +309,30 @@ <ClInclude Include="..\..\src\mpt\path\path.hpp"> <Filter>src\mpt\path</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\random\any_engine.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\crand.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\default_engines.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\device.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\engine.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\engine_lcg.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\random.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\seed.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\string\buffer.hpp"> <Filter>src\mpt\string</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxpansi/openmpt123.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/openmpt123.vcxproj Thu Aug 29 17:28:57 2024 (r21532) +++ trunk/OpenMPT/build/vs2017winxpansi/openmpt123.vcxproj Thu Aug 29 17:37:00 2024 (r21533) @@ -820,6 +820,14 @@ <ClInclude Include="..\..\src\mpt\path\os_path.hpp" /> <ClInclude Include="..\..\src\mpt\path\os_path_long.hpp" /> <ClInclude Include="..\..\src\mpt\path\path.hpp" /> + <ClInclude Include="..\..\src\mpt\random\any_engine.hpp" /> + <ClInclude Include="..\..\src\mpt\random\crand.hpp" /> + <ClInclude Include="..\..\src\mpt\random\default_engines.hpp" /> + <ClInclude Include="..\..\src\mpt\random\device.hpp" /> + <ClInclude Include="..\..\src\mpt\random\engine.hpp" /> + <ClInclude Include="..\..\src\mpt\random\engine_lcg.hpp" /> + <ClInclude Include="..\..\src\mpt\random\random.hpp" /> + <ClInclude Include="..\..\src\mpt\random\seed.hpp" /> <ClInclude Include="..\..\src\mpt\string\buffer.hpp" /> <ClInclude Include="..\..\src\mpt\string\types.hpp" /> <ClInclude Include="..\..\src\mpt\string\utility.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/openmpt123.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/openmpt123.vcxproj.filters Thu Aug 29 17:28:57 2024 (r21532) +++ trunk/OpenMPT/build/vs2017winxpansi/openmpt123.vcxproj.filters Thu Aug 29 17:37:00 2024 (r21533) @@ -37,6 +37,9 @@ <Filter Include="src\mpt\path"> <UniqueIdentifier>{4984D703-35E7-66A8-DE6C-9F5ECAAE322B}</UniqueIdentifier> </Filter> + <Filter Include="src\mpt\random"> + <UniqueIdentifier>{3DBF705C-298D-6462-1221-D588FE8D40C7}</UniqueIdentifier> + </Filter> <Filter Include="src\mpt\string"> <UniqueIdentifier>{13002060-FFCD-1366-E861-848CD4CEEFCA}</UniqueIdentifier> </Filter> @@ -306,6 +309,30 @@ <ClInclude Include="..\..\src\mpt\path\path.hpp"> <Filter>src\mpt\path</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\random\any_engine.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\crand.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\default_engines.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\device.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\engine.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\engine_lcg.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\random.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\seed.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\string\buffer.hpp"> <Filter>src\mpt\string</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2019win10/openmpt123.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win10/openmpt123.vcxproj Thu Aug 29 17:28:57 2024 (r21532) +++ trunk/OpenMPT/build/vs2019win10/openmpt123.vcxproj Thu Aug 29 17:37:00 2024 (r21533) @@ -1537,6 +1537,14 @@ <ClInclude Include="..\..\src\mpt\path\os_path.hpp" /> <ClInclude Include="..\..\src\mpt\path\os_path_long.hpp" /> <ClInclude Include="..\..\src\mpt\path\path.hpp" /> + <ClInclude Include="..\..\src\mpt\random\any_engine.hpp" /> + <ClInclude Include="..\..\src\mpt\random\crand.hpp" /> + <ClInclude Include="..\..\src\mpt\random\default_engines.hpp" /> + <ClInclude Include="..\..\src\mpt\random\device.hpp" /> + <ClInclude Include="..\..\src\mpt\random\engine.hpp" /> + <ClInclude Include="..\..\src\mpt\random\engine_lcg.hpp" /> + <ClInclude Include="..\..\src\mpt\random\random.hpp" /> + <ClInclude Include="..\..\src\mpt\random\seed.hpp" /> <ClInclude Include="..\..\src\mpt\string\buffer.hpp" /> <ClInclude Include="..\..\src\mpt\string\types.hpp" /> <ClInclude Include="..\..\src\mpt\string\utility.hpp" /> Modified: trunk/OpenMPT/build/vs2019win10/openmpt123.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win10/openmpt123.vcxproj.filters Thu Aug 29 17:28:57 2024 (r21532) +++ trunk/OpenMPT/build/vs2019win10/openmpt123.vcxproj.filters Thu Aug 29 17:37:00 2024 (r21533) @@ -43,6 +43,9 @@ <Filter Include="src\mpt\path"> <UniqueIdentifier>{4984D703-35E7-66A8-DE6C-9F5ECAAE322B}</UniqueIdentifier> </Filter> + <Filter Include="src\mpt\random"> + <UniqueIdentifier>{3DBF705C-298D-6462-1221-D588FE8D40C7}</UniqueIdentifier> + </Filter> <Filter Include="src\mpt\string"> <UniqueIdentifier>{13002060-FFCD-1366-E861-848CD4CEEFCA}</UniqueIdentifier> </Filter> @@ -312,6 +315,30 @@ <ClInclude Include="..\..\src\mpt\path\path.hpp"> <Filter>src\mpt\path</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\random\any_engine.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\crand.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\default_engines.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\device.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\engine.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\engine_lcg.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\random.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\seed.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\string\buffer.hpp"> <Filter>src\mpt\string</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2019win7/openmpt123.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/openmpt123.vcxproj Thu Aug 29 17:28:57 2024 (r21532) +++ trunk/OpenMPT/build/vs2019win7/openmpt123.vcxproj Thu Aug 29 17:37:00 2024 (r21533) @@ -817,6 +817,14 @@ <ClInclude Include="..\..\src\mpt\path\os_path.hpp" /> <ClInclude Include="..\..\src\mpt\path\os_path_long.hpp" /> <ClInclude Include="..\..\src\mpt\path\path.hpp" /> + <ClInclude Include="..\..\src\mpt\random\any_engine.hpp" /> + <ClInclude Include="..\..\src\mpt\random\crand.hpp" /> + <ClInclude Include="..\..\src\mpt\random\default_engines.hpp" /> + <ClInclude Include="..\..\src\mpt\random\device.hpp" /> + <ClInclude Include="..\..\src\mpt\random\engine.hpp" /> + <ClInclude Include="..\..\src\mpt\random\engine_lcg.hpp" /> + <ClInclude Include="..\..\src\mpt\random\random.hpp" /> + <ClInclude Include="..\..\src\mpt\random\seed.hpp" /> <ClInclude Include="..\..\src\mpt\string\buffer.hpp" /> <ClInclude Include="..\..\src\mpt\string\types.hpp" /> <ClInclude Include="..\..\src\mpt\string\utility.hpp" /> Modified: trunk/OpenMPT/build/vs2019win7/openmpt123.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/openmpt123.vcxproj.filters Thu Aug 29 17:28:57 2024 (r21532) +++ trunk/OpenMPT/build/vs2019win7/openmpt123.vcxproj.filters Thu Aug 29 17:37:00 2024 (r21533) @@ -43,6 +43,9 @@ <Filter Include="src\mpt\path"> <UniqueIdentifier>{4984D703-35E7-66A8-DE6C-9F5ECAAE322B}</UniqueIdentifier> </Filter> + <Filter Include="src\mpt\random"> + <UniqueIdentifier>{3DBF705C-298D-6462-1221-D588FE8D40C7}</UniqueIdentifier> + </Filter> <Filter Include="src\mpt\string"> <UniqueIdentifier>{13002060-FFCD-1366-E861-848CD4CEEFCA}</UniqueIdentifier> </Filter> @@ -312,6 +315,30 @@ <ClInclude Include="..\..\src\mpt\path\path.hpp"> <Filter>src\mpt\path</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\random\any_engine.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\crand.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\default_engines.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\device.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\engine.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\engine_lcg.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\random.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\seed.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\string\buffer.hpp"> <Filter>src\mpt\string</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2019win8/openmpt123.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win8/openmpt123.vcxproj Thu Aug 29 17:28:57 2024 (r21532) +++ trunk/OpenMPT/build/vs2019win8/openmpt123.vcxproj Thu Aug 29 17:37:00 2024 (r21533) @@ -1177,6 +1177,14 @@ <ClInclude Include="..\..\src\mpt\path\os_path.hpp" /> <ClInclude Include="..\..\src\mpt\path\os_path_long.hpp" /> <ClInclude Include="..\..\src\mpt\path\path.hpp" /> + <ClInclude Include="..\..\src\mpt\random\any_engine.hpp" /> + <ClInclude Include="..\..\src\mpt\random\crand.hpp" /> + <ClInclude Include="..\..\src\mpt\random\default_engines.hpp" /> + <ClInclude Include="..\..\src\mpt\random\device.hpp" /> + <ClInclude Include="..\..\src\mpt\random\engine.hpp" /> + <ClInclude Include="..\..\src\mpt\random\engine_lcg.hpp" /> + <ClInclude Include="..\..\src\mpt\random\random.hpp" /> + <ClInclude Include="..\..\src\mpt\random\seed.hpp" /> <ClInclude Include="..\..\src\mpt\string\buffer.hpp" /> <ClInclude Include="..\..\src\mpt\string\types.hpp" /> <ClInclude Include="..\..\src\mpt\string\utility.hpp" /> Modified: trunk/OpenMPT/build/vs2019win8/openmpt123.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win8/openmpt123.vcxproj.filters Thu Aug 29 17:28:57 2024 (r21532) +++ trunk/OpenMPT/build/vs2019win8/openmpt123.vcxproj.filters Thu Aug 29 17:37:00 2024 (r21533) @@ -43,6 +43,9 @@ <Filter Include="src\mpt\path"> <UniqueIdentifier>{4984D703-35E7-66A8-DE6C-9F5ECAAE322B}</UniqueIdentifier> </Filter> + <Filter Include="src\mpt\random"> + <UniqueIdentifier>{3DBF705C-298D-6462-1221-D588FE8D40C7}</UniqueIdentifier> + </Filter> <Filter Include="src\mpt\string"> <UniqueIdentifier>{13002060-FFCD-1366-E861-848CD4CEEFCA}</UniqueIdentifier> </Filter> @@ -312,6 +315,30 @@ <ClInclude Include="..\..\src\mpt\path\path.hpp"> <Filter>src\mpt\path</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\random\any_engine.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\crand.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\default_engines.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\device.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\engine.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\engine_lcg.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\random.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\seed.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\string\buffer.hpp"> <Filter>src\mpt\string</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2019win81/openmpt123.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win81/openmpt123.vcxproj Thu Aug 29 17:28:57 2024 (r21532) +++ trunk/OpenMPT/build/vs2019win81/openmpt123.vcxproj Thu Aug 29 17:37:00 2024 (r21533) @@ -1177,6 +1177,14 @@ <ClInclude Include="..\..\src\mpt\path\os_path.hpp" /> <ClInclude Include="..\..\src\mpt\path\os_path_long.hpp" /> <ClInclude Include="..\..\src\mpt\path\path.hpp" /> + <ClInclude Include="..\..\src\mpt\random\any_engine.hpp" /> + <ClInclude Include="..\..\src\mpt\random\crand.hpp" /> + <ClInclude Include="..\..\src\mpt\random\default_engines.hpp" /> + <ClInclude Include="..\..\src\mpt\random\device.hpp" /> + <ClInclude Include="..\..\src\mpt\random\engine.hpp" /> + <ClInclude Include="..\..\src\mpt\random\engine_lcg.hpp" /> + <ClInclude Include="..\..\src\mpt\random\random.hpp" /> + <ClInclude Include="..\..\src\mpt\random\seed.hpp" /> <ClInclude Include="..\..\src\mpt\string\buffer.hpp" /> <ClInclude Include="..\..\src\mpt\string\types.hpp" /> <ClInclude Include="..\..\src\mpt\string\utility.hpp" /> Modified: trunk/OpenMPT/build/vs2019win81/openmpt123.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win81/openmpt123.vcxproj.filters Thu Aug 29 17:28:57 2024 (r21532) +++ trunk/OpenMPT/build/vs2019win81/openmpt123.vcxproj.filters Thu Aug 29 17:37:00 2024 (r21533) @@ -43,6 +43,9 @@ <Filter Include="src\mpt\path"> <UniqueIdentifier>{4984D703-35E7-66A8-DE6C-9F5ECAAE322B}</UniqueIdentifier> </Filter> + <Filter Include="src\mpt\random"> + <UniqueIdentifier>{3DBF705C-298D-6462-1221-D588FE8D40C7}</UniqueIdentifier> + </Filter> <Filter Include="src\mpt\string"> <UniqueIdentifier>{13002060-FFCD-1366-E861-848CD4CEEFCA}</UniqueIdentifier> </Filter> @@ -312,6 +315,30 @@ <ClInclude Include="..\..\src\mpt\path\path.hpp"> <Filter>src\mpt\path</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\random\any_engine.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\crand.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\default_engines.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\device.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\engine.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\engine_lcg.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\random.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\seed.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\string\buffer.hpp"> <Filter>src\mpt\string</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2022win10/openmpt123.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10/openmpt123.vcxproj Thu Aug 29 17:28:57 2024 (r21532) +++ trunk/OpenMPT/build/vs2022win10/openmpt123.vcxproj Thu Aug 29 17:37:00 2024 (r21533) @@ -1595,6 +1595,14 @@ <ClInclude Include="..\..\src\mpt\path\os_path.hpp" /> <ClInclude Include="..\..\src\mpt\path\os_path_long.hpp" /> <ClInclude Include="..\..\src\mpt\path\path.hpp" /> + <ClInclude Include="..\..\src\mpt\random\any_engine.hpp" /> + <ClInclude Include="..\..\src\mpt\random\crand.hpp" /> + <ClInclude Include="..\..\src\mpt\random\default_engines.hpp" /> + <ClInclude Include="..\..\src\mpt\random\device.hpp" /> + <ClInclude Include="..\..\src\mpt\random\engine.hpp" /> + <ClInclude Include="..\..\src\mpt\random\engine_lcg.hpp" /> + <ClInclude Include="..\..\src\mpt\random\random.hpp" /> + <ClInclude Include="..\..\src\mpt\random\seed.hpp" /> <ClInclude Include="..\..\src\mpt\string\buffer.hpp" /> <ClInclude Include="..\..\src\mpt\string\types.hpp" /> <ClInclude Include="..\..\src\mpt\string\utility.hpp" /> Modified: trunk/OpenMPT/build/vs2022win10/openmpt123.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10/openmpt123.vcxproj.filters Thu Aug 29 17:28:57 2024 (r21532) +++ trunk/OpenMPT/build/vs2022win10/openmpt123.vcxproj.filters Thu Aug 29 17:37:00 2024 (r21533) @@ -43,6 +43,9 @@ <Filter Include="src\mpt\path"> <UniqueIdentifier>{4984D703-35E7-66A8-DE6C-9F5ECAAE322B}</UniqueIdentifier> </Filter> + <Filter Include="src\mpt\random"> + <UniqueIdentifier>{3DBF705C-298D-6462-1221-D588FE8D40C7}</UniqueIdentifier> + </Filter> <Filter Include="src\mpt\string"> <UniqueIdentifier>{13002060-FFCD-1366-E861-848CD4CEEFCA}</UniqueIdentifier> </Filter> @@ -312,6 +315,30 @@ <ClInclude Include="..\..\src\mpt\path\path.hpp"> <Filter>src\mpt\path</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\random\any_engine.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\crand.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\default_engines.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\device.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\engine.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\engine_lcg.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\random.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\seed.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\string\buffer.hpp"> <Filter>src\mpt\string</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2022win10clang/openmpt123.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/openmpt123.vcxproj Thu Aug 29 17:28:57 2024 (r21532) +++ trunk/OpenMPT/build/vs2022win10clang/openmpt123.vcxproj Thu Aug 29 17:37:00 2024 (r21533) @@ -1513,6 +1513,14 @@ <ClInclude Include="..\..\src\mpt\path\os_path.hpp" /> <ClInclude Include="..\..\src\mpt\path\os_path_long.hpp" /> <ClInclude Include="..\..\src\mpt\path\path.hpp" /> + <ClInclude Include="..\..\src\mpt\random\any_engine.hpp" /> + <ClInclude Include="..\..\src\mpt\random\crand.hpp" /> + <ClInclude Include="..\..\src\mpt\random\default_engines.hpp" /> + <ClInclude Include="..\..\src\mpt\random\device.hpp" /> + <ClInclude Include="..\..\src\mpt\random\engine.hpp" /> + <ClInclude Include="..\..\src\mpt\random\engine_lcg.hpp" /> + <ClInclude Include="..\..\src\mpt\random\random.hpp" /> + <ClInclude Include="..\..\src\mpt\random\seed.hpp" /> <ClInclude Include="..\..\src\mpt\string\buffer.hpp" /> <ClInclude Include="..\..\src\mpt\string\types.hpp" /> <ClInclude Include="..\..\src\mpt\string\utility.hpp" /> Modified: trunk/OpenMPT/build/vs2022win10clang/openmpt123.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/openmpt123.vcxproj.filters Thu Aug 29 17:28:57 2024 (r21532) +++ trunk/OpenMPT/build/vs2022win10clang/openmpt123.vcxproj.filters Thu Aug 29 17:37:00 2024 (r21533) @@ -43,6 +43,9 @@ <Filter Include="src\mpt\path"> <UniqueIdentifier>{4984D703-35E7-66A8-DE6C-9F5ECAAE322B}</UniqueIdentifier> </Filter> + <Filter Include="src\mpt\random"> + <UniqueIdentifier>{3DBF705C-298D-6462-1221-D588FE8D40C7}</UniqueIdentifier> + </Filter> <Filter Include="src\mpt\string"> <UniqueIdentifier>{13002060-FFCD-1366-E861-848CD4CEEFCA}</UniqueIdentifier> </Filter> @@ -312,6 +315,30 @@ <ClInclude Include="..\..\src\mpt\path\path.hpp"> <Filter>src\mpt\path</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\random\any_engine.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\crand.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\default_engines.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\device.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\engine.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\engine_lcg.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\random.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\seed.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\string\buffer.hpp"> <Filter>src\mpt\string</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2022win7/openmpt123.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win7/openmpt123.vcxproj Thu Aug 29 17:28:57 2024 (r21532) +++ trunk/OpenMPT/build/vs2022win7/openmpt123.vcxproj Thu Aug 29 17:37:00 2024 (r21533) @@ -837,6 +837,14 @@ <ClInclude Include="..\..\src\mpt\path\os_path.hpp" /> <ClInclude Include="..\..\src\mpt\path\os_path_long.hpp" /> <ClInclude Include="..\..\src\mpt\path\path.hpp" /> + <ClInclude Include="..\..\src\mpt\random\any_engine.hpp" /> + <ClInclude Include="..\..\src\mpt\random\crand.hpp" /> + <ClInclude Include="..\..\src\mpt\random\default_engines.hpp" /> + <ClInclude Include="..\..\src\mpt\random\device.hpp" /> + <ClInclude Include="..\..\src\mpt\random\engine.hpp" /> + <ClInclude Include="..\..\src\mpt\random\engine_lcg.hpp" /> + <ClInclude Include="..\..\src\mpt\random\random.hpp" /> + <ClInclude Include="..\..\src\mpt\random\seed.hpp" /> <ClInclude Include="..\..\src\mpt\string\buffer.hpp" /> <ClInclude Include="..\..\src\mpt\string\types.hpp" /> <ClInclude Include="..\..\src\mpt\string\utility.hpp" /> Modified: trunk/OpenMPT/build/vs2022win7/openmpt123.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win7/openmpt123.vcxproj.filters Thu Aug 29 17:28:57 2024 (r21532) +++ trunk/OpenMPT/build/vs2022win7/openmpt123.vcxproj.filters Thu Aug 29 17:37:00 2024 (r21533) @@ -43,6 +43,9 @@ <Filter Include="src\mpt\path"> <UniqueIdentifier>{4984D703-35E7-66A8-DE6C-9F5ECAAE322B}</UniqueIdentifier> </Filter> + <Filter Include="src\mpt\random"> + <UniqueIdentifier>{3DBF705C-298D-6462-1221-D588FE8D40C7}</UniqueIdentifier> + </Filter> <Filter Include="src\mpt\string"> <UniqueIdentifier>{13002060-FFCD-1366-E861-848CD4CEEFCA}</UniqueIdentifier> </Filter> @@ -312,6 +315,30 @@ <ClInclude Include="..\..\src\mpt\path\path.hpp"> <Filter>src\mpt\path</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\random\any_engine.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\crand.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\default_engines.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\device.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\engine.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\engine_lcg.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\random.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\seed.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\string\buffer.hpp"> <Filter>src\mpt\string</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2022win8/openmpt123.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win8/openmpt123.vcxproj Thu Aug 29 17:28:57 2024 (r21532) +++ trunk/OpenMPT/build/vs2022win8/openmpt123.vcxproj Thu Aug 29 17:37:00 2024 (r21533) @@ -1207,6 +1207,14 @@ <ClInclude Include="..\..\src\mpt\path\os_path.hpp" /> <ClInclude Include="..\..\src\mpt\path\os_path_long.hpp" /> <ClInclude Include="..\..\src\mpt\path\path.hpp" /> + <ClInclude Include="..\..\src\mpt\random\any_engine.hpp" /> + <ClInclude Include="..\..\src\mpt\random\crand.hpp" /> + <ClInclude Include="..\..\src\mpt\random\default_engines.hpp" /> + <ClInclude Include="..\..\src\mpt\random\device.hpp" /> + <ClInclude Include="..\..\src\mpt\random\engine.hpp" /> + <ClInclude Include="..\..\src\mpt\random\engine_lcg.hpp" /> + <ClInclude Include="..\..\src\mpt\random\random.hpp" /> + <ClInclude Include="..\..\src\mpt\random\seed.hpp" /> <ClInclude Include="..\..\src\mpt\string\buffer.hpp" /> <ClInclude Include="..\..\src\mpt\string\types.hpp" /> <ClInclude Include="..\..\src\mpt\string\utility.hpp" /> Modified: trunk/OpenMPT/build/vs2022win8/openmpt123.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win8/openmpt123.vcxproj.filters Thu Aug 29 17:28:57 2024 (r21532) +++ trunk/OpenMPT/build/vs2022win8/openmpt123.vcxproj.filters Thu Aug 29 17:37:00 2024 (r21533) @@ -43,6 +43,9 @@ <Filter Include="src\mpt\path"> <UniqueIdentifier>{4984D703-35E7-66A8-DE6C-9F5ECAAE322B}</UniqueIdentifier> </Filter> + <Filter Include="src\mpt\random"> + <UniqueIdentifier>{3DBF705C-298D-6462-1221-D588FE8D40C7}</UniqueIdentifier> + </Filter> <Filter Include="src\mpt\string"> <UniqueIdentifier>{13002060-FFCD-1366-E861-848CD4CEEFCA}</UniqueIdentifier> </Filter> @@ -312,6 +315,30 @@ <ClInclude Include="..\..\src\mpt\path\path.hpp"> <Filter>src\mpt\path</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\random\any_engine.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\crand.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\default_engines.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\device.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\engine.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\engine_lcg.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\random.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\seed.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\string\buffer.hpp"> <Filter>src\mpt\string</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2022win81/openmpt123.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win81/openmpt123.vcxproj Thu Aug 29 17:28:57 2024 (r21532) +++ trunk/OpenMPT/build/vs2022win81/openmpt123.vcxproj Thu Aug 29 17:37:00 2024 (r21533) @@ -1207,6 +1207,14 @@ <ClInclude Include="..\..\src\mpt\path\os_path.hpp" /> <ClInclude Include="..\..\src\mpt\path\os_path_long.hpp" /> <ClInclude Include="..\..\src\mpt\path\path.hpp" /> + <ClInclude Include="..\..\src\mpt\random\any_engine.hpp" /> + <ClInclude Include="..\..\src\mpt\random\crand.hpp" /> + <ClInclude Include="..\..\src\mpt\random\default_engines.hpp" /> + <ClInclude Include="..\..\src\mpt\random\device.hpp" /> + <ClInclude Include="..\..\src\mpt\random\engine.hpp" /> + <ClInclude Include="..\..\src\mpt\random\engine_lcg.hpp" /> + <ClInclude Include="..\..\src\mpt\random\random.hpp" /> + <ClInclude Include="..\..\src\mpt\random\seed.hpp" /> <ClInclude Include="..\..\src\mpt\string\buffer.hpp" /> <ClInclude Include="..\..\src\mpt\string\types.hpp" /> <ClInclude Include="..\..\src\mpt\string\utility.hpp" /> Modified: trunk/OpenMPT/build/vs2022win81/openmpt123.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win81/openmpt123.vcxproj.filters Thu Aug 29 17:28:57 2024 (r21532) +++ trunk/OpenMPT/build/vs2022win81/openmpt123.vcxproj.filters Thu Aug 29 17:37:00 2024 (r21533) @@ -43,6 +43,9 @@ <Filter Include="src\mpt\path"> <UniqueIdentifier>{4984D703-35E7-66A8-DE6C-9F5ECAAE322B}</UniqueIdentifier> </Filter> + <Filter Include="src\mpt\random"> + <UniqueIdentifier>{3DBF705C-298D-6462-1221-D588FE8D40C7}</UniqueIdentifier> + </Filter> <Filter Include="src\mpt\string"> <UniqueIdentifier>{13002060-FFCD-1366-E861-848CD4CEEFCA}</UniqueIdentifier> </Filter> @@ -312,6 +315,30 @@ <ClInclude Include="..\..\src\mpt\path\path.hpp"> <Filter>src\mpt\path</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\random\any_engine.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\crand.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\default_engines.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\device.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\engine.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\engine_lcg.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\random.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\seed.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\string\buffer.hpp"> <Filter>src\mpt\string</Filter> </ClInclude> Modified: trunk/OpenMPT/openmpt123/openmpt123.cpp ============================================================================== --- trunk/OpenMPT/openmpt123/openmpt123.cpp Thu Aug 29 17:28:57 2024 (r21532) +++ trunk/OpenMPT/openmpt123/openmpt123.cpp Thu Aug 29 17:37:00 2024 (r21533) @@ -44,6 +44,11 @@ #include "mpt/base/check_platform.hpp" #include "mpt/base/detect.hpp" +#include "mpt/random/crand.hpp" +#include "mpt/random/default_engines.hpp" +#include "mpt/random/device.hpp" +#include "mpt/random/engine.hpp" + #include <algorithm> #include <deque> #include <fstream> @@ -54,7 +59,6 @@ #include <map> #include <memory> #include <optional> -#include <random> #include <set> #include <sstream> #include <stdexcept> @@ -67,7 +71,6 @@ #include <cstdio> #include <cstdlib> #include <cstring> -#include <ctime> #if MPT_OS_DJGPP #include <conio.h> @@ -1635,15 +1638,15 @@ } -static mpt::native_path get_random_filename( std::set<mpt::native_path> & filenames, std::default_random_engine & prng ) { - std::size_t index = std::uniform_int_distribution<std::size_t>( 0, filenames.size() - 1 )( prng ); +static mpt::native_path get_random_filename( std::set<mpt::native_path> & filenames, mpt::good_engine & prng ) { + std::size_t index = mpt::random<std::size_t>( prng, 0, filenames.size() - 1 ); std::set<mpt::native_path>::iterator it = filenames.begin(); std::advance( it, index ); return *it; } -static void render_files( commandlineflags & flags, textout & log, write_buffers_interface & audio_stream, std::default_random_engine & prng ) { +static void render_files( commandlineflags & flags, textout & log, write_buffers_interface & audio_stream, mpt::good_engine & prng ) { if ( flags.randomize ) { std::shuffle( flags.filenames.begin(), flags.filenames.end(), prng ); } @@ -2359,16 +2362,9 @@ log.writeout(); - std::default_random_engine prng; - try { - std::random_device rd; - std::seed_seq seq{ rd(), static_cast<unsigned int>( std::time( NULL ) ) }; - prng = std::default_random_engine{ seq }; - } catch ( const std::exception & ) { - std::seed_seq seq{ static_cast<unsigned int>( std::time( NULL ) ) }; - prng = std::default_random_engine{ seq }; - } - std::srand( std::uniform_int_distribution<unsigned int>()( prng ) ); + mpt::sane_random_device rd; + mpt::good_engine prng = mpt::make_prng<mpt::good_engine>( rd ); + mpt::crand::reseed( prng ); switch ( flags.mode ) { case Mode::Probe: { |