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

Fixed the last compile-breaking mistakes.

Browse Source
This commit is contained in:
OBattler
2018-01-01 03:40:59 +01:00
parent 8f180fdecd
commit b7501e3b5f
3 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/machine/machine.h
View File

@@ -122,8 +122,12 @@ extern void machine_at_p55tvp4_init(machine_t *);
extern void machine_at_i430vx_init(machine_t *); extern void machine_at_i430vx_init(machine_t *);
extern void machine_at_p55va_init(machine_t *); extern void machine_at_p55va_init(machine_t *);
#ifdef DEV_BRANCH
#ifdef USE_I686
extern void machine_at_i440fx_init(machine_t *); extern void machine_at_i440fx_init(machine_t *);
extern void machine_at_s1668_init(machine_t *); extern void machine_at_s1668_init(machine_t *);
#endif
#endif
extern void machine_at_ali1429_init(machine_t *); extern void machine_at_ali1429_init(machine_t *);
extern void machine_at_cmdpc_init(machine_t *); extern void machine_at_cmdpc_init(machine_t *);
@@ -138,9 +142,11 @@ extern void machine_at_r418_init(machine_t *);
extern void machine_at_wd76c10_init(machine_t *); extern void machine_at_wd76c10_init(machine_t *);
#ifdef GREENB #ifdef DEV_BRANCH
#ifdef USE_GREENB
extern void machine_at_4gpv31_init(machine_t *); extern void machine_at_4gpv31_init(machine_t *);
#endif #endif
#endif
extern void machine_pcjr_init(machine_t *); extern void machine_pcjr_init(machine_t *);

14
src/rom.c
View File

@@ -13,7 +13,7 @@
* - c386sx16 BIOS fails checksum * - c386sx16 BIOS fails checksum
* - the loadfont() calls should be done elsewhere * - the loadfont() calls should be done elsewhere
* *
* Version: @(#)rom.c 1.0.25 2018/01/01 * Version: @(#)rom.c 1.0.26 2018/01/01
* *
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/> * Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -409,7 +409,8 @@ rom_load_bios(int rom_id)
biosmask = 0x7fff; biosmask = 0x7fff;
return(1); return(1);
#ifdef PORTABLE3 #ifdef DEV_BRANCH
#ifdef USE_PORTABLE3
case ROM_PORTABLEIII: case ROM_PORTABLEIII:
case ROM_PORTABLEIII386: case ROM_PORTABLEIII386:
if (rom_load_interleaved( if (rom_load_interleaved(
@@ -417,6 +418,7 @@ rom_load_bios(int rom_id)
L"roms/machines/portableiii/109737-002.bin", L"roms/machines/portableiii/109737-002.bin",
0x000000, 65536, 0, rom)) return(1); 0x000000, 65536, 0, rom)) return(1);
break; break;
#endif
#endif #endif
case ROM_DTKXT: case ROM_DTKXT:
@@ -574,7 +576,8 @@ rom_load_bios(int rom_id)
biosmask = 0x1ffff; biosmask = 0x1ffff;
return(1); return(1);
#ifdef PORTABLE3 #ifdef DEV_BRANCH
#ifdef USE_PORTABLE3
case ROM_DESKPRO_386: case ROM_DESKPRO_386:
if (! rom_load_interleaved( if (! rom_load_interleaved(
L"roms/machines/deskpro386/109592-005.u11.bin", L"roms/machines/deskpro386/109592-005.u11.bin",
@@ -582,6 +585,7 @@ rom_load_bios(int rom_id)
0x000000, 32768, 0, rom)) break; 0x000000, 32768, 0, rom)) break;
biosmask = 0x7fff; biosmask = 0x7fff;
return(1); return(1);
#endif
#endif #endif
case ROM_AMIXT: case ROM_AMIXT:
@@ -817,12 +821,14 @@ rom_load_bios(int rom_id)
biosmask = 0x1ffff; biosmask = 0x1ffff;
return(1); return(1);
#ifdef GREENB #ifdef DEV_BRANCH
#ifdef USE_GREENB
case ROM_4GPV31: case ROM_4GPV31:
if (! rom_load_linear( if (! rom_load_linear(
L"roms/machines/green-b/4gpv31-ami-1993-8273517.bin", L"roms/machines/green-b/4gpv31-ami-1993-8273517.bin",
0x000000, 65536, 0, rom)) break; 0x000000, 65536, 0, rom)) break;
return(1); return(1);
#endif
#endif #endif
case ROM_T3100E: case ROM_T3100E:

4
src/win/Makefile.mingw
View File

@@ -8,7 +8,7 @@
# #
# Makefile for Win32 (MinGW32) environment. # Makefile for Win32 (MinGW32) environment.
# #
# Version: @(#)Makefile.mingw 1.0.88 2018/01/01 # Version: @(#)Makefile.mingw 1.0.89 2018/01/01
# #
# Authors: Miran Grca, <mgrca8@gmail.com> # Authors: Miran Grca, <mgrca8@gmail.com>
# Fred N. van Kempen, <decwiz@yahoo.com> # Fred N. van Kempen, <decwiz@yahoo.com>
@@ -310,6 +310,7 @@ endif
ifeq ($(GREENB), y) ifeq ($(GREENB), y)
OPTS += -DUSE_GREENB OPTS += -DUSE_GREENB
DEVROBJ + m_at_4gpv31.o
endif endif
ifeq ($(I686), y) ifeq ($(I686), y)
@@ -378,7 +379,6 @@ MCHOBJ := machine.o machine_table.o \
m_at_sis_85c471.o m_at_sis_85c496.o \ m_at_sis_85c471.o m_at_sis_85c496.o \
m_at_430lx_nx.o m_at_430fx.o \ m_at_430lx_nx.o m_at_430fx.o \
m_at_430hx.o m_at_430vx.o \ m_at_430hx.o m_at_430vx.o \
m_at_4gpv31.o \
m_pcjr.o m_ps1.o m_ps2_isa.o m_ps2_mca.o m_pcjr.o m_ps1.o m_ps2_isa.o m_ps2_mca.o
DEVOBJ := bugger.o lpt.o $(SERIAL) \ DEVOBJ := bugger.o lpt.o $(SERIAL) \