From 3788afc92bfd5a73c5395b341b7b2d685648f351 Mon Sep 17 00:00:00 2001 From: Sven Hesse Date: Mon, 25 Jun 2018 23:21:29 +0200 Subject: [PATCH] DIST: Add a Windows resource file and icon --- configure.ac | 5 +++++ dists/rules.mk | 6 ++++++ dists/win32/phaethon.ico | Bin 0 -> 305158 bytes dists/win32/phaethon.rc | 39 +++++++++++++++++++++++++++++++++++++++ src/rules.mk | 8 ++++++++ 5 files changed, 58 insertions(+) create mode 100644 dists/win32/phaethon.ico create mode 100644 dists/win32/phaethon.rc diff --git a/configure.ac b/configure.ac index 88b868ec..4edc0fc7 100644 --- a/configure.ac +++ b/configure.ac @@ -228,6 +228,11 @@ case "$target" in AM_CONDITIONAL(WIN32, false) ;; *mingw*) + AC_CHECK_TOOL([RC], [windres], [:]) + if test "x$RC" = "x:"; then + AC_MSG_ERROR([A Windows resource compiler (windres) is required and could not be found!]) + fi + PHAETHON_CFLAGS="-mwindows -municode" PHAETHON_LIBS="" AM_CONDITIONAL(WIN32, true) diff --git a/dists/rules.mk b/dists/rules.mk index bb82fc8d..3b4023c9 100644 --- a/dists/rules.mk +++ b/dists/rules.mk @@ -40,3 +40,9 @@ EXTRA_DIST += \ dists/fedora/build-from-git.sh \ dists/fedora/phaethon.spec \ $(EMPTY) + +# Windows +EXTRA_DIST += \ + dists/win32/phaethon.ico \ + dists/win32/phaethon.rc \ + $(EMPTY) diff --git a/dists/win32/phaethon.ico b/dists/win32/phaethon.ico new file mode 100644 index 0000000000000000000000000000000000000000..20d25c9906677068bb9fd1e6b587568be4c1a0e9 GIT binary patch literal 305158 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 oAOR$R1dsp{Kmter2_OL^fCP{L5z>% literal 0 HcmV?d00001 diff --git a/dists/win32/phaethon.rc b/dists/win32/phaethon.rc new file mode 100644 index 00000000..20a2ac33 --- /dev/null +++ b/dists/win32/phaethon.rc @@ -0,0 +1,39 @@ +#include "winresrc.h" + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#define IDI_ICON 1001 + +IDI_ICON ICON DISCARDABLE "dists/win32/phaethon.ico" + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 0,0,4,0 + PRODUCTVERSION 0,0,4,0 + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK + FILEFLAGS VS_FF_DEBUG | VS_FF_PRERELEASE + FILEOS VOS_NT_WINDOWS32 + FILETYPE VFT_APP + FILESUBTYPE VFT2_UNKNOWN +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" // US English, Unicode + BEGIN + VALUE "FileDescription", "https://xoreos.org/\0" + VALUE "FileVersion", "0.0.4+git\0" + VALUE "InternalName", "Phaethon\0" + VALUE "LegalCopyright", "Copyright © 2014-2018 The xoreos Team\0" + VALUE "LegalTrademarks", "The Infinity engine, Aurora engine, Odyssey engine and Eclipse engine are registered trademarks of BioWare Corp., a subsidiary of Electronic Arts, Inc. The Electron engine and Lycium engine are trademarks of BioWare Corp., a subsidiary of Electronic Arts, Inc. Bink is a registered trademark of RAD Game Tools, Inc. Neverwinter Nights is a registered trademark of Wizards of the Coast, a subsidiary of Hasbro Inc. Star Wars, Knights of the Old Republic and The Sith Lords are registered trademarks of Lucasfilm Entertainment Company Ltd., a subsidiary of The Walt Disney Company. Jade Empire is a registered trademark of BioWare Corp., a subsidiary of Electronic Arts, Inc. Sonic the Hedgehog is a registered trademark of Sega Corporation. The Witcher is a registered trademark of CD Projekt S.A. Dragon Age is a registered trademark of Electronic Arts, Inc. All rights reserved.\0" + VALUE "OriginalFilename", "phaethon.exe\0" + VALUE "ProductName", "phaethon\0" + VALUE "ProductVersion", "0.0.4+git\0" + END + END + + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 // US English, Unicode + END +END diff --git a/src/rules.mk b/src/rules.mk index ab0b7988..1ab8dd88 100644 --- a/src/rules.mk +++ b/src/rules.mk @@ -19,6 +19,10 @@ # Main Phaethon entry point. +# Windows resources +.rc.o: + $(AM_V_GEN)$(RC) -DHAVE_CONFIG_H -I$(srcdir) -o $@ $< + bin_PROGRAMS += src/phaethon src_phaethon_SOURCES = @@ -31,6 +35,10 @@ src_phaethon_SOURCES += \ src/phaethon.cpp \ $(EMPTY) +if WIN32 +src_phaethon_SOURCES += dists/win32/phaethon.rc +endif + src_phaethon_LDADD = \ src/gui/libgui.la \ src/sound/libsound.la \