joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-05-09 03:41:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

update config ref and timestamp

Browse Source
This commit is contained in:
Wengier 2022-06-20 14:38:49 -04:00
parent 23842dc9b4
commit b3a04418e9
6 changed files with 52 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in
View File

@ -10,7 +10,7 @@
<category>Emulation</category> <category>Emulation</category>
</categories> </categories>
<releases> <releases>
<release version="@PACKAGE_VERSION@" date="2022-6-19"/> <release version="@PACKAGE_VERSION@" date="2022-6-20"/>
</releases> </releases>
<screenshots> <screenshots>
<screenshot type="default"> <screenshot type="default">

7
contrib/windows/installer/dosbox-x.reference.setup.conf
View File

@ -1097,7 +1097,8 @@ vsyncrate = 75
#DOSBOX-X-ADV:# If you want power management in Windows 95/98/ME (beyond using the APM to shutdown the computer) you MUST enable this option. #DOSBOX-X-ADV:# If you want power management in Windows 95/98/ME (beyond using the APM to shutdown the computer) you MUST enable this option.
#DOSBOX-X-ADV:# Windows 95/98/ME does not support the 16-bit real and protected mode APM BIOS entry points. #DOSBOX-X-ADV:# Windows 95/98/ME does not support the 16-bit real and protected mode APM BIOS entry points.
#DOSBOX-X-ADV:# Please note at this time that 32-bit APM is unstable under Windows ME. #DOSBOX-X-ADV:# Please note at this time that 32-bit APM is unstable under Windows ME.
#DOSBOX-X-ADV:# integration device: Enable DOSBox-X integration I/O device. This can be used by the guest OS to match mouse pointer position, for example. EXPERIMENTAL! # integration device: Enable DOSBox-X's integration I/O device, a way for additional software to talk to DOSBox-X. It is currently experimental.
# This can for example be used to return the DOSBox-X version number and by the guest OS to match mouse pointer position.
#DOSBOX-X-ADV:# integration device pnp: List DOSBox-X integration I/O device as part of ISA PnP enumeration. This has no purpose yet. #DOSBOX-X-ADV:# integration device pnp: List DOSBox-X integration I/O device as part of ISA PnP enumeration. This has no purpose yet.
# isapnpbios: Emulate ISA Plug & Play BIOS. Enable if using DOSBox-X to run a PnP aware DOS program or if booting Windows 9x. # isapnpbios: Emulate ISA Plug & Play BIOS. Enable if using DOSBox-X to run a PnP aware DOS program or if booting Windows 9x.
# Do not disable if Windows 9x is configured around PnP devices, you will likely confuse it. # Do not disable if Windows 9x is configured around PnP devices, you will likely confuse it.
@ -1109,7 +1110,7 @@ vsyncrate = 75
#DOSBOX-X-ADV:# then jump to realmode with B still set (aka Huge Unreal mode). Needed for Project Angel. #DOSBOX-X-ADV:# then jump to realmode with B still set (aka Huge Unreal mode). Needed for Project Angel.
#DOSBOX-X-ADV-SEE:# #DOSBOX-X-ADV-SEE:#
#DOSBOX-X-ADV-SEE:# Advanced options (see full configuration reference file [dosbox-x.reference.full.conf] for more details): #DOSBOX-X-ADV-SEE:# Advanced options (see full configuration reference file [dosbox-x.reference.full.conf] for more details):
#DOSBOX-X-ADV-SEE:# -> processor serial number; double fault; reset on triple fault; always report double fault; always report triple fault; allow lmsw to exit protected mode; report fdiv bug; enable msr; enable cmpxchg8b; enable syscall; ignore undefined msr; interruptible rep string op; dynamic core cache block size; cycle emulation percentage adjust; stop turbo on key; stop turbo after second; use dynamic core with paging on; ignore opcode 63; apmbios pnp; apm power button event; apmbios version; apmbios allow realmode; apmbios allow 16-bit protected mode; apmbios allow 32-bit protected mode; integration device; integration device pnp; isapnpport; realbig16 #DOSBOX-X-ADV-SEE:# -> processor serial number; double fault; reset on triple fault; always report double fault; always report triple fault; allow lmsw to exit protected mode; report fdiv bug; enable msr; enable cmpxchg8b; enable syscall; ignore undefined msr; interruptible rep string op; dynamic core cache block size; cycle emulation percentage adjust; stop turbo on key; stop turbo after second; use dynamic core with paging on; ignore opcode 63; apmbios pnp; apm power button event; apmbios version; apmbios allow realmode; apmbios allow 16-bit protected mode; apmbios allow 32-bit protected mode; integration device pnp; isapnpport; realbig16
#DOSBOX-X-ADV-SEE:# #DOSBOX-X-ADV-SEE:#
core = auto core = auto
fpu = true fpu = true
@ -1144,7 +1145,7 @@ apmbios = true
#DOSBOX-X-ADV:apmbios allow realmode = true #DOSBOX-X-ADV:apmbios allow realmode = true
#DOSBOX-X-ADV:apmbios allow 16-bit protected mode = true #DOSBOX-X-ADV:apmbios allow 16-bit protected mode = true
#DOSBOX-X-ADV:apmbios allow 32-bit protected mode = true #DOSBOX-X-ADV:apmbios allow 32-bit protected mode = true
#DOSBOX-X-ADV:integration device = false integration device = false
#DOSBOX-X-ADV:integration device pnp = false #DOSBOX-X-ADV:integration device pnp = false
isapnpbios = true isapnpbios = true
#DOSBOX-X-ADV:isapnpport = auto #DOSBOX-X-ADV:isapnpport = auto

