From 3965535f3fddab0bb9179a141d417eeffe91a8f1 Mon Sep 17 00:00:00 2001
From: Paul Chote <paul@chote.net>
Date: Sat, 3 May 2014 21:30:34 +1200
Subject: [PATCH] Remove Windows.Forms dependencies from game and utility.
 Fixes #4348.

---
 Makefile                             | 4 ++--
 OpenRA.Game/OpenRA.Game.csproj       | 1 -
 OpenRA.Game/Support/Program.cs       | 4 ----
 OpenRA.Utility/OpenRA.Utility.csproj | 1 -
 4 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 9257b20c46..7f753cee2d 100644
--- a/Makefile
+++ b/Makefile
@@ -80,7 +80,7 @@ VERSION     = $(shell git name-rev --name-only --tags --no-undefined HEAD 2>/dev
 game_SRCS := $(shell find OpenRA.Game/ -iname '*.cs')
 game_TARGET = OpenRA.Game.exe
 game_KIND = winexe
-game_LIBS = $(COMMON_LIBS) System.Windows.Forms.dll $(game_DEPS) thirdparty/Tao/Tao.OpenAl.dll thirdparty/SharpFont.dll
+game_LIBS = $(COMMON_LIBS) $(game_DEPS) thirdparty/Tao/Tao.OpenAl.dll thirdparty/SharpFont.dll
 game_FLAGS = -win32icon:OpenRA.Game/OpenRA.ico
 PROGRAMS += game
 game: $(game_TARGET)
@@ -219,7 +219,7 @@ utility_SRCS := $(shell find OpenRA.Utility/ -iname '*.cs')
 utility_TARGET = OpenRA.Utility.exe
 utility_KIND = exe
 utility_DEPS = $(game_TARGET)
-utility_LIBS = $(COMMON_LIBS) $(utility_DEPS) thirdparty/ICSharpCode.SharpZipLib.dll System.Windows.Forms.dll
+utility_LIBS = $(COMMON_LIBS) $(utility_DEPS) thirdparty/ICSharpCode.SharpZipLib.dll
 PROGRAMS += utility
 utility: $(utility_TARGET)
 
diff --git a/OpenRA.Game/OpenRA.Game.csproj b/OpenRA.Game/OpenRA.Game.csproj
index c3d0a909df..1e3083e1e6 100644
--- a/OpenRA.Game/OpenRA.Game.csproj
+++ b/OpenRA.Game/OpenRA.Game.csproj
@@ -62,7 +62,6 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
     <Reference Include="SharpFont">
       <SpecificVersion>False</SpecificVersion>
diff --git a/OpenRA.Game/Support/Program.cs b/OpenRA.Game/Support/Program.cs
index 6f08505c5f..d81b731b81 100644
--- a/OpenRA.Game/Support/Program.cs
+++ b/OpenRA.Game/Support/Program.cs
@@ -13,7 +13,6 @@ using System.Diagnostics;
 using System.Globalization;
 using System.Linq;
 using System.Text;
-using System.Windows.Forms;
 
 namespace OpenRA
 {
@@ -22,9 +21,6 @@ namespace OpenRA
 		[STAThread]
 		static void Main(string[] args)
 		{
-			// brutal hack
-			Application.CurrentCulture = CultureInfo.InvariantCulture;
-
 			if (Debugger.IsAttached || args.Contains("--just-die"))
 			{
 				Run(args);
diff --git a/OpenRA.Utility/OpenRA.Utility.csproj b/OpenRA.Utility/OpenRA.Utility.csproj
index 5a269debca..c61fdd7e08 100644
--- a/OpenRA.Utility/OpenRA.Utility.csproj
+++ b/OpenRA.Utility/OpenRA.Utility.csproj
@@ -58,7 +58,6 @@
       <RequiredTargetFramework>4.0</RequiredTargetFramework>
     </Reference>
     <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml.Linq">
       <RequiredTargetFramework>4.0</RequiredTargetFramework>
     </Reference>