Merge pull request #2223 from carstene1ns/version-0.6.2.1

Version 0.6.2.1
EasyRPG · May 22, 2020 · b599588 · b599588
2 parents 6d3439f + 1f4d4c8
commit b599588
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 17 deletions.
diff --git 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
@@ -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
@@ -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
@@ -2,8 +2,8 @@
 <app version="1">
   <name>EasyRPG Player</name>
   <coder>EasyRPG Team</coder>
-  <version>0.6.2</version>
-  <release_date>20200426000000</release_date>
+  <version>0.6.2.1</version>
+  <release_date>20200522000000</release_date>
   <short_description>RPG Maker 2000/2003 player</short_description>
   <long_description>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
@@ -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
@@ -31,7 +31,7 @@
     <string>APPL</string>
 
     <key>CFBundleShortVersionString</key>
-    <string>0.6.2</string>
+    <string>0.6.2.1</string>
 
 </dict>
 </plist>
diff --git 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
@@ -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 */