Merge pull request #140 from mrpimpunicorn/master
Fixed building on Windows
This commit is contained in:
commit
82bdc9df49
@ -1,4 +1,5 @@
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Net;
|
||||
using System.Linq;
|
||||
using System.Net.Sockets;
|
||||
@ -28,7 +29,11 @@ namespace TrueCraft.Client
|
||||
if (RuntimeInfo.IsLinux)
|
||||
return Assembly.LoadFile("MonoGame.Framework.Linux.dll");
|
||||
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
|
||||
return null;
|
||||
}
|
||||
|
@ -338,13 +338,9 @@ namespace TrueCraft.Client
|
||||
Camera.ApplyTo(TransparentEffect);
|
||||
}
|
||||
|
||||
// Used for faking the disabling of color buffer writing.
|
||||
private static readonly BlendState ColorWriteDisable = new BlendState()
|
||||
{
|
||||
ColorSourceBlend = Blend.Zero,
|
||||
AlphaSourceBlend = Blend.Zero,
|
||||
ColorDestinationBlend = Blend.One,
|
||||
AlphaDestinationBlend = Blend.One
|
||||
ColorWriteChannels = ColorWriteChannels.None
|
||||
};
|
||||
|
||||
protected override void Draw(GameTime gameTime)
|
||||
|
@ -109,7 +109,8 @@
|
||||
<PostBuildEvent>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</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
<!-- TODO: Someone needs to fix this up -->
|
||||
<PostBuildEvent>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</PostBuildEvent>
|
||||
<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.WindowsGL.3.4.0.459\lib\net40\MonoGame.Framework.dll $(TargetDir)MonoGame.Framework.Windows.dll</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
</Project>
|
Reference in New Issue
Block a user