More reorganization and finally merged the two makefiles.

2020-06-13 12:32:09 +02:00
parent 4e48943ad5
commit ca55e2a12a
35 changed files with 3645 additions and 4372 deletions
--- a/src/cpu/cpu.c
+++ b/src/cpu/cpu.c
@@ -1398,7 +1398,9 @@ cpu_set(void)
                cpu_features = CPU_FEATURE_RDTSC | CPU_FEATURE_MSR | CPU_FEATURE_CR4 | CPU_FEATURE_VME | CPU_FEATURE_MMX | CPU_FEATURE_3DNOW;
                msr.fcr = (1 << 8) | (1 << 9) | (1 << 12) |  (1 << 16) | (1 << 19) | (1 << 21);
                cpu_CR4_mask = CR4_VME | CR4_PVI | CR4_TSD | CR4_DE | CR4_PSE | CR4_MCE;
+#ifdef USE_DYNAREC
                codegen_timing_set(&codegen_timing_k6);
+#endif
                break;

                case CPU_PENTIUMPRO: