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

Fixed the compile-breaking mistake.

Browse Source
This commit is contained in:
OBattler
2018-01-01 03:01:16 +01:00
parent 23c536f5dd
commit 0d7d168245
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/cpu/cpu_table.c
View File

@@ -29,17 +29,17 @@
* 16 = 180 MHz * 16 = 180 MHz
* 17 = 200 MHz * 17 = 200 MHz
* *
* Version: @(#)cpu_table.c 1.0.1 2017/11/04 * Version: @(#)cpu_table.c 1.0.2 2018/01/01
* *
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/> * Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* leilei, * leilei,
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
* Fred N. van Kempen, <decwiz@yahoo.com> * Fred N. van Kempen, <decwiz@yahoo.com>
* *
* Copyright 2008-2017 Sarah Walker. * Copyright 2008-2018 Sarah Walker.
* Copyright 2016-2017 leilei. * Copyright 2016-2018 leilei.
* Copyright 2016,2017 Miran Grca. * Copyright 2016,2018 Miran Grca.
* Copyright 2017 Fred N. van Kempen. * Copyright 2018 Fred N. van Kempen.
*/ */
#include <stdio.h> #include <stdio.h>
#include <stdint.h> #include <stdint.h>
@@ -419,6 +419,8 @@ CPU cpus_K56[] = {
{"", -1, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,0,0} {"", -1, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,0,0}
}; };
#ifdef DEV_BRANCH
#ifdef USE_I686
CPU cpus_PentiumPro[] = { CPU cpus_PentiumPro[] = {
/*Intel Pentium Pro and II Overdrive*/ /*Intel Pentium Pro and II Overdrive*/
{"Pentium Pro 50", CPU_PENTIUMPRO, 5, 50000000, 1, 25000000, 0x612, 0x612, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 4,4,3,3}, {"Pentium Pro 50", CPU_PENTIUMPRO, 5, 50000000, 1, 25000000, 0x612, 0x612, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 4,4,3,3},
@@ -443,3 +445,5 @@ CPU cpus_PentiumPro[] = {
{"Pentium II Overdrive 333", CPU_PENTIUM2D, 29, 333333333, 5, 33333333, 0x1632, 0x1632, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 27,27,13,13}, {"Pentium II Overdrive 333", CPU_PENTIUM2D, 29, 333333333, 5, 33333333, 0x1632, 0x1632, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 27,27,13,13},
{"", -1, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,0,0} {"", -1, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,0,0}
}; };
#endif
#endif

3
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.87 2018/01/01 # Version: @(#)Makefile.mingw 1.0.88 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>
@@ -111,6 +111,7 @@ DEBUG := y
DEV_BRANCH := y DEV_BRANCH := y
CIRRUS := y CIRRUS := y
GREENB := y GREENB := y
I686 := y
NE1000 := y NE1000 := y
NV_RIVA := y NV_RIVA := y
PAS16 := y PAS16 := y