From 5374c0f9a63639c7c30df932a0d0964165fe7ef4 Mon Sep 17 00:00:00 2001
From: juanjp600 <juanjprot@gmail.com>
Date: Mon, 25 Dec 2017 18:35:21 -0300
Subject: [PATCH] Windows-specific fixes 3

MS PLOX
---
 .../BarotraumaClient/BarotraumaClient.csproj  | 69 +++++++------------
 .../Source/Screens/ParticleEditorScreen.cs    | 11 +--
 .../Farseer Physics MonoGame.csproj           | 30 +++-----
 3 files changed, 43 insertions(+), 67 deletions(-)

diff --git a/Barotrauma/BarotraumaClient/BarotraumaClient.csproj b/Barotrauma/BarotraumaClient/BarotraumaClient.csproj
index 7d48af455..e0f8c8219 100644
--- a/Barotrauma/BarotraumaClient/BarotraumaClient.csproj
+++ b/Barotrauma/BarotraumaClient/BarotraumaClient.csproj
@@ -230,49 +230,32 @@
     <Compile Include="Source\Utils\TextureLoader.cs" />
     <Compile Include="Source\Utils\ToolBox.cs" />
   </ItemGroup>
-  <Choose>
-    <When Condition=" '$(Configuration)'=='ReleaseWindows' Or '$(Configuration)'=='DebugWindows' ">
-      <ItemGroup>
-        <Reference Include="MonoGame.Framework.WindowsDX">
-          <HintPath>..\..\Libraries\NuGet\MonoGame.Framework.WindowsDX.3.6.0.1625\lib\net40\MonoGame.Framework.dll</HintPath>
-        </Reference>
-        <Reference Include="SharpDX">
-          <HintPath>..\..\Libraries\NuGet\SharpDX.4.0.1\lib\net45\SharpDX.dll</HintPath>
-        </Reference>
-        <Reference Include="OpenTK, Version=1.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-          <SpecificVersion>False</SpecificVersion>
-          <HintPath>..\..\Libraries\NuGet\OpenTK.2.0.0\lib\net20\OpenTK.dll</HintPath>
-        </Reference>
-        <Reference Include="System" />
-        <Reference Include="System.Drawing" />
-        <Reference Include="System.Windows.Forms" />
-        <Reference Include="System.XML" />
-        <Reference Include="System.Xml.Linq" />
-        <Reference Include="RestSharp">
-          <HintPath>..\..\Libraries\NuGet\RestSharp.105.2.3\lib\net45\RestSharp.dll</HintPath>
-        </Reference>
-      </ItemGroup>
-    </When>
-    <When Condition=" '$(Configuration)'=='ReleaseLinux' Or '$(Configuration)'=='DebugLinux' ">
-      <ItemGroup>
-        <Reference Include="MonoGame.Framework.DesktopGL">
-          <HintPath>..\..\Libraries\NuGet\MonoGame.Framework.DesktopGL.3.6.0.1625\lib\net40\MonoGame.Framework.dll</HintPath>
-        </Reference>
-        <Reference Include="OpenTK, Version=1.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-          <SpecificVersion>False</SpecificVersion>
-          <HintPath>..\..\Libraries\NuGet\OpenTK.2.0.0\lib\net20\OpenTK.dll</HintPath>
-        </Reference>
-        <Reference Include="System" />
-        <Reference Include="System.Drawing" />
-        <Reference Include="System.Windows.Forms" />
-        <Reference Include="System.XML" />
-        <Reference Include="System.Xml.Linq" />
-        <Reference Include="RestSharp">
-          <HintPath>..\..\Libraries\NuGet\RestSharp.105.2.3\lib\net45\RestSharp.dll</HintPath>
-        </Reference>
-      </ItemGroup>
-    </When>
-  </Choose>
+  <ItemGroup>
+    <Reference Condition="$(DefineConstants.Contains('WINDOWS'))" Include="MonoGame.Framework.WindowsDX">
+      <HintPath>..\..\Libraries\NuGet\MonoGame.Framework.WindowsDX.3.6.0.1625\lib\net40\MonoGame.Framework.dll</HintPath>
+    </Reference>
+    <Reference Condition="$(DefineConstants.Contains('WINDOWS'))" Include="SharpDX">
+      <HintPath>..\..\Libraries\NuGet\SharpDX.4.0.1\lib\net45\SharpDX.dll</HintPath>
+    </Reference>
+    <Reference Condition="$(DefineConstants.Contains('WINDOWS'))" Include="NVorbis">
+      <HintPath>..\..\Libraries\NuGet\NVorbis.0.8.5.0\lib\NVorbis.dll</HintPath>
+    </Reference>
+    <Reference Include="OpenTK, Version=1.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\Libraries\NuGet\OpenTK.2.0.0\lib\net20\OpenTK.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.XML" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="RestSharp">
+      <HintPath>..\..\Libraries\NuGet\RestSharp.105.2.3\lib\net45\RestSharp.dll</HintPath>
+    </Reference>
+    <Reference Condition="$(DefineConstants.Contains('LINUX'))" Include="MonoGame.Framework.DesktopGL">
+      <HintPath>..\..\Libraries\NuGet\MonoGame.Framework.DesktopGL.3.6.0.1625\lib\net40\MonoGame.Framework.dll</HintPath>
+    </Reference>
+  </ItemGroup>
   <ItemGroup>
     <Content Include="freetype6.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/Barotrauma/BarotraumaClient/Source/Screens/ParticleEditorScreen.cs b/Barotrauma/BarotraumaClient/Source/Screens/ParticleEditorScreen.cs
