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

Merge branch 'master' into feature/discord

Browse Source
This commit is contained in:
David Hrdlička
2019-12-05 00:56:21 +01:00
committed by GitHub
parent e0d070a934 15bf584187
commit a18f9fa199
13 changed files with 399 additions and 612 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/win/resource.h
View File

@@ -15,9 +15,9 @@
* Fred N. van Kempen, <decwiz@yahoo.com>
* David Hrdlička, <hrdlickadavid@outlook.com>
*
* Copyright 2008-2018 Sarah Walker.
* Copyright 2016-2018 Miran Grca.
* Copyright 2018 David Hrdlička.
* Copyright 2008-2019 Sarah Walker.
* Copyright 2016-2019 Miran Grca.
* Copyright 2018,2019 David Hrdlička.
*/
#ifndef WIN_RESOURCE_H
# define WIN_RESOURCE_H
@@ -266,18 +266,17 @@
#define IDM_UPDATE_ICONS 40030
#define IDM_VID_RESIZE 40040
#define IDM_VID_REMEMBER 40041
#define IDM_VID_DDRAW 40050
#define IDM_VID_SDL_SW 40050
#define IDM_VID_SDL_HW 40051
#ifdef USE_D2D
#define IDM_VID_D2D 40051
#define IDM_VID_D3D 40052
#define IDM_VID_SDL 40053
#define IDM_VID_VNC 40054
#else
#define IDM_VID_D3D 40051
#define IDM_VID_SDL 40052
#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