Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adjustments for compiling and developing on Linux #14

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Adjustments for compiling and developing on Linux #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
441b5fe
Adjustment for compilation on Linux
ViToni Apr 1, 2024
df721c2
Fix warning raised by MonoDevelop on Linux about `AutoGenerateBinding…
ViToni Apr 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion SimpleDLNA/FormMain.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public partial class FormMain : Form, IAppender

#if DEBUG
private readonly FileInfo logFile =
new FileInfo(Path.Combine(cacheDir, "sdlna.dbg.log"));
new FileInfo(Path.Combine(CacheDir, "sdlna.dbg.log"));
#else
private readonly FileInfo logFile =
new FileInfo(Path.Combine(CacheDir, "sdlna.log"));
Expand Down
5 changes: 4 additions & 1 deletion SimpleDLNA/SimpleDLNA.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down Expand Up @@ -72,6 +72,9 @@
<PropertyGroup>
<AssemblyOriginatorKeyFile>sdlna.key.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
</PropertyGroup>
<ItemGroup>
<Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.2.0.5\lib\net45-full\log4net.dll</HintPath>
Expand Down
0 SimpleDLNA/StartUpUtilities.cs → SimpleDLNA/StartupUtilities.cs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion server/Http/HttpClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ private void SetupResponse()
}
catch (HttpStatusException ex) {
#if DEBUG
Warn(String.Format("{0} - Got a {2}: {1}", this, path, ex.Code), ex);
Warn(String.Format("{0} - Got a {2}: {1}", this, Path, ex.Code), ex);
#else
InfoFormat("{0} - Got a {2}: {1}", this, Path, ex.Code);
#endif
Expand Down
0 server/Http/HTTPServer.cs → server/Http/HttpServer.cs
View file
Open in desktop
File renamed without changes.
24 changes: 12 additions & 12 deletions server/Properties/Resources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Expand Down Expand Up @@ -119,36 +119,36 @@
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="browse_css" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\browse.css;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>..\Resources\browse.css;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="contentdirectory" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\contentdirectory.xml;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>..\Resources\contentdirectory.xml;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="connectionmanager" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\connectionmanager.xml;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>..\Resources\connectionmanager.xml;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="MSMediaReceiverRegistrar" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\MSMediaReceiverRegistrar.xml;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>..\Resources\MSMediaReceiverRegistrar.xml;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="description" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\description.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;UTF-8</value>
<value>..\Resources\description.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;UTF-8</value>
</data>
<data name="x_featurelist" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\x_featurelist.xml;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>..\Resources\x_featurelist.xml;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="favicon" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\favicon.ico;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>..\Resources\favicon.ico;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="largePNG" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\large.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>..\Resources\large.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="largeJPEG" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\large.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>..\Resources\large.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="smallPNG" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\small.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>..\Resources\small.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="smallJPEG" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\small.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>..\Resources\small.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
</root>
0 server/Types/SubTitle.cs → server/Types/Subtitle.cs
View file
Open in desktop
File renamed without changes.
0 util/Ffmpeg.cs → util/FFmpeg.cs
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions util/util.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down Expand Up @@ -71,7 +71,7 @@
</Reference>
<Reference Include="System.Drawing" />
<Reference Include="System.Data" />
<Reference Include="System.XML" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\GlobalAssemblyInfo.cs">
Expand Down