diff options
| author | Luke <luke.pulverenti@gmail.com> | 2014-01-08 09:26:34 -0800 |
|---|---|---|
| committer | Luke <luke.pulverenti@gmail.com> | 2014-01-08 09:26:34 -0800 |
| commit | 2496d37b0f3f767d96be9ed3722d24f353e5f22b (patch) | |
| tree | 9bc10eb3829c52b499f1cf12f4d79aeeb0789105 | |
| parent | 2864e4a339d03fb57939b9771ec9c6a9dbed9987 (diff) | |
| parent | 21bcf0c733fa24f7820eefd3cfd19da9b496ceac (diff) | |
Merge pull request #658 from abeloin/sqliteAdd
Mono: local linux sqlite
3 files changed, 19 insertions, 3 deletions
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj index b8d54c79d..b083b7b84 100644 --- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj +++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj @@ -53,11 +53,11 @@ </Reference> <Reference Include="System" /> <Reference Include="System.Core" /> - <Reference Include="System.Data.SQLite, Version=1.0.90.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86"> + <Reference Include="System.Data.SQLite, Version=1.0.90.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86" Condition=" '$(ConfigurationName)' != 'Release Mono' "> <SpecificVersion>False</SpecificVersion> <HintPath>..\packages\System.Data.SQLite.x86.1.0.90.0\lib\net45\System.Data.SQLite.dll</HintPath> </Reference> - <Reference Include="System.Data.SQLite.Linq"> + <Reference Include="System.Data.SQLite.Linq" Condition=" '$(ConfigurationName)' != 'Release Mono' "> <HintPath>..\packages\System.Data.SQLite.x86.1.0.90.0\lib\net45\System.Data.SQLite.Linq.dll</HintPath> </Reference> <Reference Include="System.Drawing" /> @@ -75,6 +75,9 @@ <SpecificVersion>False</SpecificVersion> <HintPath>..\ThirdParty\System.Data.SQLite.ManagedOnly\x86\1.0.90.0\net40\System.Data.SQLite.dll</HintPath> </Reference> + <Reference Include="System.Data.SQLite.Linq" Condition=" '$(ConfigurationName)' == 'Release Mono' "> + <HintPath>..\ThirdParty\System.Data.SQLite.ManagedOnly\x86\1.0.90.0\net40\System.Data.SQLite.Linq.dll</HintPath> + </Reference> <Reference Include="ServiceStack"> <HintPath>..\ThirdParty\ServiceStack\ServiceStack.dll</HintPath> </Reference> diff --git a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj index cccc75c92..2b2ccbe99 100644 --- a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj +++ b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj @@ -129,9 +129,18 @@ <None Include="app.config" /> </ItemGroup> <ItemGroup> - <Content Include="..\ThirdParty\SQLite3\x86\3.8.2\sqlite3.dll"> + <Content Include="..\ThirdParty\SQLite3\windows\x86\3.8.2\sqlite3.dll"> <Link>sqlite3.dll</Link> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> + <Content Include="..\ThirdParty\SQLite3\linux\x86\3.8.2\libsqlite3.so.0.8.6"> + <Link>lib\libsqlite3.so.0.8.6</Link> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </Content> + <Content Include="..\ThirdParty\SQLite3\linux\x86_64\3.8.2\libsqlite3.so.0.8.6"> + <Link>lib64\libsqlite3.so.0.8.6</Link> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </Content> + <Content Include="System.Data.SQLite.dll.config" /> </ItemGroup> </Project>
\ No newline at end of file diff --git a/MediaBrowser.Server.Mono/System.Data.SQLite.dll.config b/MediaBrowser.Server.Mono/System.Data.SQLite.dll.config new file mode 100644 index 000000000..df4189b56 --- /dev/null +++ b/MediaBrowser.Server.Mono/System.Data.SQLite.dll.config @@ -0,0 +1,4 @@ +<configuration> + <dllmap dll="sqlite3" target="./lib/libsqlite3.so.0.8.6" os="!windows"/> + <dllmap dll="sqlite3" target="./lib64/libsqlite3.so.0.8.6" os="!windows"/> +</configuration> |