Skip to content

Commit

Permalink
Added Android solution. Fixed all CSPROJ for building on Android.
Browse files Browse the repository at this point in the history 
Player has a minimal test on Android, but returns garbled audio.
Started to add a configuration property for using floating point (not supported on Android)

Related to issue #406.

git-svn-id: http://hamster-svn/svn/repos/base@678 765c1f7c-9fb8-954f-9ff8-dd0915cb3117
  • Loading branch information
animal committed Jan 16, 2013
1 parent f24eab0 commit 8ced8ec
Show file tree
Hide file tree
Showing 7 changed files with 296 additions and 122 deletions.
46 changes: 26 additions & 20 deletions MPfm/branches/current/MPfm.Library/MPfm.Library.Android.csproj
View file
Expand Up @@ -22,11 +22,12 @@
<DebugType>full</DebugType>
<Optimize>False</Optimize>
<OutputPath>..\Output\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DefineConstants>DEBUG;TRACE;ANDROID</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>..\Output\MPfm.Library.XML</DocumentationFile>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<AndroidLinkMode>None</AndroidLinkMode>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
Expand All @@ -35,6 +36,8 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AndroidLinkMode>SdkOnly</AndroidLinkMode>
<AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Linux|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>
Expand All @@ -44,6 +47,7 @@
<DefineConstants>DEBUG;TRACE;LINUX</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AndroidLinkMode>None</AndroidLinkMode>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_MacOSX|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>
Expand All @@ -52,6 +56,7 @@
<OutputPath>..\Output\Debug_Mac\</OutputPath>
<DefineConstants>DEBUG;TRACE;MACOSX</DefineConstants>
<WarningLevel>4</WarningLevel>
<AndroidLinkMode>None</AndroidLinkMode>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_MacOSX|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>
Expand All @@ -60,6 +65,8 @@
<OutputPath>..\Output\Debug_Mac\</OutputPath>
<DefineConstants>DEBUG;TRACE;MACOSX</DefineConstants>
<WarningLevel>4</WarningLevel>
<AndroidLinkMode>SdkOnly</AndroidLinkMode>
<AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Linux|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>
Expand All @@ -69,20 +76,19 @@
<DefineConstants>DEBUG;TRACE;LINUX</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AndroidLinkMode>SdkOnly</AndroidLinkMode>
<AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Data.Linq" />
<Reference Include="System.Drawing" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Security" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="taglib-sharp, Version=2.0.4.0, Culture=neutral, PublicKeyToken=db62eba44689b5b0, processorArchitecture=MSIL" />
<Reference Include="System.Reactive">
<HintPath>Lib\System.Reactive.dll</HintPath>
</Reference>
Expand All @@ -92,10 +98,10 @@
<Reference Include="System.Data.SQLite.Linq">
<HintPath>Lib\System.Data.SQLite.Linq.dll</HintPath>
</Reference>
<Reference Include="Mono.Data.Sqlite" />
<Reference Include="taglib-sharp">
<HintPath>Lib\taglib-sharp.dll</HintPath>
<HintPath>..\MPfm.Sound\Lib\Android\taglib-sharp.dll</HintPath>
</Reference>
<Reference Include="Mono.Data.Sqlite" />
</ItemGroup>
<ItemGroup>
<Service Include="{3259AA49-8AA1-44D3-9025-A0B520596A8C}" />
Expand All @@ -114,20 +120,6 @@
<Content Include="Lib\System.Reactive.dll" />
<Content Include="Lib\taglib-sharp.dll" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\MPfm.Core\MPfm.Core.csproj">
<Project>{D536FDE5-989E-4979-9B39-63621AE4A205}</Project>
<Name>MPfm.Core</Name>
</ProjectReference>
<ProjectReference Include="..\MPfm.Player\MPfm.Player.csproj">
<Project>{FEB7497C-784C-4380-874F-46FD93C82BA1}</Project>
<Name>MPfm.Player</Name>
</ProjectReference>
<ProjectReference Include="..\MPfm.Sound\MPfm.Sound.csproj">
<Project>{D92F718E-9A24-4B8B-9E40-77F93CF89EAE}</Project>
<Name>MPfm.Sound</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
<!-- 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.
Expand Down Expand Up @@ -155,4 +147,18 @@
<Compile Include="UpdateLibrary\UpdateLibraryProgressData.cs" />
<Compile Include="UpdateLibrary\UpdateLibraryException.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\MPfm.Core\MPfm.Core.Android.csproj">
<Project>{D536FDE5-989E-4979-9B39-63621AE4A205}</Project>
<Name>MPfm.Core.Android</Name>
</ProjectReference>
<ProjectReference Include="..\MPfm.Player\MPfm.Player.Android.csproj">
<Project>{FEB7497C-784C-4380-874F-46FD93C82BA1}</Project>
<Name>MPfm.Player.Android</Name>
</ProjectReference>
<ProjectReference Include="..\MPfm.Sound\MPfm.Sound.Android.csproj">
<Project>{D92F718E-9A24-4B8B-9E40-77F93CF89EAE}</Project>
<Name>MPfm.Sound.Android</Name>
</ProjectReference>
</ItemGroup>
</Project>
50 changes: 31 additions & 19 deletions MPfm/branches/current/MPfm.MVP/MPfm.MVP.Android.csproj
View file
Expand Up @@ -16,10 +16,11 @@
<DebugType>full</DebugType>
<Optimize>False</Optimize>
<OutputPath>..\Output\Debug</OutputPath>
<DefineConstants>DEBUG;</DefineConstants>
<DefineConstants>DEBUG;ANDROID</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>False</ConsolePause>
<AndroidLinkMode>None</AndroidLinkMode>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType>
Expand All @@ -28,6 +29,8 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>False</ConsolePause>
<AndroidLinkMode>SdkOnly</AndroidLinkMode>
<AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Linux|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>
Expand All @@ -37,6 +40,7 @@
<DefineConstants>DEBUG;TRACE;LINUX</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AndroidLinkMode>None</AndroidLinkMode>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_MacOSX|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>
Expand All @@ -45,6 +49,7 @@
<OutputPath>..\Output\Debug_Mac\</OutputPath>
<DefineConstants>DEBUG;TRACE;MACOSX</DefineConstants>
<WarningLevel>4</WarningLevel>
<AndroidLinkMode>None</AndroidLinkMode>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_MacOSX|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>
Expand All @@ -53,6 +58,8 @@
<OutputPath>..\Output\Debug_Mac\</OutputPath>
<DefineConstants>DEBUG;TRACE;MACOSX</DefineConstants>
<WarningLevel>4</WarningLevel>
<AndroidLinkMode>SdkOnly</AndroidLinkMode>
<AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Linux|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>
Expand All @@ -62,6 +69,8 @@
<DefineConstants>DEBUG;TRACE;LINUX</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AndroidLinkMode>SdkOnly</AndroidLinkMode>
<AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Expand All @@ -78,26 +87,11 @@
</Reference>
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
<Reference Include="taglib-sharp">
<HintPath>..\MPfm.Sound\Lib\Android\taglib-sharp.dll</HintPath>
</Reference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
<ItemGroup>
<ProjectReference Include="..\MPfm.Core\MPfm.Core.csproj">
<Project>{D536FDE5-989E-4979-9B39-63621AE4A205}</Project>
<Name>MPfm.Core</Name>
</ProjectReference>
<ProjectReference Include="..\MPfm.Library\MPfm.Library.csproj">
<Project>{2A62D229-D7FC-41DA-B676-BB1371659BFB}</Project>
<Name>MPfm.Library</Name>
</ProjectReference>
<ProjectReference Include="..\MPfm.Player\MPfm.Player.csproj">
<Project>{FEB7497C-784C-4380-874F-46FD93C82BA1}</Project>
<Name>MPfm.Player</Name>
</ProjectReference>
<ProjectReference Include="..\MPfm.Sound\MPfm.Sound.csproj">
<Project>{D92F718E-9A24-4B8B-9E40-77F93CF89EAE}</Project>
<Name>MPfm.Sound</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="Lib\Ninject.dll" />
<None Include="Lib\AutoMapper.dll" />
Expand Down Expand Up @@ -196,4 +190,22 @@
<Compile Include="Presenters\MainPresenter.cs" />
<Compile Include="NavigationManager.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\MPfm.Core\MPfm.Core.Android.csproj">
<Project>{D536FDE5-989E-4979-9B39-63621AE4A205}</Project>
<Name>MPfm.Core.Android</Name>
</ProjectReference>
<ProjectReference Include="..\MPfm.Library\MPfm.Library.Android.csproj">
<Project>{2A62D229-D7FC-41DA-B676-BB1371659BFB}</Project>
<Name>MPfm.Library.Android</Name>
</ProjectReference>
<ProjectReference Include="..\MPfm.Player\MPfm.Player.Android.csproj">
<Project>{FEB7497C-784C-4380-874F-46FD93C82BA1}</Project>
<Name>MPfm.Player.Android</Name>
</ProjectReference>
<ProjectReference Include="..\MPfm.Sound\MPfm.Sound.Android.csproj">
<Project>{D92F718E-9A24-4B8B-9E40-77F93CF89EAE}</Project>
<Name>MPfm.Sound.Android</Name>
</ProjectReference>
</ItemGroup>
</Project>
34 changes: 23 additions & 11 deletions MPfm/branches/current/MPfm.Player/MPfm.Player.Android.csproj
View file
Expand Up @@ -22,11 +22,12 @@
<DebugType>full</DebugType>
<Optimize>False</Optimize>
<OutputPath>..\Output\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DefineConstants>DEBUG;TRACE;ANDROID</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>..\Output\MPfm.Player.XML</DocumentationFile>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<AndroidLinkMode>None</AndroidLinkMode>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
Expand All @@ -35,6 +36,8 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AndroidLinkMode>SdkOnly</AndroidLinkMode>
<AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Linux|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>
Expand All @@ -44,6 +47,7 @@
<DefineConstants>DEBUG;TRACE;LINUX</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AndroidLinkMode>None</AndroidLinkMode>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_MacOSX|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>
Expand All @@ -52,6 +56,7 @@
<OutputPath>..\Output\Debug_Mac\</OutputPath>
<DefineConstants>DEBUG;TRACE;MACOSX</DefineConstants>
<WarningLevel>4</WarningLevel>
<AndroidLinkMode>None</AndroidLinkMode>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_MacOSX|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>
Expand All @@ -60,6 +65,8 @@
<OutputPath>..\Output\Debug_Mac\</OutputPath>
<DefineConstants>DEBUG;TRACE;MACOSX</DefineConstants>
<WarningLevel>4</WarningLevel>
<AndroidLinkMode>SdkOnly</AndroidLinkMode>
<AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Linux|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>
Expand All @@ -69,6 +76,8 @@
<DefineConstants>DEBUG;TRACE;LINUX</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AndroidLinkMode>SdkOnly</AndroidLinkMode>
<AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Expand All @@ -81,16 +90,9 @@
<Reference Include="Bass.Net">
<HintPath>Lib\Bass.Net.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\MPfm.Core\MPfm.Core.csproj">
<Project>{D536FDE5-989E-4979-9B39-63621AE4A205}</Project>
<Name>MPfm.Core</Name>
</ProjectReference>
<ProjectReference Include="..\MPfm.Sound\MPfm.Sound.csproj">
<Project>{D92F718E-9A24-4B8B-9E40-77F93CF89EAE}</Project>
<Name>MPfm.Sound</Name>
</ProjectReference>
<Reference Include="taglib-sharp">
<HintPath>..\MPfm.Sound\Lib\Android\taglib-sharp.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Content Include="Lib\Bass.Net.dll" />
Expand All @@ -117,4 +119,14 @@
<Compile Include="Objects\Marker.cs" />
<Compile Include="Player.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\MPfm.Sound\MPfm.Sound.Android.csproj">
<Project>{D92F718E-9A24-4B8B-9E40-77F93CF89EAE}</Project>
<Name>MPfm.Sound.Android</Name>
</ProjectReference>
<ProjectReference Include="..\MPfm.Core\MPfm.Core.Android.csproj">
<Project>{D536FDE5-989E-4979-9B39-63621AE4A205}</Project>
<Name>MPfm.Core.Android</Name>
</ProjectReference>
</ItemGroup>
</Project>

0 comments on commit 8ced8ec

Please sign in to comment.