BUILD: Use icon for mingw build of ScummVM Tools.

Makefile

@@ -80,6 +80,13 @@ else
 	$(error You need to run $(srcdir)/configure before you can run make. Check $(srcdir)/configure --help for a list of parameters)
 endif
 
+#
+# Windows specific
+#
+
+scummvmtoolswinres.o: $(srcdir)/gui/media/scummvmtools.ico $(srcdir)/dists/scummvmtools.rc
+	$(QUIET_WINDRES)$(WINDRES) -DHAVE_CONFIG_H $(WINDRESFLAGS) $(DEFINES) -I. -I$(srcdir) $(srcdir)/dists/scummvmtools.rc scummvmtoolswinres.o
+
 # Special target to create a win32 tools snapshot binary
 WIN32PATH=c:/scummvm
 win32dist:   all

Makefile.common

@@ -225,7 +225,8 @@ scummvm-tools_OBJS := \
 	gui/gui_tools.o \
 	gui/main.o \
 	gui/pages.o \
-	$(tools_OBJS)
+	$(tools_OBJS) \
+	$(OBJS)
 scummvm-tools_LIBS := $(WXLIBS) $(LIBS)
 
 # Set custom build flags for various files
@@ -299,6 +300,7 @@ QUIET_CXX    = @echo '   ' C++ '    ' $@;
 QUIET_AR     = @echo '   ' AR '     ' $@;
 QUIET_RANLIB = @echo '   ' RANLIB ' ' $@;
 QUIET_LINK   = @echo '   ' LINK '   ' $(1);
+QUIET_WINDRES = @echo '   ' WINDRES '' $@;
 QUIET        = @
 endif
 endif

configure

@@ -87,6 +87,7 @@ _verbose_build=no
 _ranlib=ranlib
 _strip=strip
 _ar="ar cru"
+_windres=windres
 _wxconfig=wx-config
 _wxpath="$PATH"
 _prefix=/usr/local
@@ -855,7 +856,7 @@ case $_host_os in
 		DEFINES="$DEFINES -D__USE_MINGW_ANSI_STDIO=0"
 		LDFLAGS="$LDFLAGS -static-libgcc -static-libstdc++"
 		LIBS="$LIBS -lmingw32 -lwinmm"
-		OBJS="$OBJS scummvmwinres.o"
+		OBJS="$OBJS scummvmtoolswinres.o"
 		add_line_to_config_mk 'WIN32 = 1'
 		;;
 	mint*)

dists/scummvmtools.rc

@@ -0,0 +1,45 @@
+#include "winresrc.h"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#define FILE 256
+#define IDI_ICON  1001
+
+IDI_ICON               ICON    DISCARDABLE     "gui/media/scummvmtools.ico"
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION     1,4,0,0
+ PRODUCTVERSION  1,4,0,0
+ FILEFLAGSMASK   VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+ FILEFLAGS       VS_FF_DEBUG
+#else
+ FILEFLAGS       0
+#endif
+ FILEOS          VOS_NT_WINDOWS32
+ FILETYPE        VFT_APP
+ FILESUBTYPE     VFT2_UNKNOWN
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0" // US English, Unicode
+        BEGIN
+            VALUE "Comments", "Look! A three headed monkey (TM)! .. Nice use of the TM!\0"
+            VALUE "FileDescription", "http://www.scummvm.org/\0"
+            VALUE "FileVersion", "1.4.0pre\0"
+            VALUE "InternalName", "scummvm\0"
+            VALUE "LegalCopyright", "Copyright � 2001-2011 The ScummVM Team\0"
+            VALUE "LegalTrademarks", "'SCUMM', and all SCUMM games are a TM of LucasArts. Simon The Sorcerer is a TM of AdventureSoft. Beneath a Steel Sky and Broken Sword are a TM of Revolution. Flight of the Amazon Queen is a TM of John Passfield and Steve Stamatiadis. \0"
+            VALUE "OriginalFilename", "scummvm-tools.exe\0"
+            VALUE "ProductName", "ScummVM Tools\0"
+            VALUE "ProductVersion", "1.4.0pre\0"
+        END
+    END
+
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200 // US English, Unicode
+    END
+END