Skip to content
This repository has been archived by the owner on Mar 11, 2021. It is now read-only.

Commit

Permalink
Fix regressions in CocosSharp Android and Ouya projects after update …
Browse files Browse the repository at this point in the history 
…to MonoGame.

+Reference to MonoGame.Framework.Net was missing in projects.
  • Loading branch information
@kjpou1
kjpou1 committed May 26, 2014
1 parent a566c67 commit 2902108
Show file tree
Hide file tree
Showing 13 changed files with 249 additions and 103 deletions.
47 changes: 30 additions & 17 deletions CocosSharp.Android.sln
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@


Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CocosSharp.Android", "src\CocosSharp.Android.csproj", "{64725C5B-A1BC-4974-8538-A1158BABF572}"
Expand All @@ -9,6 +9,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidgren.Network.Android", "
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "box2d.Android", "box2d\box2d.Android.csproj", "{B81B6701-7A78-4846-BF6F-04E0591F0F38}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Framework.Net.Android", "MonoGame\MonoGame.Framework\MonoGame.Framework.Net.Android.csproj", "{713EE5CA-C850-42AD-AC67-B6546AC8BFFB}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Android = Debug|Android
Expand All @@ -17,22 +19,6 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{64725C5B-A1BC-4974-8538-A1158BABF572}.Debug|Android.ActiveCfg = Debug|Any CPU
{64725C5B-A1BC-4974-8538-A1158BABF572}.Debug|Android.Build.0 = Debug|Any CPU
{64725C5B-A1BC-4974-8538-A1158BABF572}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{64725C5B-A1BC-4974-8538-A1158BABF572}.Debug|Any CPU.Build.0 = Debug|Any CPU
{64725C5B-A1BC-4974-8538-A1158BABF572}.Release|Android.ActiveCfg = Release|Any CPU
{64725C5B-A1BC-4974-8538-A1158BABF572}.Release|Android.Build.0 = Release|Any CPU
{64725C5B-A1BC-4974-8538-A1158BABF572}.Release|Any CPU.ActiveCfg = Release|Any CPU
{64725C5B-A1BC-4974-8538-A1158BABF572}.Release|Any CPU.Build.0 = Release|Any CPU
{BA9476CF-99BA-4D03-92F2-73D2C5E58883}.Debug|Android.ActiveCfg = Debug|Any CPU
{BA9476CF-99BA-4D03-92F2-73D2C5E58883}.Debug|Android.Build.0 = Debug|Any CPU
{BA9476CF-99BA-4D03-92F2-73D2C5E58883}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BA9476CF-99BA-4D03-92F2-73D2C5E58883}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BA9476CF-99BA-4D03-92F2-73D2C5E58883}.Release|Android.ActiveCfg = Release|Any CPU
{BA9476CF-99BA-4D03-92F2-73D2C5E58883}.Release|Android.Build.0 = Release|Any CPU
{BA9476CF-99BA-4D03-92F2-73D2C5E58883}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BA9476CF-99BA-4D03-92F2-73D2C5E58883}.Release|Any CPU.Build.0 = Release|Any CPU
{565129E0-4EE5-4F6F-B403-C3484C9740BE}.Debug|Android.ActiveCfg = Debug|Any CPU
{565129E0-4EE5-4F6F-B403-C3484C9740BE}.Debug|Android.Build.0 = Debug|Any CPU
{565129E0-4EE5-4F6F-B403-C3484C9740BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
Expand All @@ -41,6 +27,22 @@ Global
{565129E0-4EE5-4F6F-B403-C3484C9740BE}.Release|Android.Build.0 = Release|Any CPU
{565129E0-4EE5-4F6F-B403-C3484C9740BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{565129E0-4EE5-4F6F-B403-C3484C9740BE}.Release|Any CPU.Build.0 = Release|Any CPU
{64725C5B-A1BC-4974-8538-A1158BABF572}.Debug|Android.ActiveCfg = Debug|Any CPU
{64725C5B-A1BC-4974-8538-A1158BABF572}.Debug|Android.Build.0 = Debug|Any CPU
{64725C5B-A1BC-4974-8538-A1158BABF572}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{64725C5B-A1BC-4974-8538-A1158BABF572}.Debug|Any CPU.Build.0 = Debug|Any CPU
{64725C5B-A1BC-4974-8538-A1158BABF572}.Release|Android.ActiveCfg = Release|Any CPU
{64725C5B-A1BC-4974-8538-A1158BABF572}.Release|Android.Build.0 = Release|Any CPU
{64725C5B-A1BC-4974-8538-A1158BABF572}.Release|Any CPU.ActiveCfg = Release|Any CPU
{64725C5B-A1BC-4974-8538-A1158BABF572}.Release|Any CPU.Build.0 = Release|Any CPU
{713EE5CA-C850-42AD-AC67-B6546AC8BFFB}.Debug|Android.ActiveCfg = Debug|Any CPU
{713EE5CA-C850-42AD-AC67-B6546AC8BFFB}.Debug|Android.Build.0 = Debug|Any CPU
{713EE5CA-C850-42AD-AC67-B6546AC8BFFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{713EE5CA-C850-42AD-AC67-B6546AC8BFFB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{713EE5CA-C850-42AD-AC67-B6546AC8BFFB}.Release|Android.ActiveCfg = Release|Any CPU
{713EE5CA-C850-42AD-AC67-B6546AC8BFFB}.Release|Android.Build.0 = Release|Any CPU
{713EE5CA-C850-42AD-AC67-B6546AC8BFFB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{713EE5CA-C850-42AD-AC67-B6546AC8BFFB}.Release|Any CPU.Build.0 = Release|Any CPU
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Debug|Android.ActiveCfg = Debug|Any CPU
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Debug|Android.Build.0 = Debug|Any CPU
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
Expand All @@ -49,6 +51,17 @@ Global
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Release|Android.Build.0 = Release|Any CPU
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Release|Any CPU.Build.0 = Release|Any CPU
{BA9476CF-99BA-4D03-92F2-73D2C5E58883}.Debug|Android.ActiveCfg = Debug|Any CPU
{BA9476CF-99BA-4D03-92F2-73D2C5E58883}.Debug|Android.Build.0 = Debug|Any CPU
{BA9476CF-99BA-4D03-92F2-73D2C5E58883}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BA9476CF-99BA-4D03-92F2-73D2C5E58883}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BA9476CF-99BA-4D03-92F2-73D2C5E58883}.Release|Android.ActiveCfg = Release|Any CPU
{BA9476CF-99BA-4D03-92F2-73D2C5E58883}.Release|Android.Build.0 = Release|Any CPU
{BA9476CF-99BA-4D03-92F2-73D2C5E58883}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BA9476CF-99BA-4D03-92F2-73D2C5E58883}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
StartupItem = src\CocosSharp.Android.csproj
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
39 changes: 28 additions & 11 deletions CocosSharp.Ouya.sln
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@


Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CocosSharp.Ouya", "src\CocosSharp.Ouya.csproj", "{58B144AA-9409-439B-AEB0-144A1EA483E9}"
Expand All @@ -9,6 +9,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidgren.Network.Android", "
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "box2d.Android", "box2d\box2d.Android.csproj", "{B81B6701-7A78-4846-BF6F-04E0591F0F38}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Framework.Net.Ouya", "MonoGame\MonoGame.Framework\MonoGame.Framework.Net.Ouya.csproj", "{F200645B-20E1-4D6F-8C70-38656F633CFA}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Android = Debug|Android
Expand All @@ -19,6 +21,16 @@ Global
Release|Mixed Platforms = Release|Mixed Platforms
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{565129E0-4EE5-4F6F-B403-C3484C9740BE}.Debug|Android.ActiveCfg = Debug|Any CPU
{565129E0-4EE5-4F6F-B403-C3484C9740BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{565129E0-4EE5-4F6F-B403-C3484C9740BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{565129E0-4EE5-4F6F-B403-C3484C9740BE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{565129E0-4EE5-4F6F-B403-C3484C9740BE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{565129E0-4EE5-4F6F-B403-C3484C9740BE}.Release|Android.ActiveCfg = Release|Any CPU
{565129E0-4EE5-4F6F-B403-C3484C9740BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{565129E0-4EE5-4F6F-B403-C3484C9740BE}.Release|Any CPU.Build.0 = Release|Any CPU
{565129E0-4EE5-4F6F-B403-C3484C9740BE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{565129E0-4EE5-4F6F-B403-C3484C9740BE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{58B144AA-9409-439B-AEB0-144A1EA483E9}.Debug|Android.ActiveCfg = Debug|Any CPU
{58B144AA-9409-439B-AEB0-144A1EA483E9}.Debug|Android.Build.0 = Debug|Any CPU
{58B144AA-9409-439B-AEB0-144A1EA483E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
Expand All @@ -41,16 +53,6 @@ Global
{8BEA875D-66D2-4A5F-B137-83D262A3851D}.Release|Any CPU.Build.0 = Release|Any CPU
{8BEA875D-66D2-4A5F-B137-83D262A3851D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{8BEA875D-66D2-4A5F-B137-83D262A3851D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{565129E0-4EE5-4F6F-B403-C3484C9740BE}.Debug|Android.ActiveCfg = Debug|Any CPU
{565129E0-4EE5-4F6F-B403-C3484C9740BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{565129E0-4EE5-4F6F-B403-C3484C9740BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{565129E0-4EE5-4F6F-B403-C3484C9740BE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{565129E0-4EE5-4F6F-B403-C3484C9740BE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{565129E0-4EE5-4F6F-B403-C3484C9740BE}.Release|Android.ActiveCfg = Release|Any CPU
{565129E0-4EE5-4F6F-B403-C3484C9740BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{565129E0-4EE5-4F6F-B403-C3484C9740BE}.Release|Any CPU.Build.0 = Release|Any CPU
{565129E0-4EE5-4F6F-B403-C3484C9740BE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{565129E0-4EE5-4F6F-B403-C3484C9740BE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Debug|Android.ActiveCfg = Debug|Any CPU
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Debug|Any CPU.Build.0 = Debug|Any CPU
Expand All @@ -61,6 +63,21 @@ Global
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Release|Any CPU.Build.0 = Release|Any CPU
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{F200645B-20E1-4D6F-8C70-38656F633CFA}.Debug|Android.ActiveCfg = Debug|Any CPU
{F200645B-20E1-4D6F-8C70-38656F633CFA}.Debug|Android.Build.0 = Debug|Any CPU
{F200645B-20E1-4D6F-8C70-38656F633CFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F200645B-20E1-4D6F-8C70-38656F633CFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F200645B-20E1-4D6F-8C70-38656F633CFA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{F200645B-20E1-4D6F-8C70-38656F633CFA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{F200645B-20E1-4D6F-8C70-38656F633CFA}.Release|Android.ActiveCfg = Release|Any CPU
{F200645B-20E1-4D6F-8C70-38656F633CFA}.Release|Android.Build.0 = Release|Any CPU
{F200645B-20E1-4D6F-8C70-38656F633CFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F200645B-20E1-4D6F-8C70-38656F633CFA}.Release|Any CPU.Build.0 = Release|Any CPU
{F200645B-20E1-4D6F-8C70-38656F633CFA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{F200645B-20E1-4D6F-8C70-38656F633CFA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
StartupItem = src\CocosSharp.Ouya.csproj
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
2 changes: 0 additions & 2 deletions box2d/box2d.Android.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
<RootNamespace>Box2D</RootNamespace>
<AssemblyName>box2d</AssemblyName>
<TargetFrameworkVersion>v2.2</TargetFrameworkVersion>
<ProductVersion>10.0.0</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down
11 changes: 7 additions & 4 deletions src/CocosSharp.Android.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{64725C5B-A1BC-4974-8538-A1158BABF572}</ProjectGuid>
<ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<OutputType>Library</OutputType>
Expand All @@ -13,6 +11,7 @@
<AssemblyName>CocosSharp</AssemblyName>
<FileAlignment>512</FileAlignment>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<TargetFrameworkVersion>v4.0.3</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -172,9 +171,9 @@
<Compile Include="cocoa\CCAffineTransform.cs" />
<Compile Include="cocoa\CCGeometry.cs" />
<Compile Include="denshion\CCEffectPlayer.cs" />
<Compile Include="denshion\CCEffectPlayer.MonoGame.cs" />
<Compile Include="denshion\CCEffectPlayer.MonoGame.cs" />
<Compile Include="denshion\CCMusicPlayer.cs" />
<Compile Include="denshion\CCMusicPlayer.MonoGame.cs" />
<Compile Include="denshion\CCMusicPlayer.MonoGame.cs" />
<Compile Include="denshion\CCSimpleAudioEngine.cs" />
<Compile Include="effects\CCGrabber.cs" />
<Compile Include="effects\CCGrid3D.cs" />
Expand Down Expand Up @@ -447,6 +446,10 @@
<Project>{BA9476CF-99BA-4D03-92F2-73D2C5E58883}</Project>
<Name>MonoGame.Framework.Android</Name>
</ProjectReference>
<ProjectReference Include="..\MonoGame\MonoGame.Framework\MonoGame.Framework.Net.Android.csproj">
<Project>{713EE5CA-C850-42AD-AC67-B6546AC8BFFB}</Project>
<Name>MonoGame.Framework.Net.Android</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup />
<ItemGroup>
Expand Down
14 changes: 10 additions & 4 deletions src/CocosSharp.Ouya.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{58B144AA-9409-439B-AEB0-144A1EA483E9}</ProjectGuid>
<ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<OutputType>Library</OutputType>
Expand Down Expand Up @@ -176,9 +174,9 @@
<Compile Include="cocoa\CCAffineTransform.cs" />
<Compile Include="cocoa\CCGeometry.cs" />
<Compile Include="denshion\CCEffectPlayer.cs" />
<Compile Include="denshion\CCEffectPlayer.MonoGame.cs" />
<Compile Include="denshion\CCEffectPlayer.MonoGame.cs" />
<Compile Include="denshion\CCMusicPlayer.cs" />
<Compile Include="denshion\CCMusicPlayer.MonoGame.cs" />
<Compile Include="denshion\CCMusicPlayer.MonoGame.cs" />
<Compile Include="denshion\CCSimpleAudioEngine.cs" />
<Compile Include="effects\CCGrabber.cs" />
<Compile Include="effects\CCGrid3D.cs" />
Expand Down Expand Up @@ -443,5 +441,13 @@
<Project>{B81B6701-7A78-4846-BF6F-04E0591F0F38}</Project>
<Name>box2d.Android</Name>
</ProjectReference>
<ProjectReference Include="..\MonoGame\MonoGame.Framework\MonoGame.Framework.Net.Ouya.csproj">
<Project>{F200645B-20E1-4D6F-8C70-38656F633CFA}</Project>
<Name>MonoGame.Framework.Net.Ouya</Name>
</ProjectReference>
<ProjectReference Include="..\tools\ouya\Ouya.Console.Api\Ouya.Console.Api.csproj">
<Project>{493A4B6F-98CE-4000-8A0C-4A4726299061}</Project>
<Name>Ouya.Console.Api</Name>
</ProjectReference>
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/platform/CCDrawManager.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public static class CCDrawManager
private static Effect m_currentEffect;
private static readonly Stack<Effect> m_effectStack = new Stack<Effect>();

internal static SpriteBatch SpriteBatch { get; set; }
public static SpriteBatch SpriteBatch { get; set; }
internal static GraphicsDevice graphicsDevice;

internal static Matrix m_worldMatrix;
Expand Down
2 changes: 1 addition & 1 deletion src/platform/CCSpriteFontCache.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public static CCSpriteFontCache SharedInstance

public static float FontScale { get; set; }

internal SpriteFont this[string fontName]
public SpriteFont this[string fontName]
{
get
{
Expand Down
Loading

0 comments on commit 2902108

Please sign in to comment.