80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

86Box v2.02 Stable/Final to fix a Joystick list initialization bug.

Browse Source
This commit is contained in:
OBattler
2019-10-23 23:16:16 +02:00
parent 0af4a8403a
commit 2e350558ef
3 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/86box.h
View File

@@ -8,10 +8,10 @@
*
* Main include file for the application.
*
* Version: @(#)86box.h 1.0.29 2019/10/22
* Version: @(#)86box.h 1.0.30 2019/10/23
*
* Authors: Miran Grca, <mgrca8@gmail.com>
* Fred N. van Kempen, <decwiz@yahoo.com>
*f Fred N. van Kempen, <decwiz@yahoo.com>
*
* Copyright 2016-2019 Miran Grca.
* Copyright 2017-2019 Fred N. van Kempen.
@@ -30,8 +30,8 @@
#define EMU_NAME "86Box"
#define EMU_NAME_W L"86Box"
#ifdef RELEASE_BUILD
#define EMU_VERSION "2.01"
#define EMU_VERSION_W L"2.01"
#define EMU_VERSION "2.02"
#define EMU_VERSION_W L"2.02"
#else
#define EMU_VERSION "2.10"
#define EMU_VERSION_W L"2.10"

12
src/win/86Box.rc
View File

@@ -8,7 +8,7 @@
*
* Application resource script for Windows.
*
* Version: @(#)86Box.rc 1.0.48 2019/10/22
* Version: @(#)86Box.rc 1.0.49 2019/10/23
*
* Authors: Miran Grca, <mgrca8@gmail.com>
* Fred N. van Kempen, <decwiz@yahoo.com>
@@ -225,7 +225,7 @@ BEGIN
DEFPUSHBUTTON "OK",IDOK,129,94,71,12
ICON 100,IDC_ABOUT_ICON,7,7,20,20
#ifdef RELEASE_BUILD
LTEXT "86Box v2.01 - An emulator of old computers\n\nAuthors: Sarah Walker, Miran Grca, Fred N. van Kempen (waltje), SA1988, MoochMcGee, reenigne, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2. See LICENSE for more information.",
LTEXT "86Box v2.02 - An emulator of old computers\n\nAuthors: Sarah Walker, Miran Grca, Fred N. van Kempen (waltje), SA1988, MoochMcGee, reenigne, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2. See LICENSE for more information.",
IDC_ABOUT_ICON,54,7,146,73
#else
LTEXT "86Box v2.10 - An emulator of old computers\n\nAuthors: Sarah Walker, Miran Grca, Fred N. van Kempen (waltje), SA1988, MoochMcGee, reenigne, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2. See LICENSE for more information.",
@@ -980,8 +980,8 @@ END
VS_VERSION_INFO VERSIONINFO
#ifdef RELEASE_BUILD
FILEVERSION 2,1,0,0
PRODUCTVERSION 2,1,0,0
FILEVERSION 2,2,0,0
PRODUCTVERSION 2,2,0,0
#else
FILEVERSION 2,10,0,0
PRODUCTVERSION 2,10,0,0
@@ -1004,7 +1004,7 @@ BEGIN
VALUE "CompanyName", "IRC #SoftHistory\0"
VALUE "FileDescription", "86Box - an emulator for X86-based systems\0"
#ifdef RELEASE_BUILD
VALUE "FileVersion", "2.01\0"
VALUE "FileVersion", "2.02\0"
#else
VALUE "FileVersion", "2.10\0"
#endif
@@ -1015,7 +1015,7 @@ BEGIN
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "86Box Emulator\0"
#ifdef RELEASE_BUILD
VALUE "ProductVersion", "2.01\0"
VALUE "ProductVersion", "2.02\0"
#else
VALUE "ProductVersion", "2.10\0"
#endif

8
src/win/win_joystick.cpp
View File

@@ -8,13 +8,13 @@
*
* Joystick interface to host device.
*
* Version: @(#)win_joystick.cpp 1.0.11 2018/11/11
* Version: @(#)win_joystick.cpp 1.0.12 2019/10/23
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
*
* Copyright 2008-2018 Sarah Walker.
* Copyright 2016-2018 Miran Grca.
* Copyright 2008-2019 Sarah Walker.
* Copyright 2016-2019 Miran Grca.
*/
#define DIRECTINPUT_VERSION 0x0800
#include <dinput.h>
@@ -121,8 +121,6 @@ void joystick_init()
{
int c;
if (joystick_type == 7) return;
atexit(joystick_close);
joysticks_present = 0;