From fbd95451d28a39c80287fb1ff08f4ab073f5b998 Mon Sep 17 00:00:00 2001
From: waltje <decwiz@yahoo.com>
Date: Sat, 14 Oct 2017 22:51:43 -0400
Subject: [PATCH] Fixes (missed a few spots) for DYNAREC and propagated to
 Linux.

---
 src/cpu/386_dynarec.c  | 3 ++-
 src/mem.c              | 2 +-
 src/pc.c               | 2 +-
 src/win/Makefile.mingw | 6 +++---
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/cpu/386_dynarec.c b/src/cpu/386_dynarec.c
index 1c4200b1a..082151976 100644
--- a/src/cpu/386_dynarec.c
+++ b/src/cpu/386_dynarec.c
@@ -489,6 +489,7 @@ int dontprint=0;
 
 #define CACHE_ON() (!(cr0 & (1 << 30)) /*&& (cr0 & 1)*/ && !(flags & T_FLAG))
 
+#ifdef USE_DYNAREC
 static int cpu_cycle_period(void)
 {
 	switch(cpu_pci_speed)
@@ -502,8 +503,8 @@ static int cpu_cycle_period(void)
 	}
 }
 
-#ifdef USE_DYNAREC
 static int cycles_main = 0;
+
 void exec386_dynarec(int cycs)
 {
         uint8_t temp;
diff --git a/src/mem.c b/src/mem.c
index 5ef9e3c72..48df92bf7 100644
--- a/src/mem.c
+++ b/src/mem.c
@@ -15,7 +15,7 @@
 #include "mem.h"
 #include "rom.h"
 #ifdef USE_DYNAREC
-#include "cpu/codegen.h"
+# include "cpu/codegen.h"
 #else
 #define PAGE_MASK_INDEX_MASK 3
 #define PAGE_MASK_INDEX_SHIFT 10
diff --git a/src/pc.c b/src/pc.c
index 1832c56fc..ac0e4ba6c 100644
--- a/src/pc.c
+++ b/src/pc.c
@@ -29,7 +29,7 @@
 #include "ibm.h"
 #include "cpu/cpu.h"
 #ifdef USE_DYNAREC
-#include "cpu/codegen.h"
+# include "cpu/codegen.h"
 #endif
 #include "cpu/x86_ops.h"
 #include "io.h"
diff --git a/src/win/Makefile.mingw b/src/win/Makefile.mingw
index c16b33be4..95a3c5beb 100644
--- a/src/win/Makefile.mingw
+++ b/src/win/Makefile.mingw
@@ -87,7 +87,7 @@ ifndef MUNT
 MUNT		:= y
 endif
 ifndef PAS16
-PAS16		= n
+PAS16		:= n
 endif
 ifndef DYNAREC
 DYNAREC		:= y
@@ -280,8 +280,8 @@ MAINOBJ		:= pc.o config.o random.o timer.o io.o dma.o nmi.o pic.o \
 		   intel.o intel_flash.o intel_sio.o
 
 CPUOBJ		:= cpu.o 386.o 386_dynarec.o 808x.o \
-		   x86seg.o x87.o \
-		   $(DYNARECOBJ)
+		    x86seg.o x87.o \
+		    $(DYNARECOBJ)
 
 MCHOBJ		:= machine.o \
 		    machine_common.o \