Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

work on android support

more work on making the test cases work in android/monogame
  • Loading branch information...
commit d002209071d5fe5066e754614432e5b530f5b3e0 1 parent 976e64f
@totallyevil totallyevil authored
View
14 CocosDenshion/CocosDenshion.Android.csproj
@@ -37,12 +37,6 @@
<ConsolePause>false</ConsolePause>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Lidgren.Network.Android">
- <HintPath>..\Android\MonoGame3D\Lidgren.Network.Android.dll</HintPath>
- </Reference>
- <Reference Include="MonoGame.Framework.Android">
- <HintPath>..\Android\MonoGame3D\MonoGame.Framework.Android.dll</HintPath>
- </Reference>
<Reference Include="System" />
<Reference Include="Mono.Android" />
<Reference Include="OpenTK" />
@@ -55,6 +49,14 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.Android.csproj">
+ <Project>{BA9476CF-99BA-4D03-92F2-73D2C5E58883}</Project>
+ <Name>MonoGame.Framework.Android</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\MonoGame\ThirdParty\Lidgren.Network\Lidgren.Network.Android.csproj">
+ <Project>{565129E0-4EE5-4F6F-B403-C3484C9740BE}</Project>
+ <Name>Lidgren.Network.Android</Name>
+ </ProjectReference>
<ProjectReference Include="..\cocos2d-xna\cocos2d-xna.Android.csproj">
<Project>{47EE6CE6-493D-4967-944A-5E55B71AA9FD}</Project>
<Name>cocos2d-xna</Name>
View
BIN  HelloCocos2d/HelloCocos2d/Assets/Content/CloseNormal.xnb
Binary file not shown
View
BIN  HelloCocos2d/HelloCocos2d/Assets/Content/CloseSelected.xnb
Binary file not shown
View
BIN  HelloCocos2d/HelloCocos2d/Assets/Content/HelloWorld.xnb
Binary file not shown
View
BIN  HelloCocos2d/HelloCocos2d/Assets/Content/fonts/Arial.xnb
Binary file not shown
View
4 HelloCocos2d/HelloCocos2d/Game1.cs
@@ -29,10 +29,10 @@ public Game1()
// Frame rate is 30 fps by default for Windows Phone.
TargetElapsedTime = TimeSpan.FromTicks(333333);
-
+#if !MONOGAME
// Extend battery life under lock.
InactiveSleepTime = TimeSpan.FromSeconds(1);
-
+#endif
CCApplication application = new AppDelegate(this, graphics);
this.Components.Add(application);
}
View
41 HelloCocos2d/HelloCocos2d/HelloCocos2d.Android.csproj
@@ -44,12 +44,6 @@
<AndroidSupportedAbis>armeabi,armeabi-v7a,x86</AndroidSupportedAbis>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Lidgren.Network.Android">
- <HintPath>..\..\Android\MonoGame3D\Lidgren.Network.Android.dll</HintPath>
- </Reference>
- <Reference Include="MonoGame.Framework.Android">
- <HintPath>..\..\Android\MonoGame3D\MonoGame.Framework.Android.dll</HintPath>
- </Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml" />
@@ -74,34 +68,53 @@
<Content Include="Properties\AndroidManifest.xml" />
</ItemGroup>
<ItemGroup>
+ <AndroidAsset Include="Assets\Content\fonts\Arial.xnb">
+ </AndroidAsset>
+ <AndroidAsset Include="Assets\Content\HelloWorld.xnb">
+ </AndroidAsset>
+ <AndroidAsset Include="Assets\Content\CloseNormal.xnb">
+ </AndroidAsset>
+ <AndroidAsset Include="Assets\Content\CloseSelected.xnb">
+ </AndroidAsset>
+ <!--
<AndroidAsset Include="background.png">
- <Link>Assets\Content\background.png</Link>
+ <Link>Assets\Content\background.png</Link>
</AndroidAsset>
<AndroidAsset Include="..\HelloCocos2dContent\SpriteFont1.spritefont">
- <Link>Assets\Content\SpriteFont1.spritefont</Link>
- </AndroidAsset>
- <AndroidAsset Include="..\HelloCocos2dContent\fonts\Arial.spritefont">
- <Link>Assets\Content\fonts\Arial.spritefont</Link>
+ <Link>Assets\Content\SpriteFont1.spritefont</Link>
</AndroidAsset>
<AndroidAsset Include="..\HelloCocos2dContent\CloseNormal.png">
- <Link>Assets\Content\CloseNormal.png</Link>
+ <Link>Assets\Content\CloseNormal.png</Link>
</AndroidAsset>
<AndroidAsset Include="..\HelloCocos2dContent\CloseSelected.png">
- <Link>Assets\Content\CloseSelected.png</Link>
+ <Link>Assets\Content\CloseSelected.png</Link>
</AndroidAsset>
<AndroidAsset Include="..\HelloCocos2dContent\HelloWorld.png">
- <Link>Assets\Content\HelloWorld.png</Link>
+ <Link>Assets\Content\HelloWorld.png</Link>
</AndroidAsset>
+ -->
<AndroidResource Include="Resources\values\Styles.xml" />
<AndroidResource Include="Resources\drawable\ic_launcher.png" />
<AndroidResource Include="Resources\drawable\splash.png" />
<AndroidResource Include="Resources\values\strings.xml" />
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.Android.csproj">
+ <Project>{BA9476CF-99BA-4D03-92F2-73D2C5E58883}</Project>
+ <Name>MonoGame.Framework.Android</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\MonoGame\ThirdParty\Lidgren.Network\Lidgren.Network.Android.csproj">
+ <Project>{565129E0-4EE5-4F6F-B403-C3484C9740BE}</Project>
+ <Name>Lidgren.Network.Android</Name>
+ </ProjectReference>
<ProjectReference Include="..\..\cocos2d-xna\cocos2d-xna.Android.csproj">
<Project>{47EE6CE6-493D-4967-944A-5E55B71AA9FD}</Project>
<Name>cocos2d-xna</Name>
</ProjectReference>
+ <ProjectReference Include="..\..\cocos2d.Framework\cocos2d.Framework.Android.csproj">
+ <Project>{CC156337-B4A7-479F-9262-9A708B5E1164}</Project>
+ <Name>cocos2d.Framework.Android</Name>
+ </ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
<!--
View
2  HelloCocos2d/HelloCocos2d/Program.cs
@@ -9,7 +9,7 @@
#endif
using Microsoft.Xna.Framework;
-namespace tests
+namespace HelloCocos2d
{
#if WINDOWS || XBOX
static class Program
View
2  HelloCocos2d/HelloCocos2d/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="HelloCocos2d" android:versionCode="1" android:versionName="1.0" android:installLocation="internalOnly">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="cocos2d.HelloCocos2d" android:versionCode="1" android:versionName="1.0" android:installLocation="internalOnly">
<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="8" />
<supports-screens android:resizeable="true" android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:anyDensity="true" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
View
2  HelloCocos2d/HelloCocos2d/Resources/Resource.designer.cs
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.269
+// Runtime Version:4.0.30319.17929
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
View
26 cocos2d-xna.Android.sln
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloCocos2d", "HelloCocos2d\HelloCocos2d\HelloCocos2d.Android.csproj", "{2076D138-759C-465F-BC67-5BE580C54216}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloCocos2d.Android", "HelloCocos2d\HelloCocos2d\HelloCocos2d.Android.csproj", "{2076D138-759C-465F-BC67-5BE580C54216}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cocos2d-xna.Android", "cocos2d-xna\cocos2d-xna.Android.csproj", "{47EE6CE6-493D-4967-944A-5E55B71AA9FD}"
EndProject
@@ -11,6 +11,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CocosDenshion.Android", "Co
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cocos2d.Framework.Android", "cocos2d.Framework\cocos2d.Framework.Android.csproj", "{CC156337-B4A7-479F-9262-9A708B5E1164}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Framework.Android", "..\MonoGame\MonoGame.Framework\MonoGame.Framework.Android.csproj", "{BA9476CF-99BA-4D03-92F2-73D2C5E58883}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidgren.Network.Android", "..\MonoGame\ThirdParty\Lidgren.Network\Lidgren.Network.Android.csproj", "{565129E0-4EE5-4F6F-B403-C3484C9740BE}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -79,6 +83,26 @@ Global
{CC156337-B4A7-479F-9262-9A708B5E1164}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{CC156337-B4A7-479F-9262-9A708B5E1164}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{CC156337-B4A7-479F-9262-9A708B5E1164}.Release|x86.ActiveCfg = Release|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}.Debug|x86.ActiveCfg = Debug|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
+ {BA9476CF-99BA-4D03-92F2-73D2C5E58883}.Release|x86.ActiveCfg = Release|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}.Debug|x86.ActiveCfg = Debug|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
+ {565129E0-4EE5-4F6F-B403-C3484C9740BE}.Release|x86.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
View
15 cocos2d-xna/cocos2d-xna.Android.csproj
@@ -37,12 +37,6 @@
<ConsolePause>false</ConsolePause>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Lidgren.Network.Android">
- <HintPath>..\Android\MonoGame3D\Lidgren.Network.Android.dll</HintPath>
- </Reference>
- <Reference Include="MonoGame.Framework.Android">
- <HintPath>..\Android\MonoGame3D\MonoGame.Framework.Android.dll</HintPath>
- </Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml" />
@@ -267,6 +261,7 @@
<Compile Include="sprite_nodes\CCSpriteFrameCache.cs" />
<Compile Include="support\CCUserDefault.cs" />
<Compile Include="support\ccUtils.cs" />
+ <Compile Include="support\CCVertex.cs" />
<Compile Include="support\Compression\Adler.cs" />
<Compile Include="support\Compression\Crc32.cs" />
<Compile Include="support\Compression\FlushType.cs" />
@@ -317,6 +312,14 @@
<Folder Include="keypad_dispatcher\" />
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.Android.csproj">
+ <Project>{BA9476CF-99BA-4D03-92F2-73D2C5E58883}</Project>
+ <Name>MonoGame.Framework.Android</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\MonoGame\ThirdParty\Lidgren.Network\Lidgren.Network.Android.csproj">
+ <Project>{565129E0-4EE5-4F6F-B403-C3484C9740BE}</Project>
+ <Name>Lidgren.Network.Android</Name>
+ </ProjectReference>
<ProjectReference Include="..\cocos2d.Framework\cocos2d.Framework.Android.csproj">
<Project>{CC156337-B4A7-479F-9262-9A708B5E1164}</Project>
<Name>cocos2d.Framework</Name>
View
16 cocos2d.Framework/cocos2d.Framework.Android.csproj
@@ -37,12 +37,6 @@
<ConsolePause>false</ConsolePause>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Lidgren.Network.Android">
- <HintPath>..\Android\MonoGame3D\Lidgren.Network.Android.dll</HintPath>
- </Reference>
- <Reference Include="MonoGame.Framework.Android">
- <HintPath>..\Android\MonoGame3D\MonoGame.Framework.Android.dll</HintPath>
- </Reference>
<Reference Include="System" />
<Reference Include="Mono.Android" />
<Reference Include="OpenTK" />
@@ -52,6 +46,16 @@
<Compile Include="CCContent.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.Android.csproj">
+ <Project>{BA9476CF-99BA-4D03-92F2-73D2C5E58883}</Project>
+ <Name>MonoGame.Framework.Android</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\MonoGame\ThirdParty\Lidgren.Network\Lidgren.Network.Android.csproj">
+ <Project>{565129E0-4EE5-4F6F-B403-C3484C9740BE}</Project>
+ <Name>Lidgren.Network.Android</Name>
+ </ProjectReference>
+ </ItemGroup>
<!--
To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
View
2  tests/tests/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="tests" android:versionCode="1" android:versionName="1.0" android:installLocation="internalOnly">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="cocos2d.tests" android:versionCode="1" android:versionName="1.0" android:installLocation="internalOnly">
<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="8" />
<supports-screens android:resizeable="true" android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:anyDensity="true" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
View
2  tests/tests/Resources/Resource.designer.cs
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.269
+// Runtime Version:4.0.30319.17929
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
View
22 tests/tests/tests.Android.csproj
@@ -933,25 +933,33 @@
<AndroidResource Include="Resources\values\strings.xml" />
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.Android.csproj">
+ <Project>{BA9476CF-99BA-4D03-92F2-73D2C5E58883}</Project>
+ <Name>MonoGame.Framework.Android</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\MonoGame\ThirdParty\Lidgren.Network\Lidgren.Network.Android.csproj">
+ <Project>{565129E0-4EE5-4F6F-B403-C3484C9740BE}</Project>
+ <Name>Lidgren.Network.Android</Name>
+ </ProjectReference>
<ProjectReference Include="..\..\cocos2d-xna\cocos2d-xna.Android.csproj">
<Project>{47EE6CE6-493D-4967-944A-5E55B71AA9FD}</Project>
<Name>cocos2d-xna</Name>
</ProjectReference>
+ <ProjectReference Include="..\..\cocos2d.Framework\cocos2d.Framework.Android.csproj">
+ <Project>{CC156337-B4A7-479F-9262-9A708B5E1164}</Project>
+ <Name>cocos2d.Framework.Android</Name>
+ </ProjectReference>
<ProjectReference Include="..\..\CocosDenshion\CocosDenshion.Android.csproj">
<Project>{F028609A-7A53-4F01-8939-5B823285EC10}</Project>
<Name>CocosDenshion</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <Content Include="Properties\AndroidManifest.xml" />
+ <Content Include="Properties\AndroidManifest.xml">
+ <SubType>Designer</SubType>
+ </Content>
</ItemGroup>
<ItemGroup>
- <Reference Include="Lidgren.Network.Android">
- <HintPath>..\..\Android\MonoGame3D\Lidgren.Network.Android.dll</HintPath>
- </Reference>
- <Reference Include="MonoGame.Framework.Android">
- <HintPath>..\..\Android\MonoGame3D\MonoGame.Framework.Android.dll</HintPath>
- </Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml" />
Please sign in to comment.
Something went wrong with that request. Please try again.