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

86Box v2.01 Stable/Final with DirectInput instead of XInput for joysticks because XInput is way too limited.

Browse Source
This commit is contained in:
OBattler
2019-10-23 22:58:14 +02:00
parent e1d1c84317
commit fba9bfd01d
4 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/86box.h
View File

@@ -8,7 +8,7 @@
*
* Main include file for the application.
*
* Version: @(#)86box.h 1.0.28 2019/10/22
* Version: @(#)86box.h 1.0.29 2019/10/22
*
* Authors: Miran Grca, <mgrca8@gmail.com>
* Fred N. van Kempen, <decwiz@yahoo.com>
@@ -30,8 +30,8 @@
#define EMU_NAME "86Box"
#define EMU_NAME_W L"86Box"
#ifdef RELEASE_BUILD
#define EMU_VERSION "2.00"
#define EMU_VERSION_W L"2.00"
#define EMU_VERSION "2.01"
#define EMU_VERSION_W L"2.01"
#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.47 2019/10/22
* Version: @(#)86Box.rc 1.0.48 2019/10/22
*
* 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.00 - 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.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.",
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,0,0,0
PRODUCTVERSION 2,0,0,0
FILEVERSION 2,1,0,0
PRODUCTVERSION 2,1,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.00\0"
VALUE "FileVersion", "2.01\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.00\0"
VALUE "ProductVersion", "2.01\0"
#else
VALUE "ProductVersion", "2.10\0"
#endif

10
src/win/Makefile.mingw
View File

@@ -8,7 +8,7 @@
#
# Makefile for Win32 (MinGW32) environment.
#
# Version: @(#)Makefile.mingw 1.0.137 2019/03/03
# Version: @(#)Makefile.mingw 1.0.138 2019/10/23
#
# Authors: Miran Grca, <mgrca8@gmail.com>
# Fred N. van Kempen, <decwiz@yahoo.com>
@@ -676,7 +676,7 @@ PLATOBJ := win.o \
ifeq ($(DINPUT), y)
PLATOBJ += win_mouse.o win_joystick.o
else
PLATOBJ += win_mouse_rawinput.o win_joystick_xinput.o
PLATOBJ += win_mouse_rawinput.o win_joystick.o
endif
OBJ := $(MAINOBJ) $(INTELOBJ) $(CPUOBJ) $(CHIPSETOBJ) $(MCHOBJ) \
@@ -710,14 +710,12 @@ endif
ifneq ($(WX), n)
LIBS += $(WX_LIBS) -lm
endif
LIBS += -lpng -lz -lwsock32 -liphlpapi
LIBS += -lpng -lz -lwsock32 -liphlpapi -ldinput8
LIBS += -static -lstdc++
ifneq ($(X64), y)
LIBS += -Wl,--large-address-aware
endif
ifeq ($(DINPUT), y)
LIBS += -ldinput8
else
ifneq ($(DINPUT), y)
LIBS += -lxinput
endif

10
src/win/Makefile_ndr.mingw
View File

@@ -8,7 +8,7 @@
#
# Makefile for Win32 (MinGW32) environment.
#
# Version: @(#)Makefile.mingw 1.0.137 2019/03/03
# Version: @(#)Makefile.mingw 1.0.138 2019/10/23
#
# Authors: Miran Grca, <mgrca8@gmail.com>
# Fred N. van Kempen, <decwiz@yahoo.com>
@@ -682,7 +682,7 @@ PLATOBJ := win.o \
ifeq ($(DINPUT), y)
PLATOBJ += win_mouse.o win_joystick.o
else
PLATOBJ += win_mouse_rawinput.o win_joystick_xinput.o
PLATOBJ += win_mouse_rawinput.o win_joystick.o
endif
OBJ := $(MAINOBJ) $(INTELOBJ) $(CPUOBJ) $(CHIPSETOBJ) $(MCHOBJ) \
@@ -716,14 +716,12 @@ endif
ifneq ($(WX), n)
LIBS += $(WX_LIBS) -lm
endif
LIBS += -lpng -lz -lwsock32 -liphlpapi
LIBS += -lpng -lz -lwsock32 -liphlpapi -ldinput8
LIBS += -static -lstdc++
ifneq ($(X64), y)
LIBS += -Wl,--large-address-aware
endif
ifeq ($(DINPUT), y)
LIBS += -ldinput8
else
ifneq ($(DINPUT), y)
LIBS += -lxinput
endif