claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/86Box/86Box

Browse Source
This commit is contained in:
RichardG867
2020-04-17 15:34:26 -03:00
parent e7d7528dd3 3e6994a11c
commit 2cf88a5011
11 changed files with 10 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/include/86box/resource.h
View File

@@ -259,7 +259,7 @@
#define IDM_ABOUT 40001
#define IDC_ABOUT_ICON 65535
#define IDC_ABOUT_ICON 65535
#define IDM_ACTION_RCTRL_IS_LALT 40010
#define IDM_ACTION_SCREENSHOT 40011
#define IDM_ACTION_HRESET 40012
@@ -275,16 +275,7 @@
#define IDM_VID_REMEMBER 40041
#define IDM_VID_SDL_SW 40050
#define IDM_VID_SDL_HW 40051
#ifdef USE_D2D
#define IDM_VID_D2D 40052
#ifdef USE_VNC
#define IDM_VID_VNC 40053
#endif
#else
#ifdef USE_VNC
#define IDM_VID_VNC 40052
#endif
#endif
#define IDM_VID_SCALE_1X 40055
#define IDM_VID_SCALE_2X 40056
#define IDM_VID_SCALE_3X 40057

4
src/include/86box/win.h
View File

@@ -64,11 +64,7 @@
/* The emulator has shut down. */
#define WM_HAS_SHUTDOWN 0x8897
#ifdef USE_VNC
#define RENDERERS_NUM 3
#else
#define RENDERERS_NUM 2
#endif
#ifdef __cplusplus