Permalink
Browse files

Updates Tests for automated building

Testing libraries have been moved from ThirdParty/Libs into Tests/Libs.

Test harness has been updated with new command line options and is now
also available on Windows.

Ifdef'd around a compile problem in XnaToOpenTK.cs which will need to be
fixed properly at some point.
  • Loading branch information...
Christopher Chambers
Christopher Chambers committed Jan 30, 2012
1 parent a8d2263 commit 57096340943fb0e0b6063837b831e5f802e71b00
Showing with 7 additions and 12 deletions.
  1. +1 −9 MonoGame.Framework.Windows.sln
  2. +4 −1 MonoGame.Framework/XnaToOpenTK.cs
  3. +1 −1 Tests
  4. +1 −1 ThirdParty/Libs
@@ -1,6 +1,6 @@

Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual C# Express 2010
+# Visual Studio 2010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Framework.Windows", "MonoGame.Framework\MonoGame.Framework.Windows.csproj", "{7DE47032-A904-4C29-BD22-2D235E8D91BA}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidgren.Network.Windows", "ThirdParty\Lidgren.Network\Lidgren.Network.Windows.csproj", "{AE483C29-042E-4226-BA52-D247CE7676DA}"
@@ -43,14 +43,6 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
- GlobalSection(NestedProjects) = preSolution
- {36CDED1D-BE90-4C12-BC0A-F923AB92B98D} = {2362889B-880E-4EBA-AA76-3E1D27158F55}
- {5FAEAF4E-75EC-41E4-8D01-EF1CBB9EEAB6} = {2362889B-880E-4EBA-AA76-3E1D27158F55}
- {8CFEF1FE-9E32-43EB-A730-EB3AACDC77B1} = {2362889B-880E-4EBA-AA76-3E1D27158F55}
- {B117412F-9538-4CE0-B8F1-B279561AF17E} = {E186B87F-A589-42E5-9106-484545FCA486}
- {E31D6E96-3539-4EB7-9529-34A59EF03DDA} = {B117412F-9538-4CE0-B8F1-B279561AF17E}
- {6DE82385-D762-4275-9185-F42995282478} = {B117412F-9538-4CE0-B8F1-B279561AF17E}
- EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
StartupItem = MonoGame.Framework\MonoGame.Framework.Windows.csproj
EndGlobalSection
@@ -42,6 +42,9 @@
namespace Microsoft.Xna.Framework
{
+// HACK: Just getting this to compile on MacOS again. MonoMac doesn't have an
+// OpenTK namespace, so this will need to be aliased.
+#if !MONOMAC
internal static class XnaToOpenTK
{
@@ -53,6 +56,6 @@ public static OpenTK.Matrix4 ToOpenTK(this Matrix m)
m.M41, m.M42, m.M43, m.M44);
}
}
-
+#endif
}
2 Tests
Submodule Tests updated from 3871cf to 39c4a0
Submodule Libs updated from f8eca0 to b4750a

0 comments on commit 5709634

Please sign in to comment.