updated projects & externals

pixelnest · Mar 25, 2014 · 41161f0 · 41161f0
1 parent 42db45a
commit 41161f0
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 9 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -6,4 +6,10 @@
 	url = https://github.com/dmanning23/Equationator.git
 [submodule "externals/Vector2Extensions"]
 	path = externals/Vector2Extensions
-	url = git@github.com:dmanning23/Vector2Extensions.git
+	url = git@github.com:dmanning23/Vector2Extensions.git
+[submodule "externals/MonoGame"]
+	path = externals/MonoGame
+	url = git@github.com:dmanning23/MonoGame.git
+[submodule "externals/RandomExtensions"]
+	path = externals/RandomExtensions
+	url = git@github.com:dmanning23/RandomExtensions.git
diff --git a/BulletMLTests/BulletMLTests.csproj b/BulletMLTests/BulletMLTests.csproj
@@ -9,6 +9,8 @@
     <OutputType>Library</OutputType>
     <RootNamespace>BulletMLTests</RootNamespace>
     <AssemblyName>BulletMLTests</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -18,23 +20,22 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <Optimize>true</Optimize>
     <OutputPath>bin\Release</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="nunit.framework">
       <HintPath>..\Windows\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Xml" />
-    <Reference Include="MonoGame.Framework, Version=3.0.1.0, Culture=neutral">
-      <Private>False</Private>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Test.cs" />
@@ -74,12 +75,15 @@
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
+    <ProjectReference Include="..\externals\MonoGame\MonoGame.Framework\MonoGame.Framework.WindowsGL.csproj">
+      <Project>{7de47032-a904-4c29-bd22-2d235e8d91ba}</Project>
+      <Name>MonoGame.Framework.WindowsGL</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Windows\BulletMLLib.Windows.csproj">
-      <Project>{203274CD-9994-4562-B824-6CF9CAE40347}</Project>
+      <Project>{203274cd-9994-4562-b824-6cf9cae40347}</Project>
       <Name>BulletMLLib.Windows</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
   <ItemGroup>
     <Content Include="Content\Empty.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

diff --git a/BulletMLTests/testharness/Mover.cs b/BulletMLTests/testharness/Mover.cs
@@ -40,6 +40,14 @@ public Mover(IBulletManager myBulletManager) : base(myBulletManager)
 		{
 		}
 
+		/// <summary>
+		/// This method gets called after the update method
+		/// </summary>
+		public override void PostUpdate()
+		{
+			//this is where any physics etc. would be updated.
+		}
+
 		public void InitNode()
 		{
 			Used = true;

diff --git a/Windows/BulletMLLib.Windows.csproj b/Windows/BulletMLLib.Windows.csproj
@@ -198,15 +198,15 @@
       <Project>{779F99A3-B976-45B2-AE0D-AD3EAF92A0D4}</Project>
       <Name>Equationator</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.WindowsGL.csproj">
+    <ProjectReference Include="..\externals\MonoGame\MonoGame.Framework\MonoGame.Framework.WindowsGL.csproj">
       <Project>{7de47032-a904-4c29-bd22-2d235e8d91ba}</Project>
       <Name>MonoGame.Framework.WindowsGL</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\MonoGame\ThirdParty\Lidgren.Network\Lidgren.Network.Windows.csproj">
+    <ProjectReference Include="..\externals\MonoGame\ThirdParty\Lidgren.Network\Lidgren.Network.Windows.csproj">
       <Project>{AE483C29-042E-4226-BA52-D247CE7676DA}</Project>
       <Name>Lidgren.Network.Windows</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Vector2Extensions\Windows\Vector2Extensions.Windows.csproj">
+    <ProjectReference Include="..\externals\Vector2Extensions\Windows\Vector2Extensions.Windows.csproj">
       <Project>{2c5acada-d15a-4193-ba0a-d36a362075f4}</Project>
       <Name>Vector2Extensions.Windows</Name>
     </ProjectReference>

diff --git a/Windows/BulletMLLib.Windows.sln b/Windows/BulletMLLib.Windows.sln
@@ -11,6 +11,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EquationatorUnitTests", "..
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vector2Extensions.Windows", "..\externals\Vector2Extensions\Windows\Vector2Extensions.Windows.csproj", "{2C5ACADA-D15A-4193-BA0A-D36A362075F4}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidgren.Network.Windows", "..\externals\MonoGame\ThirdParty\Lidgren.Network\Lidgren.Network.Windows.csproj", "{AE483C29-042E-4226-BA52-D247CE7676DA}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Framework.WindowsGL", "..\externals\MonoGame\MonoGame.Framework\MonoGame.Framework.WindowsGL.csproj", "{7DE47032-A904-4C29-BD22-2D235E8D91BA}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RandomExtensions.Windows", "..\externals\RandomExtensions\Windows\RandomExtensions.Windows.csproj", "{F0BBA30F-66E1-4E2F-BDF6-E17FF317C34E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -59,6 +65,30 @@ Global
 		{2C5ACADA-D15A-4193-BA0A-D36A362075F4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2C5ACADA-D15A-4193-BA0A-D36A362075F4}.Release|x86.ActiveCfg = Release|x86
 		{2C5ACADA-D15A-4193-BA0A-D36A362075F4}.Release|x86.Build.0 = Release|x86
+		{AE483C29-042E-4226-BA52-D247CE7676DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AE483C29-042E-4226-BA52-D247CE7676DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AE483C29-042E-4226-BA52-D247CE7676DA}.Debug|x86.ActiveCfg = Debug|x86
+		{AE483C29-042E-4226-BA52-D247CE7676DA}.Debug|x86.Build.0 = Debug|x86
+		{AE483C29-042E-4226-BA52-D247CE7676DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AE483C29-042E-4226-BA52-D247CE7676DA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AE483C29-042E-4226-BA52-D247CE7676DA}.Release|x86.ActiveCfg = Release|x86
+		{AE483C29-042E-4226-BA52-D247CE7676DA}.Release|x86.Build.0 = Release|x86
+		{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Debug|x86.ActiveCfg = Debug|x86
+		{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Debug|x86.Build.0 = Debug|x86
+		{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Release|x86.ActiveCfg = Release|x86
+		{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Release|x86.Build.0 = Release|x86
+		{F0BBA30F-66E1-4E2F-BDF6-E17FF317C34E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F0BBA30F-66E1-4E2F-BDF6-E17FF317C34E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F0BBA30F-66E1-4E2F-BDF6-E17FF317C34E}.Debug|x86.ActiveCfg = Debug|x86
+		{F0BBA30F-66E1-4E2F-BDF6-E17FF317C34E}.Debug|x86.Build.0 = Debug|x86
+		{F0BBA30F-66E1-4E2F-BDF6-E17FF317C34E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F0BBA30F-66E1-4E2F-BDF6-E17FF317C34E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F0BBA30F-66E1-4E2F-BDF6-E17FF317C34E}.Release|x86.ActiveCfg = Release|x86
+		{F0BBA30F-66E1-4E2F-BDF6-E17FF317C34E}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/externals/MonoGame b/externals/MonoGame
diff --git a/externals/RandomExtensions b/externals/RandomExtensions