From 02827d0dab916eef94f1a2cda733bf0193e288f2 Mon Sep 17 00:00:00 2001 From: Thierry Crozat Date: Mon, 5 Sep 2016 23:33:57 +0100 Subject: [PATCH] BUILD: Add wwwroot.zip to resource files for Windows builds The file had already been added to scummvm.rc, but not to scummvm.rc.in. As a result running update-version.pl would have caused the change to be lost. --- dists/scummvm.rc | 4 ++-- dists/scummvm.rc.in | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dists/scummvm.rc b/dists/scummvm.rc index 00d71ef717d4..d52d97dd2d9e 100644 --- a/dists/scummvm.rc +++ b/dists/scummvm.rc @@ -20,7 +20,7 @@ scummmodern.zip FILE "gui/themes/scummmodern.zip" translations.dat FILE "gui/themes/translations.dat" #endif #ifdef USE_SDL_NET -wwwroot.zip FILE "backends/networking/wwwroot.zip" +wwwroot.zip FILE "backends/networking/wwwroot.zip" #endif #if ENABLE_ACCESS == STATIC_PLUGIN @@ -88,7 +88,7 @@ BEGIN VALUE "FileDescription", "http://www.scummvm.org/\0" VALUE "FileVersion", "1.9.0git\0" VALUE "InternalName", "scummvm\0" - VALUE "LegalCopyright", "Copyright © 2001-2016 The ScummVM Team\0" + VALUE "LegalCopyright", "Copyright � 2001-2016 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.exe\0" VALUE "ProductName", "ScummVM\0" diff --git a/dists/scummvm.rc.in b/dists/scummvm.rc.in index 2e0a5ff74508..60fa44b01770 100644 --- a/dists/scummvm.rc.in +++ b/dists/scummvm.rc.in @@ -19,6 +19,9 @@ scummmodern.zip FILE "gui/themes/scummmodern.zip" #ifdef USE_TRANSLATION translations.dat FILE "gui/themes/translations.dat" #endif +#ifdef USE_SDL_NET +wwwroot.zip FILE "backends/networking/wwwroot.zip" +#endif #if ENABLE_ACCESS == STATIC_PLUGIN access.dat FILE "dists/engine-data/access.dat" @@ -85,7 +88,7 @@ BEGIN VALUE "FileDescription", "http://www.scummvm.org/\0" VALUE "FileVersion", "@VERSION@\0" VALUE "InternalName", "scummvm\0" - VALUE "LegalCopyright", "Copyright © 2001-2016 The ScummVM Team\0" + VALUE "LegalCopyright", "Copyright � 2001-2016 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.exe\0" VALUE "ProductName", "ScummVM\0"