Skip to content

Commit

Permalink
Merge pull request #696 from fdelapena/master
Browse files Browse the repository at this point in the history
Version 0.4.0
  • Loading branch information
Ghabry committed Dec 23, 2015
2 parents 4b4bc41 + 9468429 commit fffb1cc
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ set(MAN_NAME easyrpg-player.6)
find_program(A2X_EXECUTABLE NAMES a2x a2x.py)
if(NOT A2X_EXECUTABLE STREQUAL "A2X_EXECUTABLE-NOTFOUND")
add_custom_command(OUTPUT builds/${MAN_NAME}
COMMAND ${A2X_EXECUTABLE} -a player_version="0.3.2" -f manpage -D ${CMAKE_CURRENT_BINARY_DIR}/builds ${CMAKE_CURRENT_SOURCE_DIR}/builds/${MAN_NAME}.adoc
COMMAND ${A2X_EXECUTABLE} -a player_version="0.4.0" -f manpage -D ${CMAKE_CURRENT_BINARY_DIR}/builds ${CMAKE_CURRENT_SOURCE_DIR}/builds/${MAN_NAME}.adoc
DEPENDS builds/${MAN_NAME}.adoc
COMMENT "(Re-)building manpage ${MAN_NAME}"
VERBATIM)
Expand Down Expand Up @@ -197,7 +197,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
endif()

set(CPACK_PACKAGE_NAME ${PROJECT_NAME})
set(CPACK_PACKAGE_VERSION "0.3.2")
set(CPACK_PACKAGE_VERSION "0.4.0")
set(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/resources/player.ico")
set(CPACK_RESOURCE_FILE_README ${CMAKE_CURRENT_SOURCE_DIR}/README)

Expand Down
4 changes: 2 additions & 2 deletions README
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,11 @@ Building

1. Unpack the tarball with:

tar xf easyrpg-player-0.3.2.tar.xz
tar xf easyrpg-player-0.4.0.tar.xz

2. Enter in the package directory with:

cd easyrpg-player-0.3.2
cd easyrpg-player-0.4.0

3. Compile with:

Expand Down
4 changes: 2 additions & 2 deletions builds/wii/meta.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<app version="1">
<name>EasyRPG Player</name>
<coder>EasyRPG Team</coder>
<version>0.3.2</version>
<release_date>20150914000000</release_date>
<version>0.4.0</version>
<release_date>20151223000000</release_date>
<short_description>RPG Maker 2000/2003 player</short_description>
<long_description>EasyRPG is a Role Playing Game interpreter for playing games created by the RPG Maker 2000/2003.

Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.

AC_PREREQ([2.69])
AC_INIT([easyrpg-player],[0.3.2],[https://github.com/EasyRPG/Player/issues],[easyrpg-player],[https://easy-rpg.org/])
AC_INIT([easyrpg-player],[0.4.0],[https://github.com/EasyRPG/Player/issues],[easyrpg-player],[https://easy-rpg.org/])

AC_CONFIG_AUX_DIR([builds/autoconf])
AM_INIT_AUTOMAKE([1.11.4 foreign subdir-objects -Wall -Werror])
Expand Down
2 changes: 1 addition & 1 deletion resources/osx/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<string>APPL</string>

<key>CFBundleShortVersionString</key>
<string>0.3.2</string>
<string>0.4.0</string>

</dict>
</plist>
8 changes: 4 additions & 4 deletions resources/player.rc
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
1 24 "player.xml"
#endif
1 VERSIONINFO
FILEVERSION 0,3,2,0
PRODUCTVERSION 0,3,2,0
FILEVERSION 0,4,0,0
PRODUCTVERSION 0,4,0,0
FILETYPE 0x00000001L
{
BLOCK "StringFileInfo"
Expand All @@ -13,13 +13,13 @@ FILETYPE 0x00000001L
{
VALUE "Comments", "https://easy-rpg.org/"
VALUE "CompanyName", "EasyRPG Project"
VALUE "FileVersion", "0.3.2.0"
VALUE "FileVersion", "0.4.0.0"
VALUE "FileDescription", "EasyRPG Player"
VALUE "InternalName", "easyrpg-player"
VALUE "LegalCopyright", "2005-2015 EasyRPG Project"
VALUE "OriginalFilename", "Player.exe"
VALUE "ProductName", "EasyRPG Player"
VALUE "ProductVersion", "0.3.2.0"
VALUE "ProductVersion", "0.4.0.0"
}
}
BLOCK "VarFileInfo"
Expand Down
2 changes: 1 addition & 1 deletion src/options.h
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@

/** Version of player. Should be redefined by build system. */
#ifndef PLAYER_VERSION
# define PLAYER_VERSION "0.3.2"
# define PLAYER_VERSION "0.4.0"
#endif

#endif

0 comments on commit fffb1cc

Please sign in to comment.