diff --git a/TrueCraft.Client/Program.cs b/TrueCraft.Client/Program.cs index d9840c8..eae1a0f 100644 --- a/TrueCraft.Client/Program.cs +++ b/TrueCraft.Client/Program.cs @@ -34,7 +34,11 @@ namespace TrueCraft.Client var fileInfo = new FileInfo("MonoGame.Framework.Windows.dll"); return Assembly.LoadFile(fileInfo.FullName); } - // TODO: OSX support + if (RuntimeInfo.IsMacOSX) + { + var fileInfo = new FileInfo("MonoGame.Framework.MacOS.dll"); + return Assembly.LoadFile(fileInfo.FullName); + } return null; } diff --git a/TrueCraft.Client/packages.config b/TrueCraft.Client/packages.config index 95f904c..d31ee7f 100644 --- a/TrueCraft.Client/packages.config +++ b/TrueCraft.Client/packages.config @@ -2,4 +2,5 @@ - \ No newline at end of file + + diff --git a/TrueCraft.Launcher/TrueCraft.Launcher.csproj b/TrueCraft.Launcher/TrueCraft.Launcher.csproj index 8f1eb47..6f3562e 100644 --- a/TrueCraft.Launcher/TrueCraft.Launcher.csproj +++ b/TrueCraft.Launcher/TrueCraft.Launcher.csproj @@ -106,11 +106,12 @@ - rm $(TargetDir)/MonoGame.Framework.dll && cp $(SolutionDir)/packages/MonoGame.Framework.Linux.3.4.0.459/lib/net40/MonoGame.Framework.dll $(TargetDir)/MonoGame.Framework.Linux.dll && cp $(SolutionDir)/packages/MonoGame.Framework.WindowsGL.3.4.0.459/lib/net40/MonoGame.Framework.dll $(TargetDir)/MonoGame.Framework.Windows.dll + rm $(TargetDir)/MonoGame.Framework.dll && cp $(SolutionDir)/packages/MonoGame.Framework.Linux.3.4.0.459/lib/net40/MonoGame.Framework.dll $(TargetDir)/MonoGame.Framework.Linux.dll && cp $(SolutionDir)/packages/MonoGame.Framework.WindowsGL.3.4.0.459/lib/net40/MonoGame.Framework.dll $(TargetDir)/MonoGame.Framework.Windows.dll && cp $(SolutionDir)/packages/MonoGame.Framework.MacOS.3.4.0.459/lib/net40/MonoGame.Framework.dll $(TargetDir)/MonoGame.Framework.MacOS.dll del $(TargetDir)MonoGame.Framework.dll copy $(SolutionDir)packages\MonoGame.Framework.Linux.3.4.0.459\lib\net40\MonoGame.Framework.dll $(TargetDir)MonoGame.Framework.Linux.dll -copy $(SolutionDir)packages\MonoGame.Framework.WindowsGL.3.4.0.459\lib\net40\MonoGame.Framework.dll $(TargetDir)MonoGame.Framework.Windows.dll +copy $(SolutionDir)packages\MonoGame.Framework.WindowsGL.3.4.0.459\lib\net40\MonoGame.Framework.dll $(TargetDir)MonoGame.Framework.Windows.dll +copy $(SolutionDir)packages\MonoGame.Framework.MacOS.3.4.0.459\lib\net40\MonoGame.Framework.dll $(TargetDir)MonoGame.Framework.MacOS.dll - \ No newline at end of file +