Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<Configurations>Debug;Release</Configurations>

<Platforms>x86;x64</Platforms>
<RuntimeIdentifiers>win-x86;win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
<RuntimeIdentifiers>win-x86;win-x64;linux-x64;osx-x64;osx-arm64</RuntimeIdentifiers>

<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
Expand Down Expand Up @@ -81,8 +81,7 @@
</PropertyGroup>

<PropertyGroup Condition="'$(RuntimeIdentifier)' == '' And '$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">
<!-- <RuntimeIdentifier>osx-$(Platform)</RuntimeIdentifier> -->
<RuntimeIdentifier>osx-x64</RuntimeIdentifier>
<RuntimeIdentifier>osx-$(Platform)</RuntimeIdentifier>
</PropertyGroup>

<!--
Expand All @@ -95,7 +94,6 @@
</PropertyGroup>

<PropertyGroup Condition="'$(RuntimeIdentifier.StartsWith(`osx-`))' == 'true'">
<!-- TODO: split x64 and arm64 -->
<DefineConstants>$(DefineConstants);OSX</DefineConstants>
<LibPrefix>lib</LibPrefix>
<LibExt>.a</LibExt>
Expand Down
Binary file added MelonLoader.Bootstrap/Deps/osx-arm64/libdobby.a
Binary file not shown.
Binary file not shown.
58 changes: 58 additions & 0 deletions MelonLoader.sln
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,10 @@ Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x86 = Debug|x86
Debug|x64 = Debug|x64
Debug|arm64 = Debug|arm64
Release|x86 = Release|x86
Release|x64 = Release|x64
Release|arm64 = Release|arm64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{10CC7C0B-E7BC-43CC-BCE1-B0181337CCF5}.Debug|x86.ActiveCfg = Debug|x86
Expand All @@ -83,6 +85,10 @@ Global
{10CC7C0B-E7BC-43CC-BCE1-B0181337CCF5}.Release|x86.Build.0 = Release|x86
{10CC7C0B-E7BC-43CC-BCE1-B0181337CCF5}.Release|x64.ActiveCfg = Release|x64
{10CC7C0B-E7BC-43CC-BCE1-B0181337CCF5}.Release|x64.Build.0 = Release|x64
{10CC7C0B-E7BC-43CC-BCE1-B0181337CCF5}.Release|arm64.ActiveCfg = Release|arm64
{10CC7C0B-E7BC-43CC-BCE1-B0181337CCF5}.Release|arm64.Build.0 = Release|arm64
{10CC7C0B-E7BC-43CC-BCE1-B0181337CCF5}.Debug|arm64.ActiveCfg = Debug|arm64
{10CC7C0B-E7BC-43CC-BCE1-B0181337CCF5}.Debug|arm64.Build.0 = Debug|arm64
{3AF58371-2E0A-4256-B3A3-C100DB07E599}.Debug|x64.ActiveCfg = Debug|x64
{3AF58371-2E0A-4256-B3A3-C100DB07E599}.Debug|x64.Build.0 = Debug|x64
{3AF58371-2E0A-4256-B3A3-C100DB07E599}.Debug|x86.ActiveCfg = Debug|x86
Expand All @@ -91,6 +97,10 @@ Global
{3AF58371-2E0A-4256-B3A3-C100DB07E599}.Release|x64.Build.0 = Release|x64
{3AF58371-2E0A-4256-B3A3-C100DB07E599}.Release|x86.ActiveCfg = Release|x86
{3AF58371-2E0A-4256-B3A3-C100DB07E599}.Release|x86.Build.0 = Release|x86
{3AF58371-2E0A-4256-B3A3-C100DB07E599}.Release|arm64.ActiveCfg = Release|arm64
{3AF58371-2E0A-4256-B3A3-C100DB07E599}.Release|arm64.Build.0 = Release|arm64
{3AF58371-2E0A-4256-B3A3-C100DB07E599}.Debug|arm64.ActiveCfg = Debug|arm64
{3AF58371-2E0A-4256-B3A3-C100DB07E599}.Debug|arm64.Build.0 = Debug|arm64
{4BEAF9B5-F780-414B-8F2E-59DA4A91BE50}.Debug|x64.ActiveCfg = Debug|x64
{4BEAF9B5-F780-414B-8F2E-59DA4A91BE50}.Debug|x64.Build.0 = Debug|x64
{4BEAF9B5-F780-414B-8F2E-59DA4A91BE50}.Debug|x86.ActiveCfg = Debug|x86
Expand All @@ -99,6 +109,10 @@ Global
{4BEAF9B5-F780-414B-8F2E-59DA4A91BE50}.Release|x64.Build.0 = Release|x64
{4BEAF9B5-F780-414B-8F2E-59DA4A91BE50}.Release|x86.ActiveCfg = Release|x86
{4BEAF9B5-F780-414B-8F2E-59DA4A91BE50}.Release|x86.Build.0 = Release|x86
{4BEAF9B5-F780-414B-8F2E-59DA4A91BE50}.Release|arm64.ActiveCfg = Release|arm64
{4BEAF9B5-F780-414B-8F2E-59DA4A91BE50}.Release|arm64.Build.0 = Release|arm64
{4BEAF9B5-F780-414B-8F2E-59DA4A91BE50}.Debug|arm64.ActiveCfg = Debug|arm64
{4BEAF9B5-F780-414B-8F2E-59DA4A91BE50}.Debug|arm64.Build.0 = Debug|arm64
{A6452A3F-4BD6-497A-97DA-24F7DF97B234}.Debug|x64.ActiveCfg = Debug|x64
{A6452A3F-4BD6-497A-97DA-24F7DF97B234}.Debug|x64.Build.0 = Debug|x64
{A6452A3F-4BD6-497A-97DA-24F7DF97B234}.Debug|x86.ActiveCfg = Debug|x86
Expand All @@ -107,6 +121,10 @@ Global
{A6452A3F-4BD6-497A-97DA-24F7DF97B234}.Release|x64.Build.0 = Release|x64
{A6452A3F-4BD6-497A-97DA-24F7DF97B234}.Release|x86.ActiveCfg = Release|x86
{A6452A3F-4BD6-497A-97DA-24F7DF97B234}.Release|x86.Build.0 = Release|x86
{A6452A3F-4BD6-497A-97DA-24F7DF97B234}.Release|arm64.ActiveCfg = Release|arm64
{A6452A3F-4BD6-497A-97DA-24F7DF97B234}.Release|arm64.Build.0 = Release|arm64
{A6452A3F-4BD6-497A-97DA-24F7DF97B234}.Debug|arm64.ActiveCfg = Debug|arm64
{A6452A3F-4BD6-497A-97DA-24F7DF97B234}.Debug|arm64.Build.0 = Debug|arm64
{4FDDBEC0-9C20-456E-8906-77E9CD39C3CA}.Debug|x64.ActiveCfg = Debug|x64
{4FDDBEC0-9C20-456E-8906-77E9CD39C3CA}.Debug|x64.Build.0 = Debug|x64
{4FDDBEC0-9C20-456E-8906-77E9CD39C3CA}.Debug|x86.ActiveCfg = Debug|x86
Expand All @@ -115,6 +133,10 @@ Global
{4FDDBEC0-9C20-456E-8906-77E9CD39C3CA}.Release|x64.Build.0 = Release|x64
{4FDDBEC0-9C20-456E-8906-77E9CD39C3CA}.Release|x86.ActiveCfg = Release|x86
{4FDDBEC0-9C20-456E-8906-77E9CD39C3CA}.Release|x86.Build.0 = Release|x86
{4FDDBEC0-9C20-456E-8906-77E9CD39C3CA}.Release|arm64.ActiveCfg = Release|arm64
{4FDDBEC0-9C20-456E-8906-77E9CD39C3CA}.Release|arm64.Build.0 = Release|arm64
{4FDDBEC0-9C20-456E-8906-77E9CD39C3CA}.Debug|arm64.ActiveCfg = Debug|arm64
{4FDDBEC0-9C20-456E-8906-77E9CD39C3CA}.Debug|arm64.Build.0 = Debug|arm64
{F9700790-414B-431B-9F9C-1D9210FAD682}.Debug|x64.ActiveCfg = Debug|x64
{F9700790-414B-431B-9F9C-1D9210FAD682}.Debug|x64.Build.0 = Debug|x64
{F9700790-414B-431B-9F9C-1D9210FAD682}.Debug|x86.ActiveCfg = Debug|x86
Expand All @@ -123,6 +145,10 @@ Global
{F9700790-414B-431B-9F9C-1D9210FAD682}.Release|x64.Build.0 = Release|x64
{F9700790-414B-431B-9F9C-1D9210FAD682}.Release|x86.ActiveCfg = Release|x86
{F9700790-414B-431B-9F9C-1D9210FAD682}.Release|x86.Build.0 = Release|x86
{F9700790-414B-431B-9F9C-1D9210FAD682}.Release|arm64.ActiveCfg = Release|arm64
{F9700790-414B-431B-9F9C-1D9210FAD682}.Release|arm64.Build.0 = Release|arm64
{F9700790-414B-431B-9F9C-1D9210FAD682}.Debug|arm64.ActiveCfg = Debug|arm64
{F9700790-414B-431B-9F9C-1D9210FAD682}.Debug|arm64.Build.0 = Debug|arm64
{60D688E3-ECE0-43A6-9922-9D1D3B8C07CC}.Debug|x64.ActiveCfg = Debug|x64
{60D688E3-ECE0-43A6-9922-9D1D3B8C07CC}.Debug|x64.Build.0 = Debug|x64
{60D688E3-ECE0-43A6-9922-9D1D3B8C07CC}.Debug|x86.ActiveCfg = Debug|x86
Expand All @@ -131,10 +157,18 @@ Global
{60D688E3-ECE0-43A6-9922-9D1D3B8C07CC}.Release|x64.Build.0 = Release|x64
{60D688E3-ECE0-43A6-9922-9D1D3B8C07CC}.Release|x86.ActiveCfg = Release|x86
{60D688E3-ECE0-43A6-9922-9D1D3B8C07CC}.Release|x86.Build.0 = Release|x86
{60D688E3-ECE0-43A6-9922-9D1D3B8C07CC}.Release|arm64.ActiveCfg = Release|arm64
{60D688E3-ECE0-43A6-9922-9D1D3B8C07CC}.Release|arm64.Build.0 = Release|arm64
{60D688E3-ECE0-43A6-9922-9D1D3B8C07CC}.Debug|arm64.ActiveCfg = Debug|arm64
{60D688E3-ECE0-43A6-9922-9D1D3B8C07CC}.Debug|arm64.Build.0 = Debug|arm64
{762D7545-6F6B-441A-B040-49CC31A1713B}.Debug|x64.ActiveCfg = Debug|x64
{762D7545-6F6B-441A-B040-49CC31A1713B}.Debug|x86.ActiveCfg = Debug|x86
{762D7545-6F6B-441A-B040-49CC31A1713B}.Release|x64.ActiveCfg = Release|x64
{762D7545-6F6B-441A-B040-49CC31A1713B}.Release|x86.ActiveCfg = Release|x86
{762D7545-6F6B-441A-B040-49CC31A1713B}.Release|arm64.ActiveCfg = Release|arm64
{762D7545-6F6B-441A-B040-49CC31A1713B}.Release|arm64.Build.0 = Release|arm64
{762D7545-6F6B-441A-B040-49CC31A1713B}.Debug|arm64.ActiveCfg = Debug|arm64
{762D7545-6F6B-441A-B040-49CC31A1713B}.Debug|arm64.Build.0 = Debug|arm64
{542EC51D-E480-4802-B5AA-96EEC05AF19C}.Debug|x64.ActiveCfg = Debug|x64
{542EC51D-E480-4802-B5AA-96EEC05AF19C}.Debug|x64.Build.0 = Debug|x64
{542EC51D-E480-4802-B5AA-96EEC05AF19C}.Debug|x86.ActiveCfg = Debug|x86
Expand All @@ -143,6 +177,10 @@ Global
{542EC51D-E480-4802-B5AA-96EEC05AF19C}.Release|x64.Build.0 = Release|x64
{542EC51D-E480-4802-B5AA-96EEC05AF19C}.Release|x86.ActiveCfg = Release|x86
{542EC51D-E480-4802-B5AA-96EEC05AF19C}.Release|x86.Build.0 = Release|x86
{542EC51D-E480-4802-B5AA-96EEC05AF19C}.Release|arm64.ActiveCfg = Release|arm64
{542EC51D-E480-4802-B5AA-96EEC05AF19C}.Release|arm64.Build.0 = Release|arm64
{542EC51D-E480-4802-B5AA-96EEC05AF19C}.Debug|arm64.ActiveCfg = Debug|arm64
{542EC51D-E480-4802-B5AA-96EEC05AF19C}.Debug|arm64.Build.0 = Debug|arm64
{15CFF766-420B-47EF-9E4A-E73D35A4AB44}.Debug|x64.ActiveCfg = Debug|x64
{15CFF766-420B-47EF-9E4A-E73D35A4AB44}.Debug|x64.Build.0 = Debug|x64
{15CFF766-420B-47EF-9E4A-E73D35A4AB44}.Debug|x86.ActiveCfg = Debug|x86
Expand All @@ -151,6 +189,10 @@ Global
{15CFF766-420B-47EF-9E4A-E73D35A4AB44}.Release|x64.Build.0 = Release|x64
{15CFF766-420B-47EF-9E4A-E73D35A4AB44}.Release|x86.ActiveCfg = Release|x86
{15CFF766-420B-47EF-9E4A-E73D35A4AB44}.Release|x86.Build.0 = Release|x86
{15CFF766-420B-47EF-9E4A-E73D35A4AB44}.Release|arm64.ActiveCfg = Release|arm64
{15CFF766-420B-47EF-9E4A-E73D35A4AB44}.Release|arm64.Build.0 = Release|arm64
{15CFF766-420B-47EF-9E4A-E73D35A4AB44}.Debug|arm64.ActiveCfg = Debug|arm64
{15CFF766-420B-47EF-9E4A-E73D35A4AB44}.Debug|arm64.Build.0 = Debug|arm64
{1DB3679C-DCCA-492D-A725-75604A379C7A}.Debug|x64.ActiveCfg = Debug|x64
{1DB3679C-DCCA-492D-A725-75604A379C7A}.Debug|x64.Build.0 = Debug|x64
{1DB3679C-DCCA-492D-A725-75604A379C7A}.Debug|x86.ActiveCfg = Debug|x86
Expand All @@ -159,6 +201,10 @@ Global
{1DB3679C-DCCA-492D-A725-75604A379C7A}.Release|x64.Build.0 = Release|x64
{1DB3679C-DCCA-492D-A725-75604A379C7A}.Release|x86.ActiveCfg = Release|x86
{1DB3679C-DCCA-492D-A725-75604A379C7A}.Release|x86.Build.0 = Release|x86
{1DB3679C-DCCA-492D-A725-75604A379C7A}.Release|arm64.ActiveCfg = Release|arm64
{1DB3679C-DCCA-492D-A725-75604A379C7A}.Release|arm64.Build.0 = Release|arm64
{1DB3679C-DCCA-492D-A725-75604A379C7A}.Debug|arm64.ActiveCfg = Debug|arm64
{1DB3679C-DCCA-492D-A725-75604A379C7A}.Debug|arm64.Build.0 = Debug|arm64
{5C270941-AAA4-4FF4-870E-BDE170C5407C}.Debug|x64.ActiveCfg = Debug|x64
{5C270941-AAA4-4FF4-870E-BDE170C5407C}.Debug|x64.Build.0 = Debug|x64
{5C270941-AAA4-4FF4-870E-BDE170C5407C}.Debug|x86.ActiveCfg = Debug|x86
Expand All @@ -167,6 +213,10 @@ Global
{5C270941-AAA4-4FF4-870E-BDE170C5407C}.Release|x64.Build.0 = Release|x64
{5C270941-AAA4-4FF4-870E-BDE170C5407C}.Release|x86.ActiveCfg = Release|x86
{5C270941-AAA4-4FF4-870E-BDE170C5407C}.Release|x86.Build.0 = Release|x86
{5C270941-AAA4-4FF4-870E-BDE170C5407C}.Release|arm64.ActiveCfg = Release|arm64
{5C270941-AAA4-4FF4-870E-BDE170C5407C}.Release|arm64.Build.0 = Release|arm64
{5C270941-AAA4-4FF4-870E-BDE170C5407C}.Debug|arm64.ActiveCfg = Debug|arm64
{5C270941-AAA4-4FF4-870E-BDE170C5407C}.Debug|arm64.Build.0 = Debug|arm64
{8D271ABF-209A-4AF9-8C62-EF92806B7DC1}.Debug|x64.ActiveCfg = Debug|x64
{8D271ABF-209A-4AF9-8C62-EF92806B7DC1}.Debug|x64.Build.0 = Debug|x64
{8D271ABF-209A-4AF9-8C62-EF92806B7DC1}.Debug|x86.ActiveCfg = Debug|x86
Expand All @@ -175,6 +225,10 @@ Global
{8D271ABF-209A-4AF9-8C62-EF92806B7DC1}.Release|x64.Build.0 = Release|x64
{8D271ABF-209A-4AF9-8C62-EF92806B7DC1}.Release|x86.ActiveCfg = Release|x86
{8D271ABF-209A-4AF9-8C62-EF92806B7DC1}.Release|x86.Build.0 = Release|x86
{8D271ABF-209A-4AF9-8C62-EF92806B7DC1}.Release|arm64.ActiveCfg = Release|arm64
{8D271ABF-209A-4AF9-8C62-EF92806B7DC1}.Release|arm64.Build.0 = Release|arm64
{8D271ABF-209A-4AF9-8C62-EF92806B7DC1}.Debug|arm64.ActiveCfg = Debug|arm64
{8D271ABF-209A-4AF9-8C62-EF92806B7DC1}.Debug|arm64.Build.0 = Debug|arm64
{90832409-6D54-445D-9310-DCE81F0BB991}.Debug|x86.ActiveCfg = Debug|x86
{90832409-6D54-445D-9310-DCE81F0BB991}.Debug|x86.Build.0 = Debug|x86
{90832409-6D54-445D-9310-DCE81F0BB991}.Debug|x64.ActiveCfg = Debug|x64
Expand All @@ -183,6 +237,10 @@ Global
{90832409-6D54-445D-9310-DCE81F0BB991}.Release|x64.ActiveCfg = Release|x64
{90832409-6D54-445D-9310-DCE81F0BB991}.Release|x64.Build.0 = Release|x64
{90832409-6D54-445D-9310-DCE81F0BB991}.Debug|x64.Build.0 = Debug|x64
{90832409-6D54-445D-9310-DCE81F0BB991}.Release|arm64.ActiveCfg = Release|arm64
{90832409-6D54-445D-9310-DCE81F0BB991}.Release|arm64.Build.0 = Release|arm64
{90832409-6D54-445D-9310-DCE81F0BB991}.Debug|arm64.ActiveCfg = Debug|arm64
{90832409-6D54-445D-9310-DCE81F0BB991}.Debug|arm64.Build.0 = Debug|arm64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down