AstralTransRocketries/TrueCraft
Archived
1
0
Fork 0
Code Issues 48 Pull Requests 1 Packages Projects Releases Wiki Activity

Merge pull request #182 from Gbear605/master

Browse Source 
Add Mac OSX Support
This commit is contained in:
Drew DeVault 2015-07-03 10:54:31 -06:00
commit ebadeed59d
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
TrueCraft.Client/Program.cs
View File

@ -34,7 +34,11 @@ namespace TrueCraft.Client
var fileInfo = new FileInfo("MonoGame.Framework.Windows.dll"); var fileInfo = new FileInfo("MonoGame.Framework.Windows.dll");
return Assembly.LoadFile(fileInfo.FullName); 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; return null;
} }

1
TrueCraft.Client/packages.config
View File

@ -2,4 +2,5 @@
<packages> <packages>
<package id="MonoGame.Framework.Linux" version="3.4.0.459" targetFramework="net45" userInstalled="true" /> <package id="MonoGame.Framework.Linux" version="3.4.0.459" targetFramework="net45" userInstalled="true" />
<package id="MonoGame.Framework.WindowsGL" version="3.4.0.459" targetFramework="net45" userInstalled="true" /> <package id="MonoGame.Framework.WindowsGL" version="3.4.0.459" targetFramework="net45" userInstalled="true" />
<package id="MonoGame.Framework.MacOS" version="3.4.0.459" targetFramework="net45" userInstalled="true" />
</packages> </packages>

5
TrueCraft.Launcher/TrueCraft.Launcher.csproj
View File

@ -106,11 +106,12 @@
<EmbeddedResource Include="Content\default-server-icon.png" /> <EmbeddedResource Include="Content\default-server-icon.png" />
</ItemGroup> </ItemGroup>
<PropertyGroup Condition=" '$(OS)' == 'UNIX' "> <PropertyGroup Condition=" '$(OS)' == 'UNIX' ">
<PostBuildEvent>rm $(TargetDir)/MonoGame.Framework.dll &amp;&amp; cp $(SolutionDir)/packages/MonoGame.Framework.Linux.3.4.0.459/lib/net40/MonoGame.Framework.dll $(TargetDir)/MonoGame.Framework.Linux.dll &amp;&amp; cp $(SolutionDir)/packages/MonoGame.Framework.WindowsGL.3.4.0.459/lib/net40/MonoGame.Framework.dll $(TargetDir)/MonoGame.Framework.Windows.dll</PostBuildEvent> <PostBuildEvent>rm $(TargetDir)/MonoGame.Framework.dll &amp;&amp; cp $(SolutionDir)/packages/MonoGame.Framework.Linux.3.4.0.459/lib/net40/MonoGame.Framework.dll $(TargetDir)/MonoGame.Framework.Linux.dll &amp;&amp; cp $(SolutionDir)/packages/MonoGame.Framework.WindowsGL.3.4.0.459/lib/net40/MonoGame.Framework.dll $(TargetDir)/MonoGame.Framework.Windows.dll &amp;&amp; cp $(SolutionDir)/packages/MonoGame.Framework.MacOS.3.4.0.459/lib/net40/MonoGame.Framework.dll $(TargetDir)/MonoGame.Framework.MacOS.dll</PostBuildEvent>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(OS)' == 'Windows_NT' "> <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
<PostBuildEvent>del $(TargetDir)MonoGame.Framework.dll <PostBuildEvent>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.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</PostBuildEvent> 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 </PostBuildEvent>
</PropertyGroup> </PropertyGroup>
</Project> </Project>