Merge branch 'master' of https://github.com/OBattler/86Box

2017-10-16 06:19:49 +02:00
parent ed865610e9 fbd95451d2
commit 4d9f5f0d05
4 changed files with 7 additions and 6 deletions
--- 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;
--- 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