From 0d7d168245471dada9186b549b6462fbab03414e Mon Sep 17 00:00:00 2001 From: OBattler Date: Mon, 1 Jan 2018 03:01:16 +0100 Subject: [PATCH] Fixed the compile-breaking mistake. --- src/cpu/cpu_table.c | 14 +++++++++----- src/win/Makefile.mingw | 3 ++- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/cpu/cpu_table.c b/src/cpu/cpu_table.c index fb04e6a33..3f6ec8297 100644 --- a/src/cpu/cpu_table.c +++ b/src/cpu/cpu_table.c @@ -29,17 +29,17 @@ * 16 = 180 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, * leilei, * Miran Grca, * Fred N. van Kempen, * - * Copyright 2008-2017 Sarah Walker. - * Copyright 2016-2017 leilei. - * Copyright 2016,2017 Miran Grca. - * Copyright 2017 Fred N. van Kempen. + * Copyright 2008-2018 Sarah Walker. + * Copyright 2016-2018 leilei. + * Copyright 2016,2018 Miran Grca. + * Copyright 2018 Fred N. van Kempen. */ #include #include @@ -419,6 +419,8 @@ CPU cpus_K56[] = { {"", -1, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,0,0} }; +#ifdef DEV_BRANCH +#ifdef USE_I686 CPU cpus_PentiumPro[] = { /*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}, @@ -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}, {"", -1, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,0,0} }; +#endif +#endif diff --git a/src/win/Makefile.mingw b/src/win/Makefile.mingw index e1b66c99d..390830cc4 100644 --- a/src/win/Makefile.mingw +++ b/src/win/Makefile.mingw @@ -8,7 +8,7 @@ # # 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, # Fred N. van Kempen, @@ -111,6 +111,7 @@ DEBUG := y DEV_BRANCH := y CIRRUS := y GREENB := y +I686 := y NE1000 := y NV_RIVA := y PAS16 := y