diff options
| author | Luke <luke.pulverenti@gmail.com> | 2014-09-23 09:34:24 -0400 |
|---|---|---|
| committer | Luke <luke.pulverenti@gmail.com> | 2014-09-23 09:34:24 -0400 |
| commit | dbb8ec192f90ce0a61b5c7d64ecd73bb8dcb4101 (patch) | |
| tree | baa16b12a02f51ca4a955da31b9d506c2390e01f | |
| parent | fab675a6aaf4755562134b01e9425eebb0d46c98 (diff) | |
| parent | 4ef5fb210ef87ee3a8caea3a75434434b30f4be0 (diff) | |
Merge pull request #928 from gsnerf/master
MediaInfo build fixes for Mono
| -rw-r--r-- | MediaBrowser.Mono.sln | 10 | ||||
| -rw-r--r-- | MediaBrowser.Server.Mono/MediaBrowser.MediaInfo.dll.config (renamed from MediaBrowser.Server.Mono/MediaBrowser.MediaInfo.config) | 0 |
2 files changed, 10 insertions, 0 deletions
diff --git a/MediaBrowser.Mono.sln b/MediaBrowser.Mono.sln index daf06c083..2b28d219a 100644 --- a/MediaBrowser.Mono.sln +++ b/MediaBrowser.Mono.sln @@ -29,6 +29,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.LocalMetadata" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.XbmcMetadata", "MediaBrowser.XbmcMetadata\MediaBrowser.XbmcMetadata.csproj", "{23499896-B135-4527-8574-C26E926EA99E}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.MediaInfo", "MediaBrowser.MediaInfo\MediaBrowser.MediaInfo.csproj", "{6e4145e4-c6d4-4e4d-94f2-87188db6e239}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x86 = Debug|x86 @@ -133,6 +135,14 @@ Global {7EF9F3E0-697D-42F3-A08F-19DEB5F84392}.Release|Any CPU.Build.0 = Release|Any CPU {7EF9F3E0-697D-42F3-A08F-19DEB5F84392}.Release|x86.ActiveCfg = Release|Any CPU {7EF9F3E0-697D-42F3-A08F-19DEB5F84392}.Release|x86.Build.0 = Release|Any CPU + {6e4145e4-c6d4-4e4d-94f2-87188db6e239}.Debug|x86.ActiveCfg = Debug|Any CPU + {6e4145e4-c6d4-4e4d-94f2-87188db6e239}.Debug|x86.Build.0 = Debug|Any CPU + {6e4145e4-c6d4-4e4d-94f2-87188db6e239}.Release Mono|Any CPU.ActiveCfg = Release|Any CPU + {6e4145e4-c6d4-4e4d-94f2-87188db6e239}.Release Mono|Any CPU.Build.0 = Release|Any CPU + {6e4145e4-c6d4-4e4d-94f2-87188db6e239}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6e4145e4-c6d4-4e4d-94f2-87188db6e239}.Release|Any CPU.Build.0 = Release|Any CPU + {6e4145e4-c6d4-4e4d-94f2-87188db6e239}.Release|x86.ActiveCfg = Release|Any CPU + {6e4145e4-c6d4-4e4d-94f2-87188db6e239}.Release|x86.Build.0 = Release|Any CPU {9142EEFA-7570-41E1-BFCC-468BB571AF2F}.Debug|x86.ActiveCfg = Debug|Any CPU {9142EEFA-7570-41E1-BFCC-468BB571AF2F}.Debug|x86.Build.0 = Debug|Any CPU {9142EEFA-7570-41E1-BFCC-468BB571AF2F}.Release Mono|Any CPU.ActiveCfg = Release Mono|Any CPU diff --git a/MediaBrowser.Server.Mono/MediaBrowser.MediaInfo.config b/MediaBrowser.Server.Mono/MediaBrowser.MediaInfo.dll.config index 9db435d46..9db435d46 100644 --- a/MediaBrowser.Server.Mono/MediaBrowser.MediaInfo.config +++ b/MediaBrowser.Server.Mono/MediaBrowser.MediaInfo.dll.config |