Merge pull request #1807 from laciba96/master

Fix some compile breaking stuff under Linux/Mac
This commit is contained in:
Miran Grča
2021-11-14 17:26:00 +01:00
committed by GitHub
4 changed files with 13 additions and 3 deletions

View File

@@ -14,7 +14,7 @@
#
add_library(chipset OBJECT 82c100.c acc2168.c cs8230.c ali1429.c ali1489.c ali1531.c ali1541.c ali1543.c
ali1621.c ali6117.c headland.c intel_82335.c contaq_82c59x.c cs4031.c intel_420ex.c
ali1621.c ali6117.c headland.c ims8848.c intel_82335.c contaq_82c59x.c cs4031.c intel_420ex.c
intel_4x0.c intel_i450kx.c intel_sio.c intel_piix.c ../ioapic.c neat.c opti283.c opti291.c opti391.c
opti495.c opti822.c opti895.c opti5x7.c scamp.c scat.c sis_85c310.c sis_85c4xx.c
sis_85c496.c sis_85c50x.c sis_5511.c sis_5571.c via_vt82c49x.c via_vt82c505.c sis_85c310.c

View File

@@ -50,6 +50,7 @@ SDL_mutex *blitmtx;
SDL_threadID eventthread;
static int exit_event = 0;
static int fullscreen_pending = 0;
uint32_t lang_id = 0x0409, lang_sys = 0x0409; // Multilangual UI variables, for now all set to LCID of en-US
static const uint16_t sdl_to_xt[0x200] =
{
@@ -1235,6 +1236,15 @@ uint32_t plat_language_code(char* langcode)
return 0;
}
/* Converts back the language code to LCID */
void
plat_language_code_r(uint32_t lcid, char* outbuf, int len)
{
/* or maybe not */
return;
}
void joystick_init(void) {}
void joystick_close(void) {}
void joystick_process(void) {}

View File

@@ -990,7 +990,7 @@ BEGIN
IDS_6146 "1.5%% abaixo das RPM perfeita"
IDS_6147 "2%% abaixo das RPM perfeita"
IDS_7168 "Português (Brasil)"
IDS_7168 "(Padrão do sistema)"
END
#define IDS_LANG_ENUS IDS_7168

View File

@@ -6,7 +6,7 @@
*
* This file is part of the 86Box distribution.
*
* Handle the dialog for specifying the dimensions of the main window.
* Handle the dialog for changing the program's language.
*
*
*