aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Mono
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2015-12-19 13:13:35 -0500
committerLuke <luke.pulverenti@gmail.com>2015-12-19 13:13:35 -0500
commit32dfef320e1980397356fa121e5b1047af8ce4ff (patch)
treedba3269092fe98c022b22e8974902835faaf42c2 /MediaBrowser.Server.Mono
parentbe664f93c6760a56479ba9fd9e16c8cf8615f322 (diff)
parent5fffd38963e83aec92bd74a172be8dd38bdaba35 (diff)
Merge pull request #1337 from MediaBrowser/mediainfo
Mediainfo
Diffstat (limited to 'MediaBrowser.Server.Mono')
-rw-r--r--MediaBrowser.Server.Mono/MediaBrowser.MediaInfo.dll.config4
-rw-r--r--MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj7
2 files changed, 0 insertions, 11 deletions
diff --git a/MediaBrowser.Server.Mono/MediaBrowser.MediaInfo.dll.config b/MediaBrowser.Server.Mono/MediaBrowser.MediaInfo.dll.config
deleted file mode 100644
index 6d63633aa..000000000
--- a/MediaBrowser.Server.Mono/MediaBrowser.MediaInfo.dll.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<configuration>
- <dllmap dll="MediaInfo" target="./MediaInfo/osx/libmediainfo.dylib" os="osx"/>
- <dllmap dll="MediaInfo" target="libmediainfo.so" os="linux"/>
-</configuration> \ No newline at end of file
diff --git a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj
index ecb89b78c..e9f631bf3 100644
--- a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj
+++ b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj
@@ -144,10 +144,6 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <None Include="..\ThirdParty\MediaInfo\osx\libmediainfo.dylib">
- <Link>MediaInfo\osx\libmediainfo.dylib</Link>
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </None>
<None Include="..\ThirdParty\SQLite3\osx\libsqlite3.0.dylib">
<Link>libsqlite3.0.dylib</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -160,9 +156,6 @@
<None Include="ImageMagickSharp.dll.config">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
- <None Include="MediaBrowser.MediaInfo.dll.config">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </None>
<None Include="packages.config" />
<None Include="System.Data.SQLite.dll.config">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>