Merge branch '86Box:master' into nec-v20

2022-08-31 16:42:10 -04:00
parent 9001d52a2c 3e97b2d1eb
commit 9eaee6e20d
21 changed files with 731 additions and 56 deletions
--- a/src/cpu/cpu.c
+++ b/src/cpu/cpu.c
@@ -1391,7 +1391,7 @@ cpu_set(void)
    }

    if (is386) {
-#ifdef USE_DYNAREC
+#if defined(USE_DYNAREC) && !defined(USE_GDBSTUB)
 	if (cpu_use_dynarec)
 		cpu_exec = exec386_dynarec;
 	else