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

Changed the machines to use a table file.

Browse Source
This commit is contained in:
waltje
2017-11-08 16:27:10 -05:00
parent 2e772d3d89
commit b8d75f4f5a
6 changed files with 247 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/win/Makefile.mingw
View File

@@ -8,7 +8,7 @@
#
# Makefile for Win32 (MinGW32) environment.
#
# Version: @(#)Makefile.mingw 1.0.72 2017/11/05
# Version: @(#)Makefile.mingw 1.0.73 2017/11/08
#
# Authors: Miran Grca, <mgrca8@gmail.com>
# Fred N. van Kempen, <decwiz@yahoo.com>
@@ -275,8 +275,7 @@ CPUOBJ := cpu.o cpu_table.o \
808x.o 386.o x86seg.o x87.o \
386_dynarec.o $(DYNARECOBJ)
MCHOBJ := machine.o \
m_common.o \
MCHOBJ := machine.o machine_table.o \
m_amstrad.o $(EUROPC) \
m_olivetti_m24.o \
m_pcjr.o \

8
src/win/win_settings.c
View File

@@ -8,7 +8,7 @@
*
* Windows 86Box Settings dialog handler.
*
* Version: @(#)win_settings.c 1.0.23 2017/11/04
* Version: @(#)win_settings.c 1.0.24 2017/11/08
*
* Author: Miran Grca, <mgrca8@gmail.com>
*
@@ -513,7 +513,7 @@ static void win_settings_machine_recalc_machine(HWND hdlg)
int c = 0;
int temp_romset = 0;
LPTSTR lptsTemp;
char *stransi;
const char *stransi;
UDACCEL accel;
temp_romset = machine_getromset_ex(temp_machine);
@@ -601,7 +601,7 @@ static BOOL CALLBACK win_settings_machine_proc(HWND hdlg, UINT message, WPARAM w
{
if (romspresent[machines[c].id])
{
stransi = machines[c].name;
stransi = (char *)machines[c].name;
mbstowcs(lptsTemp, stransi, strlen(stransi) + 1);
SendMessage(h, CB_ADDSTRING, 0, (LPARAM) lptsTemp);
machinetolist[c] = d;
@@ -685,7 +685,7 @@ static BOOL CALLBACK win_settings_machine_proc(HWND hdlg, UINT message, WPARAM w
case WM_SAVESETTINGS:
lptsTemp = (LPTSTR) malloc(512);
stransi = (char *) malloc(512);
stransi = (char *)malloc(512);
#ifdef USE_DYNAREC
h=GetDlgItem(hdlg, IDC_CHECK_DYNAREC);