diff --git a/Makefile b/Makefile index 886a41388c..0f42751e9b 100644 --- a/Makefile +++ b/Makefile @@ -16,8 +16,6 @@ fileformats_SRCS := $(shell find OpenRa.FileFormats/ -iname '*.cs') fileformats_TARGET := OpenRa.FileFormats.dll fileformats_KIND := library fileformats_LIBS := $(COMMON_LIBS) -fileformats_DEPS := -fileformats_FLAGS := gl_SRCS := $(shell find OpenRa.Gl/ -iname '*.cs') gl_TARGET := OpenRa.Gl.dll @@ -26,21 +24,14 @@ gl_LIBS := $(COMMON_LIBS) System.Windows.Forms.dll System.Xml.Linq.dll \ System.Data.DataSetExtensions.dll \ System.Data.dll thirdparty/Tao/Tao.Cg.dll thirdparty/Tao/Tao.OpenGl.dll \ thirdparty/Tao/Tao.Platform.Windows.dll -gl_DEPS := -gl_FLAGS := game_SRCS := $(shell find OpenRa.Game/ -iname '*.cs') game_TARGET := OpenRa.Game.exe game_KIND := winexe game_LIBS := $(COMMON_LIBS) System.Windows.Forms.dll $(fileformats_TARGET) $(gl_TARGET) \ thirdparty/Tao/Tao.OpenAl.dll -game_RESOURCES := Resources -game_DEPS := $(fileformats_TARGET) $(gl_TARGET) $(game_RESOURCES) -game_FLAGS := -win32icon:OpenRa.Game/OpenRa.ico -platform:x86 \ - -res:OpenRa.Game/$(game_RESOURCES).resources,OpenRa.Resources.resources - -$(game_RESOURCES): - $(RESC) OpenRa.Game/$(game_RESOURCES).resx +game_DEPS := $(fileformats_TARGET) $(gl_TARGET) +game_FLAGS := -win32icon:OpenRa.Game/OpenRa.ico -platform:x86 define BUILD_ASSEMBLY $$($(1)_TARGET): $$($(1)_SRCS) Makefile $$($(1)_DEPS) diff --git a/OpenRa.Game/MainWindow.cs b/OpenRa.Game/MainWindow.cs index 87c7340a40..4dee8502bc 100755 --- a/OpenRa.Game/MainWindow.cs +++ b/OpenRa.Game/MainWindow.cs @@ -51,7 +51,7 @@ namespace OpenRa public MainWindow(Settings settings) { - Icon = Resources1.OpenRA; + //Icon = Resources1.OpenRA; FormBorderStyle = FormBorderStyle.None; BackColor = Color.Black; StartPosition = FormStartPosition.Manual; diff --git a/OpenRa.Game/Resources.resx b/OpenRa.Game/Resources.resx deleted file mode 100644 index 0c877b02cd..0000000000 --- a/OpenRa.Game/Resources.resx +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - diff --git a/OpenRa.Game/Resources1.Designer.cs b/OpenRa.Game/Resources1.Designer.cs deleted file mode 100644 index 955c0ff074..0000000000 --- a/OpenRa.Game/Resources1.Designer.cs +++ /dev/null @@ -1,70 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:2.0.50727.4918 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace OpenRa { - using System; - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources1 { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources1() { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { - get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("OpenRa.Resources", typeof(Resources1).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - - internal static System.Drawing.Icon OpenRA { - get { - object obj = ResourceManager.GetObject("OpenRA", resourceCulture); - return ((System.Drawing.Icon)(obj)); - } - } - } -}