diff options
| author | Luke <luke.pulverenti@gmail.com> | 2014-01-11 17:15:47 -0800 |
|---|---|---|
| committer | Luke <luke.pulverenti@gmail.com> | 2014-01-11 17:15:47 -0800 |
| commit | 1a28548339131efa3ad862cee6fbcd8a64f939c2 (patch) | |
| tree | 662a48f2aae95712ac6ee504f74c7f312814fb98 /MediaBrowser.Server.Mono | |
| parent | 2a444a70e55c326d43476a62b6b6ab4950a28603 (diff) | |
| parent | 27fc5c1407e2c75d5589aa07e3ec9ebf5462620e (diff) | |
Merge pull request #661 from abeloin/macos
Mac: added sqlite, detection, ffmpeg(64bit only)
Diffstat (limited to 'MediaBrowser.Server.Mono')
| -rw-r--r-- | MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj | 13 | ||||
| -rw-r--r-- | MediaBrowser.Server.Mono/System.Data.SQLite.dll.config | 5 |
2 files changed, 13 insertions, 5 deletions
diff --git a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj index 2b2ccbe991..0bd2a775b9 100644 --- a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj +++ b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj @@ -134,13 +134,20 @@ <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> + <Link>sqlite3\linux\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> + <Link>sqlite3\linux\lib64\libsqlite3.so.0.8.6</Link> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </Content> + <Content Include="..\ThirdParty\SQLite3\mac\universal\3.8.2\libsqlite3.0.dylib"> + <Link>sqlite3\mac\libsqlite3.0.dylib</Link> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </Content> + <Content Include="System.Data.SQLite.dll.config"> + <Link>System.Data.SQLite.dll.config</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 index df4189b566..c1868d88d0 100644 --- a/MediaBrowser.Server.Mono/System.Data.SQLite.dll.config +++ b/MediaBrowser.Server.Mono/System.Data.SQLite.dll.config @@ -1,4 +1,5 @@ <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"/> + <dllmap dll="sqlite3" target="./sqlite3/linux/lib/libsqlite3.so.0.8.6" os="linux"/> + <dllmap dll="sqlite3" target="./sqlite3/linux/lib64/libsqlite3.so.0.8.6" os="linux"/> + <dllmap dll="sqlite3" target="./sqlite3/mac/libsqlite3.0.dylib" os="osx"/> </configuration> |