From 9ba4ae6713ebc4c1cd13ae194c8f77292c42e42e Mon Sep 17 00:00:00 2001 From: bjaraujo Date: Mon, 6 May 2019 09:16:39 +0100 Subject: [PATCH] v1.9.6.2074 --- installers/InstallScriptWin32.iss | 42 +++++++++++++++---------------- trunk/src/Bombermaaan.h | 2 +- trunk/src/Bombermaaan.rc | 8 +++--- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/installers/InstallScriptWin32.iss b/installers/InstallScriptWin32.iss index 5ce262e..c4e84e4 100644 --- a/installers/InstallScriptWin32.iss +++ b/installers/InstallScriptWin32.iss @@ -26,7 +26,7 @@ AppUpdatesURL=https://github.com/bjaraujo/bombermaaan DefaultDirName={pf}\Bombermaaan DefaultGroupName=Bombermaaan {#APP_VERSION_INFO} AllowNoIcons=true -LicenseFile=..\releases\msvc15-win32\Bombermaaan_{#APP_VERSION_INFO}\COPYING.txt +LicenseFile=..\releases\msvc16-win32\Bombermaaan_{#APP_VERSION_INFO}\COPYING.txt OutputDir=.\output OutputBaseFilename=Bombermaaan_{#APP_VERSION_INFO}_setup Compression=lzma @@ -45,26 +45,26 @@ Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:Ad Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked [Files] -Source: ..\releases\msvc15-win32\Bombermaaan_{#APP_VERSION_INFO}\Bombermaaan.exe; DestDir: {app}; Flags: ignoreversion -Source: ..\releases\msvc15-win32\Bombermaaan_{#APP_VERSION_INFO}\Bombermaaan32.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\releases\msvc15-win32\Bombermaaan_{#APP_VERSION_INFO}\CrashSender1403.exe; DestDir: {app}; Flags: ignoreversion -Source: ..\releases\msvc15-win32\Bombermaaan_{#APP_VERSION_INFO}\CrashRpt1403.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\releases\msvc15-win32\Bombermaaan_{#APP_VERSION_INFO}\dbghelp.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\releases\msvc15-win32\Bombermaaan_{#APP_VERSION_INFO}\crashrpt_lang.ini; DestDir: {app}; Flags: ignoreversion -Source: ..\releases\msvc15-win32\Bombermaaan_{#APP_VERSION_INFO}\COPYING.txt; DestDir: {app}; Flags: ignoreversion -Source: ..\releases\msvc15-win32\Bombermaaan_{#APP_VERSION_INFO}\README.txt; DestDir: {app}; Flags: ignoreversion -Source: ..\releases\msvc15-win32\Bombermaaan_{#APP_VERSION_INFO}\libFLAC-8.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\releases\msvc15-win32\Bombermaaan_{#APP_VERSION_INFO}\libmikmod-2.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\releases\msvc15-win32\Bombermaaan_{#APP_VERSION_INFO}\libogg-0.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\releases\msvc15-win32\Bombermaaan_{#APP_VERSION_INFO}\libvorbis-0.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\releases\msvc15-win32\Bombermaaan_{#APP_VERSION_INFO}\libvorbisfile-3.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\releases\msvc15-win32\Bombermaaan_{#APP_VERSION_INFO}\SDL.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\releases\msvc15-win32\Bombermaaan_{#APP_VERSION_INFO}\SDL_mixer.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\releases\msvc15-win32\Bombermaaan_{#APP_VERSION_INFO}\SDL_net.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\releases\msvc15-win32\Bombermaaan_{#APP_VERSION_INFO}\smpeg.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\releases\msvc15-win32\Bombermaaan_{#APP_VERSION_INFO}\msvcp140.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\releases\msvc15-win32\Bombermaaan_{#APP_VERSION_INFO}\vcruntime140.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\releases\msvc15-win32\Bombermaaan_{#APP_VERSION_INFO}\Levels\*.TXT; DestDir: {app}\Levels\ +Source: ..\releases\msvc16-win32\Bombermaaan_{#APP_VERSION_INFO}\Bombermaaan.exe; DestDir: {app}; Flags: ignoreversion +Source: ..\releases\msvc16-win32\Bombermaaan_{#APP_VERSION_INFO}\Bombermaaan32.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\releases\msvc16-win32\Bombermaaan_{#APP_VERSION_INFO}\CrashSender1403.exe; DestDir: {app}; Flags: ignoreversion +Source: ..\releases\msvc16-win32\Bombermaaan_{#APP_VERSION_INFO}\CrashRpt1403.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\releases\msvc16-win32\Bombermaaan_{#APP_VERSION_INFO}\dbghelp.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\releases\msvc16-win32\Bombermaaan_{#APP_VERSION_INFO}\crashrpt_lang.ini; DestDir: {app}; Flags: ignoreversion +Source: ..\releases\msvc16-win32\Bombermaaan_{#APP_VERSION_INFO}\COPYING.txt; DestDir: {app}; Flags: ignoreversion +Source: ..\releases\msvc16-win32\Bombermaaan_{#APP_VERSION_INFO}\README.txt; DestDir: {app}; Flags: ignoreversion +Source: ..\releases\msvc16-win32\Bombermaaan_{#APP_VERSION_INFO}\libFLAC-8.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\releases\msvc16-win32\Bombermaaan_{#APP_VERSION_INFO}\libmikmod-2.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\releases\msvc16-win32\Bombermaaan_{#APP_VERSION_INFO}\libogg-0.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\releases\msvc16-win32\Bombermaaan_{#APP_VERSION_INFO}\libvorbis-0.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\releases\msvc16-win32\Bombermaaan_{#APP_VERSION_INFO}\libvorbisfile-3.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\releases\msvc16-win32\Bombermaaan_{#APP_VERSION_INFO}\SDL.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\releases\msvc16-win32\Bombermaaan_{#APP_VERSION_INFO}\SDL_mixer.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\releases\msvc16-win32\Bombermaaan_{#APP_VERSION_INFO}\SDL_net.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\releases\msvc16-win32\Bombermaaan_{#APP_VERSION_INFO}\smpeg.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\releases\msvc16-win32\Bombermaaan_{#APP_VERSION_INFO}\msvcp140.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\releases\msvc16-win32\Bombermaaan_{#APP_VERSION_INFO}\vcruntime140.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\releases\msvc16-win32\Bombermaaan_{#APP_VERSION_INFO}\Levels\*.TXT; DestDir: {app}\Levels\ [Icons] Name: {commondesktop}\Bombermaaan; Filename: {app}\Bombermaaan.exe; Tasks: desktopicon; Parameters: --use-appdata-dir diff --git a/trunk/src/Bombermaaan.h b/trunk/src/Bombermaaan.h index 4a16622..97b8cec 100644 --- a/trunk/src/Bombermaaan.h +++ b/trunk/src/Bombermaaan.h @@ -1 +1 @@ -#define APP_VERSION_INFO "1.9.6.2073" \ No newline at end of file +#define APP_VERSION_INFO "1.9.6.2074" \ No newline at end of file diff --git a/trunk/src/Bombermaaan.rc b/trunk/src/Bombermaaan.rc index 5dc16c0..aa41490 100644 --- a/trunk/src/Bombermaaan.rc +++ b/trunk/src/Bombermaaan.rc @@ -63,8 +63,8 @@ END // http://msdn.microsoft.com/en-us/library/aa381058%28VS.85%29.aspx // http://msdn.microsoft.com/en-us/library/aa381049(VS.85).aspx 1 VERSIONINFO - FILEVERSION 1,9,6,2073 - PRODUCTVERSION 1,9,6,2073 + FILEVERSION 1,9,6,2074 + PRODUCTVERSION 1,9,6,2074 FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_APP FILESUBTYPE VFT2_UNKNOWN @@ -74,13 +74,13 @@ BEGIN BLOCK "040904E4" BEGIN VALUE "CompanyName", "http://bombermaaan.sourceforge.net/\0" - VALUE "FileVersion", "1.9.6.2073" + VALUE "FileVersion", "1.9.6.2074" VALUE "FileDescription", "Bombermaaan executable file" VALUE "InternalName", "Bombermaaan.exe" VALUE "LegalCopyright", "Copyright (C) 2000-2002, 2007, 2008 Thibaut Tollemer, Bernd Arnold, Jerome Bigot, Markus Drescher" VALUE "OriginalFilename", "Bombermaaan.exe\0" VALUE "ProductName", "Bombermaaan\0" - VALUE "ProductVersion", "1.9.6.2073" + VALUE "ProductVersion", "1.9.6.2074" VALUE "Comments", "Bombermaaan 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 3 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, see ." END END