Merge pull request #16 from 86Box/master

Merge master
2021-11-14 19:08:42 +08:00
parent 906f856dd0 e24da32acf
commit 79e84b276c
171 changed files with 15602 additions and 5614 deletions
--- a/src/cpu/cpu_table.c
+++ b/src/cpu/cpu_table.c
@@ -186,7 +186,6 @@ const cpu_family_t cpu_families[] = {
 		{"", 0}
 	}
    },
-#if defined(DEV_BRANCH) && defined(USE_M6117)
    {
 	.package = CPU_PKG_M6117,
 	.manufacturer = "ALi",
@@ -198,7 +197,6 @@ const cpu_family_t cpu_families[] = {
 		{"", 0}
 	}
    },
-#endif
    {
 	.package = CPU_PKG_386SLC_IBM,
 	.manufacturer = "IBM",