77
dosbox-x.reference.conf
View File

@ -413,46 +413,49 @@ vsyncmode = off
vsyncrate = 75 vsyncrate = 75
[cpu] [cpu]
# core: CPU Core used in emulation. auto will switch to dynamic if available and appropriate. # core: CPU Core used in emulation. auto will switch to dynamic if available and appropriate.
# For the dynamic core, both dynamic_x86 and dynamic_rec are supported (dynamic_x86 is preferred). # For the dynamic core, both dynamic_x86 and dynamic_rec are supported (dynamic_x86 is preferred).
# Windows 95 or other preemptive multitasking OSes will not work with the dynamic_rec core. # Windows 95 or other preemptive multitasking OSes will not work with the dynamic_rec core.
# Possible values: auto, dynamic, dynamic_x86, dynamic_nodhfpu, dynamic, dynamic_rec, normal, full, simple. # Possible values: auto, dynamic, dynamic_x86, dynamic_nodhfpu, dynamic, dynamic_rec, normal, full, simple.
# fpu: Enable FPU emulation # fpu: Enable FPU emulation
# Possible values: true, false, 1, 0, auto, 8087, 287, 387. # Possible values: true, false, 1, 0, auto, 8087, 287, 387.
# segment limits: Enforce checks for segment limits on 80286 and higher CPU types. # segment limits: Enforce checks for segment limits on 80286 and higher CPU types.
# cputype: CPU Type used in emulation. "auto" emulates a 486 which tolerates Pentium instructions. # cputype: CPU Type used in emulation. "auto" emulates a 486 which tolerates Pentium instructions.
# "experimental" enables newer instructions not normally found in the CPU types emulated by DOSBox-X, such as FISTTP. # "experimental" enables newer instructions not normally found in the CPU types emulated by DOSBox-X, such as FISTTP.
# Possible values: auto, 8086, 8086_prefetch, 80186, 80186_prefetch, 286, 286_prefetch, 386, 386_prefetch, 486old, 486old_prefetch, 486, 486_prefetch, pentium, pentium_mmx, ppro_slow, pentium_ii, pentium_iii, experimental. # Possible values: auto, 8086, 8086_prefetch, 80186, 80186_prefetch, 286, 286_prefetch, 386, 386_prefetch, 486old, 486old_prefetch, 486, 486_prefetch, pentium, pentium_mmx, ppro_slow, pentium_ii, pentium_iii, experimental.
# cycles: Number of instructions DOSBox-X tries to emulate each millisecond. # cycles: Number of instructions DOSBox-X tries to emulate each millisecond.
# Setting this value too high results in sound dropouts and lags. # Setting this value too high results in sound dropouts and lags.
# Cycles can be set in 3 ways: # Cycles can be set in 3 ways:
# 'auto' tries to guess what a game needs. # 'auto' tries to guess what a game needs.
# It usually works, but can fail for certain games. # It usually works, but can fail for certain games.
# 'fixed #number' will set a fixed number of cycles. This is what you usually # 'fixed #number' will set a fixed number of cycles. This is what you usually
# need if 'auto' fails (Example: fixed 4000). # need if 'auto' fails (Example: fixed 4000).
# 'max' will allocate as much cycles as your computer is able to # 'max' will allocate as much cycles as your computer is able to
# handle. Recommended if better performance is desired. # handle. Recommended if better performance is desired.
# Possible values: auto, fixed, max. # Possible values: auto, fixed, max.
# cycleup: Amount of cycles to decrease/increase with the mapped keyboard shortcut. # cycleup: Amount of cycles to decrease/increase with the mapped keyboard shortcut.
# cycledown: Setting it lower than 100 will be a percentage. # cycledown: Setting it lower than 100 will be a percentage.
# turbo: Enables Turbo (Fast Forward) mode to speed up operations. # turbo: Enables Turbo (Fast Forward) mode to speed up operations.
# apmbios: Emulate Advanced Power Management (APM) BIOS calls. # apmbios: Emulate Advanced Power Management (APM) BIOS calls.
# isapnpbios: Emulate ISA Plug & Play BIOS. Enable if using DOSBox-X to run a PnP aware DOS program or if booting Windows 9x. # integration device: Enable DOSBox-X's integration I/O device, a way for additional software to talk to DOSBox-X. It is currently experimental.
# Do not disable if Windows 9x is configured around PnP devices, you will likely confuse it. # This can for example be used to return the DOSBox-X version number and by the guest OS to match mouse pointer position.
# isapnpbios: Emulate ISA Plug & Play BIOS. Enable if using DOSBox-X to run a PnP aware DOS program or if booting Windows 9x.
# Do not disable if Windows 9x is configured around PnP devices, you will likely confuse it.
# #
# Advanced options (see full configuration reference file [dosbox-x.reference.full.conf] for more details): # Advanced options (see full configuration reference file [dosbox-x.reference.full.conf] for more details):
# -> processor serial number; double fault; reset on triple fault; always report double fault; always report triple fault; allow lmsw to exit protected mode; report fdiv bug; enable msr; enable cmpxchg8b; enable syscall; ignore undefined msr; interruptible rep string op; dynamic core cache block size; cycle emulation percentage adjust; stop turbo on key; stop turbo after second; use dynamic core with paging on; ignore opcode 63; apmbios pnp; apm power button event; apmbios version; apmbios allow realmode; apmbios allow 16-bit protected mode; apmbios allow 32-bit protected mode; integration device; integration device pnp; isapnpport; realbig16 # -> processor serial number; double fault; reset on triple fault; always report double fault; always report triple fault; allow lmsw to exit protected mode; report fdiv bug; enable msr; enable cmpxchg8b; enable syscall; ignore undefined msr; interruptible rep string op; dynamic core cache block size; cycle emulation percentage adjust; stop turbo on key; stop turbo after second; use dynamic core with paging on; ignore opcode 63; apmbios pnp; apm power button event; apmbios version; apmbios allow realmode; apmbios allow 16-bit protected mode; apmbios allow 32-bit protected mode; integration device pnp; isapnpport; realbig16
# #
core = auto core = auto
fpu = true fpu = true
segment limits = true segment limits = true
cputype = auto cputype = auto
cycles = auto cycles = auto
cycleup = 10 cycleup = 10
cycledown = 20 cycledown = 20
turbo = false turbo = false
apmbios = true apmbios = true
isapnpbios = true integration device = false
isapnpbios = true
[keyboard] [keyboard]
# aux: Enable emulation of the 8042 auxiliary port. PS/2 mouse emulation requires this to be enabled. # aux: Enable emulation of the 8042 auxiliary port. PS/2 mouse emulation requires this to be enabled.

3
dosbox-x.reference.full.conf
View File

@ -1069,7 +1069,8 @@ vsyncrate = 75
# If you want power management in Windows 95/98/ME (beyond using the APM to shutdown the computer) you MUST enable this option. # If you want power management in Windows 95/98/ME (beyond using the APM to shutdown the computer) you MUST enable this option.
# Windows 95/98/ME does not support the 16-bit real and protected mode APM BIOS entry points. # Windows 95/98/ME does not support the 16-bit real and protected mode APM BIOS entry points.
# Please note at this time that 32-bit APM is unstable under Windows ME. # Please note at this time that 32-bit APM is unstable under Windows ME.
# integration device: Enable DOSBox-X integration I/O device. This can be used by the guest OS to match mouse pointer position, for example. EXPERIMENTAL! # integration device: Enable DOSBox-X's integration I/O device, a way for additional software to talk to DOSBox-X. It is currently experimental.
# This can for example be used to return the DOSBox-X version number and by the guest OS to match mouse pointer position.
# integration device pnp: List DOSBox-X integration I/O device as part of ISA PnP enumeration. This has no purpose yet. # integration device pnp: List DOSBox-X integration I/O device as part of ISA PnP enumeration. This has no purpose yet.
# isapnpbios: Emulate ISA Plug & Play BIOS. Enable if using DOSBox-X to run a PnP aware DOS program or if booting Windows 9x. # isapnpbios: Emulate ISA Plug & Play BIOS. Enable if using DOSBox-X to run a PnP aware DOS program or if booting Windows 9x.
# Do not disable if Windows 9x is configured around PnP devices, you will likely confuse it. # Do not disable if Windows 9x is configured around PnP devices, you will likely confuse it.

4
include/build_timestamp.h
View File

@ -1,4 +1,4 @@
/*auto-generated*/ /*auto-generated*/
#define UPDATED_STR "Jun 19, 2022 12:17:31am" #define UPDATED_STR "Jun 20, 2022 2:32:38pm"
#define GIT_COMMIT_HASH "03ee8d6" #define GIT_COMMIT_HASH "23842dc"
#define COPYRIGHT_END_YEAR "2022" #define COPYRIGHT_END_YEAR "2022"

4
src/dosbox.cpp
View File

@ -2765,7 +2765,9 @@ void DOSBOX_SetupConfigSections(void) {
"Please note at this time that 32-bit APM is unstable under Windows ME."); "Please note at this time that 32-bit APM is unstable under Windows ME.");
Pbool = secprop->Add_bool("integration device",Property::Changeable::WhenIdle,false); Pbool = secprop->Add_bool("integration device",Property::Changeable::WhenIdle,false);
Pbool->Set_help("Enable DOSBox-X integration I/O device. This can be used by the guest OS to match mouse pointer position, for example. EXPERIMENTAL!"); Pbool->Set_help("Enable DOSBox-X's integration I/O device, a way for additional software to talk to DOSBox-X. It is currently experimental.\n"
"This can for example be used to return the DOSBox-X version number and by the guest OS to match mouse pointer position.");
Pbool->SetBasic(true);
Pbool = secprop->Add_bool("integration device pnp",Property::Changeable::WhenIdle,false); Pbool = secprop->Add_bool("integration device pnp",Property::Changeable::WhenIdle,false);
Pbool->Set_help("List DOSBox-X integration I/O device as part of ISA PnP enumeration. This has no purpose yet."); Pbool->Set_help("List DOSBox-X integration I/O device as part of ISA PnP enumeration. This has no purpose yet.");