Merge branch '86Box:master' into master

src/config.c

@@ -2009,6 +2009,7 @@ config_load(void)
 	hide_status_bar = 0;
 	scale = 1;
 	machine = machine_get_machine_from_internal_name("ibmpc");
+	dpi_scale = 1;
 
 	/* Set up the architecture flags. */
 	AT = IS_AT(machine);

src/cpu/CMakeLists.txt

@@ -24,6 +24,10 @@ if(CYRIX_6X86)
 	target_compile_definitions(cpu PRIVATE USE_CYRIX_6X86)
 endif()
 
+if(M6117)
+	target_compile_definitions(cpu PRIVATE USE_M6117)
+endif()
+
 if(DYNAREC)
 	add_library(cgt OBJECT codegen_timing_486.c codegen_timing_686.c
 		codegen_timing_common.c codegen_timing_k6.c