80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Merge branch '86Box:master' into master

Browse Source
This commit is contained in:
Ompronce
2021-09-21 09:14:02 -04:00
committed by GitHub
parent c39c562bc9 5997f41f1c
commit f6779a16c9
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/config.c
View File

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

4
src/cpu/CMakeLists.txt
View File

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