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

Merge branch 'master' into translation_hu-HU

Browse Source
This commit is contained in:
Laci bá
2021-11-14 00:03:36 +01:00
committed by GitHub
parent 7651f4be6d 11a106b734
commit 6f0da19369
138 changed files with 13035 additions and 4519 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
src/win/Makefile.mingw
View File

@@ -45,12 +45,6 @@ ifeq ($(DEV_BUILD), y)
ifndef HEDAKA
HEDAKA := y
endif
ifndef I450KX
I450KX := y
endif
ifndef M154X
M154X := y
endif
ifndef LASERXT
LASERXT := y
endif
@@ -75,12 +69,6 @@ ifeq ($(DEV_BUILD), y)
ifndef SIO_DETECT
SIO_DETECT := y
endif
ifndef M154X
M154X := y
endif
ifndef M6117
M6117 := y
endif
ifndef VGAWONDER
VGAWONDER := y
endif
@@ -96,6 +84,9 @@ ifeq ($(DEV_BUILD), y)
ifndef OLIVETTI
OLIVETTI := y
endif
ifndef NEW_KBC
NEW_KBC := n
endif
else
ifndef DEBUG
DEBUG := n
@@ -115,15 +106,9 @@ else
ifndef HEDAKA
HEDAKA := n
endif
ifndef I450KX
I450KX := n
endif
ifndef LASERXT
LASERXT := n
endif
ifndef M154X
M154X := n
endif
ifndef MGA
MGA := n
endif
@@ -145,12 +130,6 @@ else
ifndef SIO_DETECT
SIO_DETECT := n
endif
ifndef M154X
M154X := n
endif
ifndef M6117
M6117 := n
endif
ifndef VGAWONDER
VGAWONDER := n
endif
@@ -166,6 +145,9 @@ else
ifndef OLIVETTI
OLIVETTI := n
endif
ifndef NEW_KBC
NEW_KBC := n
endif
endif
# Defaults for several build options (possibly defined in a chained file.)
@@ -347,7 +329,7 @@ else
endif
endif
ifeq ($(DEBUG), y)
DFLAGS += -ggdb -DDEBUG
DFLAGS += -ggdb -DDEBUG -DUSE_ACYCS
AOPTIM :=
ifndef COPTIM
COPTIM := -Og
@@ -513,11 +495,6 @@ ifeq ($(HEDAKA), y)
OPTS += -DUSE_HEDAKA
endif
ifeq ($(I450KX), y)
OPTS += -DUSE_I450KX
DEVBROBJ += intel_i450kx.o
endif
ifeq ($(LASERXT), y)
OPTS += -DUSE_LASERXT
DEVBROBJ += m_xt_laserxt.o
@@ -556,16 +533,6 @@ OPTS += -DUSE_SIO_DETECT
DEVBROBJ += sio_detect.o
endif
ifeq ($(M154X), y)
OPTS += -DUSE_M154X
DEVBROBJ += ali1531.o ali1543.o
endif
ifeq ($(M6117), y)
OPTS += -DUSE_M6117
DEVBROBJ += ali6117.o
endif
ifeq ($(VGAWONDER), y)
OPTS += -DUSE_VGAWONDER
endif
@@ -597,8 +564,8 @@ CXXFLAGS := $(CFLAGS)
#########################################################################
# Create the (final) list of objects to build. #
#########################################################################
MAINOBJ := 86box.o config.o random.o timer.o io.o acpi.o apm.o dma.o ddma.o \
nmi.o pic.o pit.o port_92.o ppi.o pci.o mca.o \
MAINOBJ := 86box.o config.o log.o random.o timer.o io.o acpi.o apm.o dma.o ddma.o \
nmi.o pic.o pit.o port_6x.o port_92.o ppi.o pci.o mca.o \
usb.o device.o nvr.o nvr_at.o nvr_ps2.o \
$(VNCOBJ)
@@ -610,13 +577,21 @@ CPUOBJ := $(DYNARECOBJ) \
808x.o 386.o 386_common.o 386_dynarec.o 386_dynarec_ops.o \
x86seg.o x87.o x87_timings.o
CHIPSETOBJ := 82c100.o acc2168.o cs8230.o ali1217.o ali1429.o ali1489.o et6000.o headland.o intel_82335.o cs4031.o \
intel_420ex.o intel_4x0.o intel_sio.o intel_piix.o ioapic.o \
neat.o opti495.o opti822.o opti895.o opti5x7.o scamp.o scat.o via_vt82c49x.o via_vt82c505.o \
gc100.o \
sis_85c310.o sis_85c4xx.o sis_85c496.o sis_85c50x.o sis_5511.o sis_5571.o stpc.o opti283.o opti291.o \
umc_8886.o umc_8890.o umc_hb4.o \
via_apollo.o via_pipc.o wd76c10.o vl82c480.o
CHIPSETOBJ := 82c100.o acc2168.o \
contaq_82c59x.o \
cs4031.o cs8230.o \
ali1429.o ali1489.o ali1531.o ali1541.o ali1543.o ali1621.o ali6117.o \
gc100.o headland.o \
ims8848.o intel_82335.o intel_420ex.o intel_4x0.o intel_i450kx.o intel_sio.o intel_piix.o \
ioapic.o \
neat.o \
opti283.o opti291.o opti391.o opti495.o opti822.o opti895.o opti5x7.o \
scamp.o scat.o \
stpc.o \
wd76c10.o vl82c480.o \
umc_8886.o umc_hb4.o \
via_vt82c49x.o via_vt82c505.o via_apollo.o via_pipc.o \
sis_85c310.o sis_85c4xx.o sis_85c496.o sis_85c50x.o sis_5511.o sis_5571.o
MCHOBJ := machine.o machine_table.o \
m_xt.o m_xt_compaq.o \
@@ -632,24 +607,37 @@ MCHOBJ := machine.o machine_table.o \
m_ps2_isa.o m_ps2_mca.o \
m_at_compaq.o \
m_at_286_386sx.o m_at_386dx_486.o \
m_at_socket4_5.o m_at_socket7.o m_at_sockets7.o \
m_at_socket4.o m_at_socket5.o m_at_socket7_3v.o m_at_socket7.o m_at_sockets7.o \
m_at_socket8.o m_at_slot1.o m_at_slot2.o m_at_socket370.o \
m_at_misc.o
ifeq ($(NEW_KBC), y)
DEVOBJ := bugger.o cartridge.o cassette.o hasp.o hwm.o hwm_lm75.o hwm_lm78.o hwm_gl518sm.o hwm_vt82c686.o \
ibm_5161.o isamem.o isartc.o lpt.o pci_bridge.o postcard.o serial.o \
vpc2007.o clock_ics9xxx.o isapnp.o \
i2c.o i2c_gpio.o smbus_piix4.o \
clock_ics9xxx.o isapnp.o \
i2c.o i2c_gpio.o smbus_ali7101.o smbus_piix4.o \
keyboard.o \
keyboard_xt.o kbc_at.o kbd_at.o \
mouse.o \
mouse_bus.o \
mouse_serial.o mouse_ps2.o \
phoenix_486_jumper.o
else
DEVOBJ := bugger.o cartridge.o cassette.o hasp.o hwm.o hwm_lm75.o hwm_lm78.o hwm_gl518sm.o hwm_vt82c686.o \
ibm_5161.o isamem.o isartc.o lpt.o pci_bridge.o postcard.o serial.o \
clock_ics9xxx.o isapnp.o \
i2c.o i2c_gpio.o smbus_ali7101.o smbus_piix4.o \
keyboard.o \
keyboard_xt.o keyboard_at.o \
mouse.o \
mouse_bus.o \
mouse_serial.o mouse_ps2.o \
phoenix_486_jumper.o
endif
SIOOBJ := sio_acc3221.o \
sio_f82c710.o sio_82091aa.o sio_fdc37c651.o \
sio_fdc37c661.o sio_fdc37c66x.o sio_fdc37c669.o sio_fdc37c93x.o sio_fdc37m60x.o \
sio_f82c710.o sio_82091aa.o sio_fdc37c6xx.o \
sio_fdc37c67x.o sio_fdc37c669.o sio_fdc37c93x.o sio_fdc37m60x.o \
sio_it8661f.o \
sio_pc87306.o sio_pc87307.o sio_pc87309.o sio_pc87310.o sio_pc87311.o sio_pc87332.o \
sio_prime3b.o sio_prime3c.o \
@@ -676,7 +664,8 @@ HDDOBJ := hdd.o \
hdc_esdi_at.o hdc_esdi_mca.o \
hdc_xtide.o hdc_ide.o \
hdc_ide_opti611.o \
hdc_ide_cmd640.o hdc_ide_sff8038i.o
hdc_ide_cmd640.o hdc_ide_cmd646.o \
hdc_ide_sff8038i.o
MINIVHDOBJ := cwalk.o libxml2_encoding.o minivhd_convert.o \
minivhd_create.o minivhd_io.o minivhd_manage.o \

3
src/win/win.c
View File

@@ -548,7 +548,8 @@ main_thread(void *param)
frames = 0;
}
} else /* Just so we dont overload the host OS. */
Sleep(1);
Sleep((drawits < -1) ? 1 : 0);
// Sleep(1);
/* If needed, handle a screen resize. */
if (doresize && !video_fullscreen && !is_quit) {

2
src/win/win_joystick_rawinput.c
View File

@@ -56,7 +56,7 @@ typedef struct {
HANDLE hdevice;
PHIDP_PREPARSED_DATA data;
USAGE usage_button[128];
USAGE usage_button[256];
struct raw_axis_t {
USAGE usage;

2
src/win/win_settings.c
View File

@@ -969,6 +969,8 @@ win_settings_machine_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
win_settings_machine_recalc_machine(hdlg);
}
free(lptsTemp);
}
break;
case IDC_COMBO_MACHINE: