mono
/
CocosSharp
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fix regressions in CocosSharp Android and Ouya projects after update to MonoGame. 

+Reference to MonoGame.Framework.Net was missing in projects.
This commit is contained in:
kjpou1 2014-05-26 18:05:30 +02:00
Родитель a566c67292
Коммит 29021088ab
13 изменённых файлов: 249 добавлений и 103 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

47
CocosSharp.Android.sln
Просмотреть файл

@ -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}"
@ -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
@ -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
@ -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
@ -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

39
CocosSharp.Ouya.sln
Просмотреть файл

@ -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}"
@ -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
@ -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
@ -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
@ -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

2
box2d/box2d.Android.csproj
Просмотреть файл

@ -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>

11
src/CocosSharp.Android.csproj
Просмотреть файл

@ -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>
@ -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>
@ -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" />
@ -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>

14
src/CocosSharp.Ouya.csproj
Просмотреть файл

@ -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>
@ -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" />
@ -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
src/platform/CCDrawManager.cs
Просмотреть файл

@ -43,7 +43,7 @@ namespace CocosSharp
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;

2
src/platform/CCSpriteFontCache.cs
Просмотреть файл

@ -36,7 +36,7 @@ namespace CocosSharp
public static float FontScale { get; set; }
internal SpriteFont this[string fontName]
public SpriteFont this[string fontName]
{
get
{

60
tests/CocosSharp.Tests.Android.sln
Просмотреть файл

@ -1,4 +1,4 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "tests.Android", "tests\tests.Android.csproj", "{4EF34363-1190-4444-9F4B-7A262B397EE8}"
@ -9,7 +9,9 @@ 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}") = "CocosSharp.Android", “..\src\CocosSharp.Android.csproj", "{6E02AFD1-C476-4F9A-A9A8-CAAC4B03783A}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Framework.Net.Android", "..\MonoGame\MonoGame.Framework\MonoGame.Framework.Net.Android.csproj", "{713EE5CA-C850-42AD-AC67-B6546AC8BFFB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CocosSharp.Android", "..\src\CocosSharp.Android.csproj", "{64725C5B-A1BC-4974-8538-A1158BABF572}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -37,18 +39,6 @@ Global
{4EF34363-1190-4444-9F4B-7A262B397EE8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{4EF34363-1190-4444-9F4B-7A262B397EE8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{4EF34363-1190-4444-9F4B-7A262B397EE8}.Release|Mixed Platforms.Deploy.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}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{BA9476CF-99BA-4D03-92F2-73D2C5E58883}.Debug|Mixed Platforms.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
{BA9476CF-99BA-4D03-92F2-73D2C5E58883}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{BA9476CF-99BA-4D03-92F2-73D2C5E58883}.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|Android.Build.0 = Debug|Any CPU
{565129E0-4EE5-4F6F-B403-C3484C9740BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@ -61,6 +51,30 @@ Global
{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
{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}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{64725C5B-A1BC-4974-8538-A1158BABF572}.Debug|Mixed Platforms.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
{64725C5B-A1BC-4974-8538-A1158BABF572}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{64725C5B-A1BC-4974-8538-A1158BABF572}.Release|Mixed Platforms.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}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{713EE5CA-C850-42AD-AC67-B6546AC8BFFB}.Debug|Mixed Platforms.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
{713EE5CA-C850-42AD-AC67-B6546AC8BFFB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{713EE5CA-C850-42AD-AC67-B6546AC8BFFB}.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|Android.Build.0 = Debug|Any CPU
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@ -73,6 +87,18 @@ 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
{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}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{BA9476CF-99BA-4D03-92F2-73D2C5E58883}.Debug|Mixed Platforms.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
{BA9476CF-99BA-4D03-92F2-73D2C5E58883}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{BA9476CF-99BA-4D03-92F2-73D2C5E58883}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{6E02AFD1-C476-4F9A-A9A8-CAAC4B03783A}.Debug|Android.ActiveCfg = Debug|Any CPU
{6E02AFD1-C476-4F9A-A9A8-CAAC4B03783A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6E02AFD1-C476-4F9A-A9A8-CAAC4B03783A}.Debug|Any CPU.Build.0 = Debug|Any CPU
@ -84,10 +110,10 @@ Global
{6E02AFD1-C476-4F9A-A9A8-CAAC4B03783A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{6E02AFD1-C476-4F9A-A9A8-CAAC4B03783A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
StartupItem = tests\tests.Android.csproj
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

75
tests/CocosSharp.Tests.Ouya.sln
Просмотреть файл

@ -1,4 +1,4 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidgren.Network.Android", "..\MonoGame\ThirdParty\Lidgren.Network\Lidgren.Network.Android.csproj", "{565129E0-4EE5-4F6F-B403-C3484C9740BE}"
@ -11,7 +11,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ouya.Console.Api", "..\tool
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}") = "CocosSharp.Ouya", “..\src\CocosSharp.Ouya.csproj", "{4964B64B-B76A-4D9D-91CB-BFDA0A1845CE}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CocosSharp.Ouya", "..\src\CocosSharp.Ouya.csproj", "{58B144AA-9409-439B-AEB0-144A1EA483E9}"
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
@ -23,17 +25,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|Android.Build.0 = 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
{493A4B6F-98CE-4000-8A0C-4A4726299061}.Debug|Android.ActiveCfg = Debug|Any CPU
{493A4B6F-98CE-4000-8A0C-4A4726299061}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{493A4B6F-98CE-4000-8A0C-4A4726299061}.Debug|Any CPU.Build.0 = Debug|Any CPU
{493A4B6F-98CE-4000-8A0C-4A4726299061}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{493A4B6F-98CE-4000-8A0C-4A4726299061}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{493A4B6F-98CE-4000-8A0C-4A4726299061}.Release|Android.ActiveCfg = Release|Any CPU
{493A4B6F-98CE-4000-8A0C-4A4726299061}.Release|Any CPU.ActiveCfg = Release|Any CPU
{493A4B6F-98CE-4000-8A0C-4A4726299061}.Release|Any CPU.Build.0 = Release|Any CPU
{493A4B6F-98CE-4000-8A0C-4A4726299061}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{493A4B6F-98CE-4000-8A0C-4A4726299061}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{4EF34363-1190-4444-9F4B-7A262B397EE8}.Debug|Android.ActiveCfg = Debug|Any CPU
{4EF34363-1190-4444-9F4B-7A262B397EE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4EF34363-1190-4444-9F4B-7A262B397EE8}.Debug|Any CPU.Build.0 = Debug|Any CPU
@ -48,6 +49,29 @@ Global
{4EF34363-1190-4444-9F4B-7A262B397EE8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{4EF34363-1190-4444-9F4B-7A262B397EE8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{4EF34363-1190-4444-9F4B-7A262B397EE8}.Release|Mixed Platforms.Deploy.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
{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
{58B144AA-9409-439B-AEB0-144A1EA483E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{58B144AA-9409-439B-AEB0-144A1EA483E9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{58B144AA-9409-439B-AEB0-144A1EA483E9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{58B144AA-9409-439B-AEB0-144A1EA483E9}.Release|Android.ActiveCfg = Release|Any CPU
{58B144AA-9409-439B-AEB0-144A1EA483E9}.Release|Android.Build.0 = Release|Any CPU
{58B144AA-9409-439B-AEB0-144A1EA483E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{58B144AA-9409-439B-AEB0-144A1EA483E9}.Release|Any CPU.Build.0 = Release|Any CPU
{58B144AA-9409-439B-AEB0-144A1EA483E9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{58B144AA-9409-439B-AEB0-144A1EA483E9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{8BEA875D-66D2-4A5F-B137-83D262A3851D}.Debug|Android.ActiveCfg = Debug|Any CPU
{8BEA875D-66D2-4A5F-B137-83D262A3851D}.Debug|Android.Build.0 = Debug|Any CPU
{8BEA875D-66D2-4A5F-B137-83D262A3851D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@ -59,16 +83,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
{493A4B6F-98CE-4000-8A0C-4A4726299061}.Debug|Android.ActiveCfg = Debug|Any CPU
{493A4B6F-98CE-4000-8A0C-4A4726299061}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{493A4B6F-98CE-4000-8A0C-4A4726299061}.Debug|Any CPU.Build.0 = Debug|Any CPU
{493A4B6F-98CE-4000-8A0C-4A4726299061}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{493A4B6F-98CE-4000-8A0C-4A4726299061}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{493A4B6F-98CE-4000-8A0C-4A4726299061}.Release|Android.ActiveCfg = Release|Any CPU
{493A4B6F-98CE-4000-8A0C-4A4726299061}.Release|Any CPU.ActiveCfg = Release|Any CPU
{493A4B6F-98CE-4000-8A0C-4A4726299061}.Release|Any CPU.Build.0 = Release|Any CPU
{493A4B6F-98CE-4000-8A0C-4A4726299061}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{493A4B6F-98CE-4000-8A0C-4A4726299061}.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
@ -79,6 +93,18 @@ 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
{4964B64B-B76A-4D9D-91CB-BFDA0A1845CE}.Debug|Android.ActiveCfg = Debug|Any CPU
{4964B64B-B76A-4D9D-91CB-BFDA0A1845CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4964B64B-B76A-4D9D-91CB-BFDA0A1845CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
@ -90,6 +116,9 @@ Global
{4964B64B-B76A-4D9D-91CB-BFDA0A1845CE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{4964B64B-B76A-4D9D-91CB-BFDA0A1845CE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
StartupItem = ..\MonoGame\ThirdParty\Lidgren.Network\Lidgren.Network.Android.csproj
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection

6
tests/tests/Game1.cs
Просмотреть файл

@ -32,7 +32,7 @@ namespace tests
protected override void Draw(GameTime gameTime)
{
base.Draw(gameTime);
CCDrawManager.spriteBatch.Begin();
CCDrawManager.SpriteBatch.Begin();
float y = 15;
for (int i = 0; i < 4; ++i)
{
@ -44,10 +44,10 @@ namespace tests
gs.ThumbSticks.Right.X, gs.ThumbSticks.Right.Y,
gs.Triggers.Left, gs.Triggers.Right);
CCDrawManager.spriteBatch.DrawString(CCSpriteFontCache.SharedInstance.GetFont("arial-20"), textToDraw, new Vector2(16, y), Color.White);
CCDrawManager.SpriteBatch.DrawString(CCSpriteFontCache.SharedInstance["arial-20"], textToDraw, new Vector2(16, y), Color.White);
y += 25;
}
CCDrawManager.spriteBatch.End();
CCDrawManager.SpriteBatch.End();
}
#endif

4
tests/tests/Properties/AndroidManifest.xml
Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="tests.Android">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="tests.Ouya">
<uses-sdk />
<application android:label="tests.Android">
<application android:label="tests.Ouya">
</application>
</manifest>

2
tests/tests/tests.Android.csproj
Просмотреть файл

@ -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>{4EF34363-1190-4444-9F4B-7A262B397EE8}</ProjectGuid>
<ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<OutputType>Library</OutputType>

88
tests/tests/tests.Ouya.csproj
Просмотреть файл

@ -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>{4EF34363-1190-4444-9F4B-7A262B397EE8}</ProjectGuid>
<ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<OutputType>Library</OutputType>
@ -18,6 +16,9 @@
<AndroidStoreUncompressedFileExtensions />
<MandroidI18n />
<TargetFrameworkVersion>v4.1</TargetFrameworkVersion>
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
<AndroidLinkSkip />
<AndroidLinkMode>None</AndroidLinkMode>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@ -27,9 +28,6 @@
<DefineConstants>TRACE;DEBUG;ANDROID;OUYA</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AndroidUseSharedRuntime>True</AndroidUseSharedRuntime>
<AndroidLinkMode>None</AndroidLinkMode>
<AndroidLinkSkip />
<EmbedAssembliesIntoApk>False</EmbedAssembliesIntoApk>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
@ -41,8 +39,6 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
<AndroidLinkMode>None</AndroidLinkMode>
<AndroidLinkSkip />
<EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
</PropertyGroup>
<ItemGroup>
@ -381,6 +377,60 @@
<Compile Include="classes\tests\ExtensionsTest\Scale9SpriteTest\Scale9SpriteSceneManager.cs" />
<Compile Include="classes\tests\ExtensionsTest\Scale9SpriteTest\Scale9SpriteTest.cs" />
<Compile Include="classes\tests\ExtensionsTest\CocosBuilderTest\TimelineCallbackTestLayer.cs" />
<Compile Include="classes\tests\Box2DTestBet%28Box2D%29\Box2DView.cs" />
<Compile Include="classes\tests\Box2DTestBet%28Box2D%29\Box2dTestBedScene.cs" />
<Compile Include="classes\tests\Box2DTestBet%28Box2D%29\MenuLayer.cs" />
<Compile Include="classes\tests\Box2DTestBet%28Box2D%29\Test.cs" />
<Compile Include="classes\tests\Box2DTestBet%28Box2D%29\TestEntries.cs" />
<Compile Include="classes\tests\Box2DTestBet%28Box2D%29\Tests\AddPair.cs" />
<Compile Include="classes\tests\Box2DTestBet%28Box2D%29\Tests\ApplyForce.cs" />
<Compile Include="classes\tests\Box2DTestBet%28Box2D%29\Tests\BodyTypes.cs" />
<Compile Include="classes\tests\Box2DTestBet%28Box2D%29\Tests\Breakable.cs" />
<Compile Include="classes\tests\Box2DTestBet%28Box2D%29\Tests\Bridge.cs" />
<Compile Include="classes\tests\Box2DTestBet%28Box2D%29\Tests\BulletTest.cs" />
<Compile Include="classes\tests\Box2DTestBet%28Box2D%29\Tests\Cantilever.cs" />
<Compile Include="classes\tests\Box2DTestBet%28Box2D%29\Tests\Car.cs" />
<Compile Include="classes\tests\Box2DTestBet%28Box2D%29\Tests\Chain.cs" />
<Compile Include="classes\tests\Box2DTestBet%28Box2D%29\Tests\CharacterCollision.cs" />
<Compile Include="classes\tests\Box2DTestBet%28Box2D%29\Tests\CircleStress.cs" />
<Compile Include="classes\tests\Box2DTestBet%28Box2D%29\Tests\CollisionFiltering.cs" />
<Compile Include="classes\tests\Box2DTestBet%28Box2D%29\Tests\CollisionProcessing.cs" />
<Compile Include="classes\tests\Box2DTestBet%28Box2D%29\Tests\CompoundShapes.cs" />
<Compile Include="classes\tests\Box2DTestBet%28Box2D%29\Tests\Confined.cs" />
<Compile Include="classes\tests\Box2DTestBet%28Box2D%29\Tests\ContinuousTest.cs" />
<Compile Include="classes\tests\Box2DTestBet%28Box2D%29\Tests\DistanceTest.cs" />
<Compile Include="classes\tests\Box2DTestBet%28Box2D%29\Tests\Dominos.cs" />
<Compile Include="classes\tests\Box2DTestBet%28Box2D%29\Tests\DumpShell.cs" />
<Compile Include="classes\tests\Box2DTestBet%28Box2D%29\Tests\DynamicTreeTest.cs" />
<Compile Include="classes\tests\Box2DTestBet%28Box2D%29\Tests\EdgeShapes.cs" />
<Compile Include="classes\tests\Box2DTestBet%28Box2D%29\Tests\EdgeTest.cs" />
<Compile Include="classes\tests\Box2DTestBet%28Box2D%29\Tests\Gears.cs" />
<Compile Include="classes\tests\Box2DTestBet%28Box2D%29\Tests\LiquidTest.cs" />
<Compile Include="classes\tests\Box2DTestBet%28Box2D%29\Tests\OneSidedPlatform.cs" />
<Compile Include="classes\tests\Box2DTestBet%28Box2D%29\Tests\Pinball.cs" />
<Compile Include="classes\tests\Box2DTestBet%28Box2D%29\Tests\PolyCollision.cs" />
<Compile Include="classes\tests\Box2DTestBet%28Box2D%29\Tests\PolyShapes.cs" />
<Compile Include="classes\tests\Box2DTestBet%28Box2D%29\Tests\Prismatic.cs" />
<Compile Include="classes\tests\Box2DTestBet%28Box2D%29\Tests\Pulleys.cs" />
<Compile Include="classes\tests\Box2DTestBet%28Box2D%29\Tests\Pyramid.cs" />
<Compile Include="classes\tests\Box2DTestBet%28Box2D%29\Tests\RayCast.cs" />
<Compile Include="classes\tests\Box2DTestBet%28Box2D%29\Tests\Revolute.cs" />
<Compile Include="classes\tests\Box2DTestBet%28Box2D%29\Tests\Rope.cs" />
<Compile Include="classes\tests\Box2DTestBet%28Box2D%29\Tests\RopeJoint.cs" />
<Compile Include="classes\tests\Box2DTestBet%28Box2D%29\Tests\SensorTest.cs" />
<Compile Include="classes\tests\Box2DTestBet%28Box2D%29\Tests\ShapeEditing.cs" />
<Compile Include="classes\tests\Box2DTestBet%28Box2D%29\Tests\SliderCrank.cs" />
<Compile Include="classes\tests\Box2DTestBet%28Box2D%29\Tests\SphereStack.cs" />
<Compile Include="classes\tests\Box2DTestBet%28Box2D%29\Tests\TheoJansen.cs" />
<Compile Include="classes\tests\Box2DTestBet%28Box2D%29\Tests\Tiles.cs" />
<Compile Include="classes\tests\Box2DTestBet%28Box2D%29\Tests\TimeOfImpact.cs" />
<Compile Include="classes\tests\Box2DTestBet%28Box2D%29\Tests\Tumbler.cs" />
<Compile Include="classes\tests\Box2DTestBet%28Box2D%29\Tests\VaryingFriction.cs" />
<Compile Include="classes\tests\Box2DTestBet%28Box2D%29\Tests\VaryingRestitution.cs" />
<Compile Include="classes\tests\Box2DTestBet%28Box2D%29\Tests\VerticalStack.cs" />
<Compile Include="classes\tests\Box2DTestBet%28Box2D%29\Tests\Web.cs" />
<Compile Include="classes\tests\Box2DTestBet%28Box2D%29\Tests\Other\CircleBenchmarkTest.cs" />
<Compile Include="classes\tests\EventDispatcherTest\EventDispatcherTestDemo.cs" />
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Content\animations\animations-2.plist.xnb">
@ -779,9 +829,6 @@
<AndroidAsset Include="Assets\Content\Particles\LavaFlow.xnb">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</AndroidAsset>
<AndroidAsset Include="Assets\Content\Particles\particleTexture.xnb">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</AndroidAsset>
<AndroidAsset Include="Assets\Content\Particles\Phoenix.xnb">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</AndroidAsset>
@ -1570,6 +1617,7 @@
</AndroidAsset>
<None Include="Resources\AboutResources.txt" />
<None Include="Assets\AboutAssets.txt" />
<None Include="Properties\AndroidManifest.xml" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\Layout\Main.axml" />
@ -1582,20 +1630,24 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\box2d\box2d.Android.csproj">
<Project>{b81b6701-7a78-4846-bf6f-04e0591f0f38}</Project>
<Project>{B81B6701-7A78-4846-BF6F-04E0591F0F38}</Project>
<Name>box2d.Android</Name>
</ProjectReference>
<ProjectReference Include="..\..\src\CocosSharp.Ouya.csproj">
<Project>{4964b64b-b76a-4d9d-91cb-bfda0a1845ce}</Project>
<Name>CocosSharp.Ouya</Name>
</ProjectReference>
<ProjectReference Include="..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.Ouya.csproj">
<Project>{8BEA875D-66D2-4A5F-B137-83D262A3851D}</Project>
<Name>MonoGame.Framework.Ouya</Name>
</ProjectReference>
<ProjectReference Include="..\..\MonoGame\ThirdParty\Lidgren.Network\Lidgren.Network.Android.csproj">
<Project>{565129E0-4EE5-4F6F-B403-C3484C9740BE}</Project>
<Name>Lidgren.Network.Ouya</Name>
<Name>Lidgren.Network.Android</Name>
</ProjectReference>
<ProjectReference Include="..\..\src\CocosSharp.Ouya.csproj">
<Project>{58B144AA-9409-439B-AEB0-144A1EA483E9}</Project>
<Name>CocosSharp.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>
<ItemGroup>
@ -1620,4 +1672,8 @@
<Target Name="AfterBuild">
</Target>
-->
<ItemGroup>
<Folder Include="Classes\tests\Box2DTestBet%28Box2D%29\" />
<Folder Include="Classes\tests\EventDispatcherTest\" />
</ItemGroup>
</Project>