From 00193f075df230d55a1277921cb55e5d4e5694d6 Mon Sep 17 00:00:00 2001 From: Garrison Taylor Date: Fri, 3 Jul 2015 01:53:16 -0400 Subject: [PATCH 1/4] Add Mac support --- TrueCraft.Client/Program.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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; } From dbded3785afd8475564311825b09a1e8d4c6aa3c Mon Sep 17 00:00:00 2001 From: Garrison Taylor Date: Fri, 3 Jul 2015 01:53:55 -0400 Subject: [PATCH 2/4] Add Mac support --- TrueCraft.Client/packages.config | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 + + From eca8b898de981107006f2701e61a3d464f313471 Mon Sep 17 00:00:00 2001 From: Garrison Taylor Date: Fri, 3 Jul 2015 12:42:15 -0400 Subject: [PATCH 3/4] Add Mac PostBuildEvent for the MonoGame dll --- TrueCraft.Launcher/TrueCraft.Launcher.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/TrueCraft.Launcher/TrueCraft.Launcher.csproj b/TrueCraft.Launcher/TrueCraft.Launcher.csproj index 8f1eb47..a1f3fbe 100644 --- a/TrueCraft.Launcher/TrueCraft.Launcher.csproj +++ b/TrueCraft.Launcher/TrueCraft.Launcher.csproj @@ -106,11 +106,11 @@ - 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 - \ No newline at end of file + From 326f8a57dccdf4a55ec606391949af6d662f586c Mon Sep 17 00:00:00 2001 From: Garrison Taylor Date: Fri, 3 Jul 2015 12:46:30 -0400 Subject: [PATCH 4/4] Add Mac PostBuildEvent for the MonoGame dll to Windows build.. --- TrueCraft.Launcher/TrueCraft.Launcher.csproj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/TrueCraft.Launcher/TrueCraft.Launcher.csproj b/TrueCraft.Launcher/TrueCraft.Launcher.csproj index a1f3fbe..6f3562e 100644 --- a/TrueCraft.Launcher/TrueCraft.Launcher.csproj +++ b/TrueCraft.Launcher/TrueCraft.Launcher.csproj @@ -111,6 +111,7 @@ 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