Tino has proposed merging lp:~widelands-dev/widelands/bug1629013_obsoletewinfiles into lp:widelands.
Commit message: Remove obsolete mingw files. Only "widelands.rc.cmake" is needed, which cmake needs to generate the ressource file widelands.rc Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1629013 in widelands: "Remove unused supplementary win32 files" https://bugs.launchpad.net/widelands/+bug/1629013 For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug1629013_obsoletewinfiles/+merge/355178 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug1629013_obsoletewinfiles into lp:widelands.
=== removed directory 'utils/win32/mingw' === removed file 'utils/win32/mingw/WL.exe.Manifest' --- utils/win32/mingw/WL.exe.Manifest 2008-03-13 21:29:56 +0000 +++ utils/win32/mingw/WL.exe.Manifest 1970-01-01 00:00:00 +0000 @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<assembly - xmlns="urn:schemas-microsoft-com:asm.v1" - manifestVersion="1.0"> -<assemblyIdentity - name="SDLapp.Widelands" - processorArchitecture="x86" - version="1.0.0.0" - type="win32"/> -<description>Widelands</description> -<dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="x86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> -</dependency> -</assembly> === removed file 'utils/win32/mingw/Widelands_win.h' --- utils/win32/mingw/Widelands_win.h 2016-09-29 16:47:19 +0000 +++ utils/win32/mingw/Widelands_win.h 1970-01-01 00:00:00 +0000 @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2006-2015 by the Widelands Development Team - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - */ - -#ifndef WIDELANDS_WIN_H -#define WIDELANDS_WIN_H - -#include "wlversion.h" - -/* VERSION DEFINITIONS */ -#define VER_STRING "0.0.0.19" -#define VER_MAJOR 0 -#define VER_MINOR 0 -#define VER_RELEASE 0 -#define VER_BUILD 19 -#define COMPANY_NAME "The Widelands Development Team" -#define FILE_VERSION BUILD_ID -#define FILE_DESCRIPTION "Widelands - realtime strategy game" -#define INTERNAL_NAME "WL" -#define LEGAL_COPYRIGHT "GPL v2" -#define WWW "http:\/\/wl.widelands.org" -#define License "Gnu GPL v2" -#define ORIGINAL_FILENAME "widelands" -#define PRODUCT_NAME "Widelands" -#define PRODUCT_VERSION BUILD_ID - -#endif /*WIDELANDS_WIN_H*/ === removed file 'utils/win32/mingw/Widelands_win.rc' --- utils/win32/mingw/Widelands_win.rc 2016-09-29 16:47:19 +0000 +++ utils/win32/mingw/Widelands_win.rc 1970-01-01 00:00:00 +0000 @@ -1,60 +0,0 @@ -/* - * Copyright (C) 2006-2016 by the Widelands Development Team - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - */ - -#include "wlversion.h" - -#include <windows.h> // included for version info constants - -A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../WL.ico" - -// SUPPORT FOR WINDOWS XP THEMES: -// THIS WILL MAKE THE PROGRAM USE THE COMMON CONTROLS -// LIBRARY VERSION 6.0 (IF IT IS AVAILABLE) -1 24 "WL.exe.Manifest" - -// -// TO CHANGE VERSION INFORMATION, EDIT OPTIONS BELOW... -// -1 VERSIONINFO -FILEVERSION 0,0,0,19 -PRODUCTVERSION 0,0,0,19 -FILETYPE VFT_APP -{ - BLOCK "StringFileInfo" - { - BLOCK "080904E4" - { - VALUE "CompanyName", "The Widelands Development Team" - VALUE "FileVersion", BUILD_ID - VALUE "FileDescription", "Widelands - realtime strategy game" - VALUE "InternalName", "WL" - VALUE "LegalCopyright", "GPL v2" - VALUE "WWW", "http://www.widelands.org" - VALUE "License", "Gnu GPL v2" - VALUE "OriginalFilename", "widelands" - VALUE "ProductName", "Widelands - an Open-Source realtime strategy game" - VALUE "ProductVersion", BUILD_ID - } - } - BLOCK "VarFileInfo" - { - VALUE "Translation", 0x0809, 1252 - } -} - === removed file 'utils/win32/mingw/wlversion.h' --- utils/win32/mingw/wlversion.h 2016-09-29 16:47:19 +0000 +++ utils/win32/mingw/wlversion.h 1970-01-01 00:00:00 +0000 @@ -1,2 +0,0 @@ -#define BUILD_ID "Build19" -#define BUILD_TYPE "inoffical" === modified file 'utils/win32/widelands.rc.cmake' --- utils/win32/widelands.rc.cmake 2016-09-29 16:47:19 +0000 +++ utils/win32/widelands.rc.cmake 2018-09-18 07:14:37 +0000 @@ -25,8 +25,8 @@ // TO CHANGE VERSION INFORMATION, EDIT OPTIONS BELOW... // 1 VERSIONINFO -FILEVERSION 0,19,0,1 -PRODUCTVERSION 0,19,0,1 +FILEVERSION 0,20,0,1 +PRODUCTVERSION 0,20,0,1 FILETYPE VFT_APP { BLOCK "StringFileInfo"
_______________________________________________ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp