From 1f4d4c8449c23fb5d77b9af5a912f328b796e61b Mon Sep 17 00:00:00 2001 From: Carsten Teibes Date: Wed, 20 May 2020 03:57:23 +0200 Subject: [PATCH] Version 0.6.2.1 --- CMakeLists.txt | 2 +- README.md | 12 ++++++------ builds/switch/Makefile | 2 +- builds/wii/meta.xml | 4 ++-- configure.ac | 2 +- resources/osx/Info.plist | 2 +- resources/player.rc | 8 ++++---- src/version.h | 8 +++++++- 8 files changed, 23 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c1ede41273..29c0fd5f16 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.7) -project(EasyRPG_Player VERSION 0.6.2 LANGUAGES CXX) +project(EasyRPG_Player VERSION 0.6.2.1 LANGUAGES CXX) # Extra CMake Module files list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/builds/cmake/Modules") diff --git a/README.md b/README.md index a07abe18ce..e5a00f1f0b 100644 --- a/README.md +++ b/README.md @@ -70,10 +70,10 @@ Building requirements: Step-by-step instructions: - tar xf easyrpg-player-0.6.2.tar.xz # unpack the tarball - cd easyrpg-player-0.6.2 # enter in the package directory - ./configure # find libraries, set options - make # compile the executable + tar xf easyrpg-player-0.6.2.1.tar.xz # unpack the tarball + cd easyrpg-player-0.6.2.1 # enter in the package directory + ./configure # find libraries, set options + make # compile the executable Additional building requirements when using the source tree (git): @@ -99,8 +99,8 @@ Building requirements: Step-by-step instructions: - tar xf easyrpg-player-0.6.2.tar.xz # unpack the tarball - cd easyrpg-player-0.6.2 # enter in the package directory + tar xf easyrpg-player-0.6.2.1.tar.xz # unpack the tarball + cd easyrpg-player-0.6.2.1 # enter in the package directory cmake . -DCMAKE_BUILD_TYPE=Release # configure project cmake --build . # compile the executable sudo cmake --build . --target install # install system-wide diff --git a/builds/switch/Makefile b/builds/switch/Makefile index 976356daec..1122983993 100644 --- a/builds/switch/Makefile +++ b/builds/switch/Makefile @@ -49,7 +49,7 @@ EXEFS_SRC := exefs_src APP_TITLE := EasyRPG Player APP_AUTHOR := EasyRPG Team & Rinnegatamante -APP_VERSION := 0.6.2 +APP_VERSION := 0.6.2.1 ICON := icon.jpg #--------------------------------------------------------------------------------- diff --git a/builds/wii/meta.xml b/builds/wii/meta.xml index bc42a345cb..4d68e23e56 100644 --- a/builds/wii/meta.xml +++ b/builds/wii/meta.xml @@ -2,8 +2,8 @@ EasyRPG Player EasyRPG Team - 0.6.2 - 20200426000000 + 0.6.2.1 + 20200522000000 RPG Maker 2000/2003 player EasyRPG Player is a Role Playing Game interpreter for playing games created by RPG Maker 2000/2003. diff --git a/configure.ac b/configure.ac index 485fdaace7..08008d2175 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) -AC_INIT([easyrpg-player],[0.6.2],[https://github.com/EasyRPG/Player/issues],[easyrpg-player],[https://easyrpg.org]) +AC_INIT([easyrpg-player],[0.6.2.1],[https://github.com/EasyRPG/Player/issues],[easyrpg-player],[https://easyrpg.org]) AC_CONFIG_AUX_DIR([builds/autoconf/aux]) AM_INIT_AUTOMAKE([1.11.4 foreign subdir-objects tar-ustar -Wall dist-xz]) diff --git a/resources/osx/Info.plist b/resources/osx/Info.plist index bad0401145..248e4ba46a 100644 --- a/resources/osx/Info.plist +++ b/resources/osx/Info.plist @@ -31,7 +31,7 @@ APPL CFBundleShortVersionString - 0.6.2 + 0.6.2.1 diff --git a/resources/player.rc b/resources/player.rc index 6eb7505b74..6777e1b874 100644 --- a/resources/player.rc +++ b/resources/player.rc @@ -3,8 +3,8 @@ 1 24 "player.xml" #endif 1 VERSIONINFO -FILEVERSION 0,6,2,0 -PRODUCTVERSION 0,6,2,0 +FILEVERSION 0,6,2,1 +PRODUCTVERSION 0,6,2,1 FILETYPE 0x00000001L { BLOCK "StringFileInfo" @@ -13,13 +13,13 @@ FILETYPE 0x00000001L { VALUE "Comments", "https://easyrpg.org" VALUE "CompanyName", "EasyRPG Project" - VALUE "FileVersion", "0.6.2.0" + VALUE "FileVersion", "0.6.2.1" VALUE "FileDescription", "EasyRPG Player" VALUE "InternalName", "easyrpg-player" VALUE "LegalCopyright", "2007-2019 EasyRPG Project" VALUE "OriginalFilename", "Player.exe" VALUE "ProductName", "EasyRPG Player" - VALUE "ProductVersion", "0.6.2.0" + VALUE "ProductVersion", "0.6.2.1" } } BLOCK "VarFileInfo" diff --git a/src/version.h b/src/version.h index fddc207483..f0b999cb42 100644 --- a/src/version.h +++ b/src/version.h @@ -29,13 +29,19 @@ #define PLAYER_MAJOR 0 #define PLAYER_MINOR 6 #define PLAYER_PATCH 2 +#define PLAYER_TWEAK 1 #define PLAYER_ADDTL "" + +#if PLAYER_TWEAK > 0 +#define PLAYER_VERSION TO_STRING(PLAYER_MAJOR) "." TO_STRING(PLAYER_MINOR) "." TO_STRING(PLAYER_PATCH) "." TO_STRING(PLAYER_TWEAK) +#else #define PLAYER_VERSION TO_STRING(PLAYER_MAJOR) "." TO_STRING(PLAYER_MINOR) "." TO_STRING(PLAYER_PATCH) +#endif /** * Version written to the easyrpg_data.version field in savegames. * Increment the last digit (0) only when having a good reason. */ -#define PLAYER_SAVEGAME_VERSION (PLAYER_MAJOR * 1000 + PLAYER_MINOR * 100 + PLAYER_PATCH * 10 + 0) +#define PLAYER_SAVEGAME_VERSION (PLAYER_MAJOR * 1000 + PLAYER_MINOR * 100 + PLAYER_PATCH * 10 + 1) #endif /* EP_VERSION_H */