index 6626ed9d7..3e531ce7d 100644
--- a/Barotrauma/BarotraumaClient/Source/Screens/ParticleEditorScreen.cs
+++ b/Barotrauma/BarotraumaClient/Source/Screens/ParticleEditorScreen.cs
@@ -7,7 +7,6 @@ using System.Xml.Linq;
 using System.Windows;
 using System.Xml;
 using System.Text;
-using System.Windows.Forms;
 
 namespace Barotrauma
 {
@@ -16,10 +15,10 @@ namespace Barotrauma
         class Emitter : ISerializableEntity
         {
             public float EmitTimer;
-            
+
             [Editable(), Serialize("0.0,0.0", false)]
             public Vector2 AngleRange { get; private set; }
-            
+
             [Editable(), Serialize("0.0,0.0", false)]
             public Vector2 VelocityRange { get; private set; }
 
@@ -77,7 +76,7 @@ namespace Barotrauma
             cam = new Camera();
 
             guiRoot = new GUIFrame(Rectangle.Empty, null, null);
-            
+
             leftPanel = new GUIFrame(new Rectangle(0, 0, 150, GameMain.GraphicsHeight), "GUIFrameLeft", guiRoot);
             leftPanel.Padding = new Vector4(10.0f, 20.0f, 10.0f, 20.0f);
 
@@ -151,7 +150,7 @@ namespace Barotrauma
         }
 
         private void SerializeAll()
-        {            
+        {
             XDocument doc = XMLExtensions.TryLoadXml(GameMain.ParticleManager.ConfigFile);
             if (doc == null || doc.Root == null) return;
 
@@ -180,6 +179,7 @@ namespace Barotrauma
 
         private void SerializeToClipboard(ParticlePrefab prefab)
         {
+#if WINDOWS
             if (prefab == null) return;
 
             XmlWriterSettings settings = new XmlWriterSettings();
@@ -198,6 +198,7 @@ namespace Barotrauma
             }
 
             Clipboard.SetText(sb.ToString());
+#endif
         }
 
         public override void Update(double deltaTime)
diff --git a/Libraries/Farseer Physics Engine 3.5/Farseer Physics MonoGame.csproj b/Libraries/Farseer Physics Engine 3.5/Farseer Physics MonoGame.csproj
index 789ef652d..736d70420 100644
--- a/Libraries/Farseer Physics Engine 3.5/Farseer Physics MonoGame.csproj	
+++ b/Libraries/Farseer Physics Engine 3.5/Farseer Physics MonoGame.csproj	
@@ -180,25 +180,17 @@
     <Reference Include="System" />
     <Reference Include="System.Xml" />
   </ItemGroup>
-  <Choose>
-    <When Condition=" '$(Configuration)'=='ReleaseWindows' Or '$(Configuration)'=='DebugWindows' ">
-      <ItemGroup>
-        <Reference Include="MonoGame.Framework.WindowsDX">
-          <HintPath>..\NuGet\MonoGame.Framework.WindowsDX.3.6.0.1625\lib\net40\MonoGame.Framework.dll</HintPath>
-        </Reference>
-        <Reference Include="SharpDX">
-          <HintPath>..\NuGet\SharpDX.4.0.1\lib\net45\SharpDX.dll</HintPath>
-        </Reference>
-      </ItemGroup>
-    </When>
-    <When Condition=" '$(Configuration)'=='ReleaseLinux' Or '$(Configuration)'=='DebugLinux' ">
-      <ItemGroup>
-        <Reference Include="MonoGame.Framework.DesktopGL">
-          <HintPath>..\NuGet\MonoGame.Framework.DesktopGL.3.6.0.1625\lib\net40\MonoGame.Framework.dll</HintPath>
-        </Reference>
-      </ItemGroup>
-    </When>
-  </Choose>
+  <ItemGroup>
+    <Reference Condition="$(DefineConstants.Contains('WINDOWS'))" Include="MonoGame.Framework.WindowsDX">
+      <HintPath>..\NuGet\MonoGame.Framework.WindowsDX.3.6.0.1625\lib\net40\MonoGame.Framework.dll</HintPath>
+    </Reference>
+    <Reference Condition="$(DefineConstants.Contains('WINDOWS'))" Include="SharpDX">
+      <HintPath>..\NuGet\SharpDX.4.0.1\lib\net45\SharpDX.dll</HintPath>
+    </Reference>
+    <Reference Condition="$(DefineConstants.Contains('LINUX'))" Include="MonoGame.Framework.DesktopGL">
+      <HintPath>..\NuGet\MonoGame.Framework.DesktopGL.3.6.0.1625\lib\net40\MonoGame.Framework.dll</HintPath>
+    </Reference>
+  </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.