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

Merge pull request #1640 from 86Box/master

Browse Source 
Brought the branch up to par with master.
This commit is contained in:
Miran Grča
2021-09-01 15:03:15 +02:00
committed by GitHub
parent 8afee010d0 e4197b8ca4
commit a505a6a910
55 changed files with 5492 additions and 339 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/include/86box/86box.h
View File

@@ -45,6 +45,13 @@
# define ENABLE_LOG_COMMANDS 1
#endif
#ifdef MIN
#undef MIN
#endif
#ifdef MAX
#undef MAX
#endif
#define MIN(a, b) ((a) < (b) ? (a) : (b))
#define MAX(a, b) ((a) > (b) ? (a) : (b))
#define ABS(x) ((x) > 0 ? (x) : -(x))
@@ -73,6 +80,7 @@ extern uint64_t unique_id;
extern uint64_t source_hwnd;
#endif
extern char log_path[1024]; /* (O) full path of logfile */
extern char vm_name[1024]; /* (O) display name of the VM */
extern int window_w, window_h, /* (C) window size and */

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

@@ -30,6 +30,10 @@
#ifdef _WIN32
# define wcscasecmp _wcsicmp
# define strcasecmp _stricmp
#else
/* Declare these functions to avoid warnings. They will redirect to strcasecmp and strncasecmp respectively. */
extern int stricmp(const char* s1, const char* s2);
extern int strnicmp(const char* s1, const char* s2, size_t n);
#endif
#if defined(UNIX) && defined(FREEBSD) || defined(__APPLE__)

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

@@ -164,6 +164,7 @@
#define IDC_CONFIGURE_GUS 1049
#define IDC_COMBO_MIDI_IN 1050
#define IDC_CONFIGURE_CMS 1051
#define IDC_CONFIGURE_SSI 1052
#define IDC_COMBO_NET_TYPE 1060 /* network config */
#define IDC_COMBO_PCAP 1061

12
src/include/86box/unix_sdl.h Normal file
View File

@@ -0,0 +1,12 @@
#ifndef _UNIX_SDL_H
#define _UNIX_SDL_H
extern void sdl_close(void);
extern int sdl_inits();
extern int sdl_inith();
extern int sdl_initho();
extern int sdl_pause(void);
extern void sdl_resize(int x, int y);
extern void sdl_enable(int enable);
extern void sdl_set_fs(int fs);
extern void sdl_reload(void);
#endif