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

Merge pull request #140 from mrpimpunicorn/master

Browse Source 
Fixed building on Windows
This commit is contained in:
Drew DeVault 2015-06-18 17:54:49 -04:00
commit 82bdc9df49
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
TrueCraft.Client/Program.cs
View File

@ -1,4 +1,5 @@
using System; using System;
using System.IO;
using System.Net; using System.Net;
using System.Linq; using System.Linq;
using System.Net.Sockets; using System.Net.Sockets;
@ -28,7 +29,11 @@ namespace TrueCraft.Client
if (RuntimeInfo.IsLinux) if (RuntimeInfo.IsLinux)
return Assembly.LoadFile("MonoGame.Framework.Linux.dll"); return Assembly.LoadFile("MonoGame.Framework.Linux.dll");
if (RuntimeInfo.IsWindows) if (RuntimeInfo.IsWindows)
return Assembly.LoadFile("MonoGame.Framework.Windows.dll"); {
// MS.NET needs the absolute path to an assembly to load it.
var fileInfo = new FileInfo("MonoGame.Framework.Windows.dll");
return Assembly.LoadFile(fileInfo.FullName);
}
// TODO: OSX support // TODO: OSX support
return null; return null;
} }

6
TrueCraft.Client/TrueCraftGame.cs
View File

@ -338,13 +338,9 @@ namespace TrueCraft.Client
Camera.ApplyTo(TransparentEffect); Camera.ApplyTo(TransparentEffect);
} }
// Used for faking the disabling of color buffer writing.
private static readonly BlendState ColorWriteDisable = new BlendState() private static readonly BlendState ColorWriteDisable = new BlendState()
{ {
ColorSourceBlend = Blend.Zero, ColorWriteChannels = ColorWriteChannels.None
AlphaSourceBlend = Blend.Zero,
ColorDestinationBlend = Blend.One,
AlphaDestinationBlend = Blend.One
}; };
protected override void Draw(GameTime gameTime) protected override void Draw(GameTime gameTime)

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

@ -109,7 +109,8 @@
<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</PostBuildEvent>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(OS)' == 'Windows_NT' "> <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
<!-- TODO: Someone needs to fix this up --> <PostBuildEvent>del $(TargetDir)MonoGame.Framework.dll
<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> 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>
</PropertyGroup> </PropertyGroup>
</Project> </Project>