diff --git a/CMakeLists.txt b/CMakeLists.txt index 9d98548a7d..9927d19a45 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.7) -project(EasyRPG_Player VERSION 0.5.3 LANGUAGES CXX) +project(EasyRPG_Player VERSION 0.5.4 LANGUAGES CXX) # Source Files add_library(${PROJECT_NAME} diff --git a/README.md b/README.md index 5ef54074bc..fa0f0b5ee2 100644 --- a/README.md +++ b/README.md @@ -70,8 +70,8 @@ Building requirements: Step-by-step instructions: - tar xf easyrpg-player-0.5.3.tar.xz # unpack the tarball - cd easyrpg-player-0.5.3 # enter in the package directory + tar xf easyrpg-player-0.5.4.tar.xz # unpack the tarball + cd easyrpg-player-0.5.4 # enter in the package directory ./configure # find libraries, set options make # compile the executable @@ -99,8 +99,8 @@ Building requirements: Step-by-step instructions: - tar xf easyrpg-player-0.5.3.tar.xz # unpack the tarball - cd easyrpg-player-0.5.3 # enter in the package directory + tar xf easyrpg-player-0.5.4.tar.xz # unpack the tarball + cd easyrpg-player-0.5.4 # enter in the package directory cmake . # generate Makefile make # compile the executable diff --git a/builds/switch/Makefile b/builds/switch/Makefile index 18a3d3cea4..77a44cf5c2 100644 --- a/builds/switch/Makefile +++ b/builds/switch/Makefile @@ -47,6 +47,7 @@ EXEFS_SRC := exefs_src APP_TITLE := EasyRPG Player APP_AUTHOR := EasyRPG Team & Rinnegatamante +APP_VERSION := 0.5.4 ICON := icon.jpg #--------------------------------------------------------------------------------- diff --git a/builds/wii/Makefile b/builds/wii/Makefile index 1b750493e0..e801e86963 100644 --- a/builds/wii/Makefile +++ b/builds/wii/Makefile @@ -29,7 +29,7 @@ TARGET := boot BUILD := obj TOPDIR := $(subst /builds/wii,,$(CURDIR)) SOURCES := src -DATA := data +DATA := data INCLUDES := src #--------------------------------------------------------------------------------- @@ -37,18 +37,17 @@ INCLUDES := src #--------------------------------------------------------------------------------- CFLAGS = -g -O2 -Wall -Wextra \ - -fomit-frame-pointer -ffast-math \ - -flto -fdata-sections -ffunction-sections \ + -fomit-frame-pointer -fdata-sections -ffunction-sections \ -DUSE_SDL=1 -DNDEBUG \ -DHAVE_FREETYPE -DHAVE_HARFBUZZ -DSUPPORT_AUDIO \ -DHAVE_MPG123 -DHAVE_LIBSNDFILE -DHAVE_TREMOR \ -DHAVE_XMP -DHAVE_WILDMIDI -DHAVE_OPUS \ -DHAVE_LIBSPEEXDSP -DWANT_FMMIDI -DWANT_FASTWAV \ $(MACHDEP) $(INCLUDE) - + CXXFLAGS = $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11 -LDFLAGS = -g $(MACHDEP) -Wl,-Map,easyrpg-player-wii.map,--gc-sections,-flto +LDFLAGS = -g $(MACHDEP) -Wl,-Map,easyrpg-player-wii.map,--gc-sections #--------------------------------------------------------------------------------- # any extra libraries we wish to link with the project diff --git a/builds/wii/meta.xml b/builds/wii/meta.xml index dfed27c315..adfc55fec7 100644 --- a/builds/wii/meta.xml +++ b/builds/wii/meta.xml @@ -2,8 +2,8 @@ EasyRPG Player EasyRPG Team - 0.5.3 - 20171022000000 + 0.5.4 + 20181026000000 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 8edbca5a62..ecf43f96b4 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.5.3],[https://github.com/EasyRPG/Player/issues],[easyrpg-player],[https://easyrpg.org]) +AC_INIT([easyrpg-player],[0.5.4],[https://github.com/EasyRPG/Player/issues],[easyrpg-player],[https://easyrpg.org]) AC_CONFIG_AUX_DIR([builds/autoconf]) AM_INIT_AUTOMAKE([1.11.4 foreign subdir-objects tar-ustar -Wall -Werror]) diff --git a/resources/osx/Info.plist b/resources/osx/Info.plist index 2767787795..fb57537047 100644 --- a/resources/osx/Info.plist +++ b/resources/osx/Info.plist @@ -31,7 +31,7 @@ APPL CFBundleShortVersionString - 0.5.3 + 0.5.4 diff --git a/resources/player.rc b/resources/player.rc index 268ab2e2da..f2b7102a9f 100644 --- a/resources/player.rc +++ b/resources/player.rc @@ -3,8 +3,8 @@ 1 24 "player.xml" #endif 1 VERSIONINFO -FILEVERSION 0,5,3,0 -PRODUCTVERSION 0,5,3,0 +FILEVERSION 0,5,4,0 +PRODUCTVERSION 0,5,4,0 FILETYPE 0x00000001L { BLOCK "StringFileInfo" @@ -13,13 +13,13 @@ FILETYPE 0x00000001L { VALUE "Comments", "https://easyrpg.org" VALUE "CompanyName", "EasyRPG Project" - VALUE "FileVersion", "0.5.3.0" + VALUE "FileVersion", "0.5.4.0" VALUE "FileDescription", "EasyRPG Player" VALUE "InternalName", "easyrpg-player" - VALUE "LegalCopyright", "2007-2017 EasyRPG Project" + VALUE "LegalCopyright", "2007-2018 EasyRPG Project" VALUE "OriginalFilename", "Player.exe" VALUE "ProductName", "EasyRPG Player" - VALUE "ProductVersion", "0.5.3.0" + VALUE "ProductVersion", "0.5.4.0" } } BLOCK "VarFileInfo" diff --git a/src/main_data.cpp b/src/main_data.cpp index 7d7a1f4c5b..83b31f3071 100644 --- a/src/main_data.cpp +++ b/src/main_data.cpp @@ -34,7 +34,7 @@ #include #endif -#if defined(GEKKO) || defined(__MORPHOS__) || defined(__amigaos4__) +#if defined(GEKKO) || defined(SWITCH) || defined(__MORPHOS__) || defined(__amigaos4__) #include #endif @@ -83,7 +83,7 @@ void Main_Data::Init() { // first set to current directory for all platforms project_path = "."; -#if defined(GEKKO) || defined(__MORPHOS__) || defined(__amigaos4__) +#if defined(GEKKO) || defined(SWITCH) || defined(__MORPHOS__) || defined(__amigaos4__) // Working directory not correctly handled char working_dir[256]; getcwd(working_dir, 255); diff --git a/src/output.cpp b/src/output.cpp index 8c5f2c2f4b..668e30e3e1 100644 --- a/src/output.cpp +++ b/src/output.cpp @@ -114,7 +114,7 @@ namespace { const devoptab_t dotab_geckoout = { "stdout", 0, NULL, NULL, __usbgecko_write, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL + NULL, NULL, NULL }; #endif diff --git a/src/registry_wine.cpp b/src/registry_wine.cpp index 735a509e6c..76a1722990 100644 --- a/src/registry_wine.cpp +++ b/src/registry_wine.cpp @@ -15,7 +15,7 @@ * along with EasyRPG Player. If not, see . */ -#if !(defined(_WIN32) || defined(GEKKO) || defined(__ANDROID__) || defined(EMSCRIPTEN) || defined(_3DS)) +#if !(defined(_WIN32) || defined(GEKKO) || defined(__ANDROID__) || defined(EMSCRIPTEN) || defined(_3DS) || defined(SWITCH)) #include #include "registry.h" diff --git a/src/sdl_ui.cpp b/src/sdl_ui.cpp index 6cf214f920..29551c8f26 100644 --- a/src/sdl_ui.cpp +++ b/src/sdl_ui.cpp @@ -66,7 +66,7 @@ static int FilterUntilFocus(const SDL_Event* evnt); extern void WII_ChangeSquare(int xscale, int yscale, int xshift, int yshift); } - static void GekkoResetCallback(); + static void GekkoResetCallback(u32 irq, void *ctx); #endif SdlUi::SdlUi(long width, long height, bool fs_flag) : @@ -866,7 +866,7 @@ int FilterUntilFocus(const SDL_Event* evnt) { } #ifdef GEKKO -void GekkoResetCallback() { +void GekkoResetCallback(u32, void*) { Player::reset_flag = true; } #endif diff --git a/src/version.h b/src/version.h index e7f8e6a207..1ae770409f 100644 --- a/src/version.h +++ b/src/version.h @@ -28,7 +28,7 @@ */ #define PLAYER_MAJOR 0 #define PLAYER_MINOR 5 -#define PLAYER_PATCH 3 +#define PLAYER_PATCH 4 #define PLAYER_ADDTL "" #define PLAYER_VERSION TO_STRING(PLAYER_MAJOR) "." TO_STRING(PLAYER_MINOR) "." TO_STRING(PLAYER_PATCH)