[Scummvm-cvs-logs] scummvm-tools master -> de289cec49b04218649efd35748a465987afe283
Kirben
kirben at optusnet.com.au
Sat Oct 29 16:34:04 CEST 2011
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm-tools' repo located at https://github.com/scummvm/scummvm-tools .
Summary:
de289cec49 BUILD: Use icon for mingw build of ScummVM Tools.
Commit: de289cec49b04218649efd35748a465987afe283
https://github.com/scummvm/scummvm-tools/commit/de289cec49b04218649efd35748a465987afe283
Author: Travis Howell (kirben at optusnet.com.au)
Date: 2011-10-28T23:31:57-07:00
Commit Message:
BUILD: Use icon for mingw build of ScummVM Tools.
Changed paths:
A dists/scummvmtools.rc
Makefile
Makefile.common
configure
diff --git a/Makefile b/Makefile
index d73a81d..df70095 100644
--- a/Makefile
+++ b/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
diff --git a/Makefile.common b/Makefile.common
index 9d430d5..3f18138 100644
--- a/Makefile.common
+++ b/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
diff --git a/configure b/configure
index 18aac34..728f454 100755
--- a/configure
+++ b/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*)
diff --git a/dists/scummvmtools.rc b/dists/scummvmtools.rc
new file mode 100644
index 0000000..5d78d73
--- /dev/null
+++ b/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
More information about the Scummvm-git-logs
mailing list